From 61ad05a379a96209643056463ff9c8eb364a4ced Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 18 Oct 2016 17:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_edit.html.erb | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb
index 0e25fc660..673fbde3b 100644
--- a/app/views/projects/settings/_new_edit.html.erb
+++ b/app/views/projects/settings/_new_edit.html.erb
@@ -34,20 +34,11 @@
         <li class="clear">
           <% if Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") %>
               <%= link_to(l(:button_delete_project), { :controller => 'projects', :action => 'archive', :id => @project, :status => params[:status], :type =>"project" },
-                          :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => "sy_btn_grey mr5 fl ml15") unless @project.archived? %>
+                          :data => {:confirm => l(:text_delete_project_are_you_sure)}, :method => :post, :class => "sy_btn_grey mr5 fl ml15") unless @project.archived? %>
               <p class="fl  c_grey">（友情提示：删除该项目后如果您想恢复该项目，请联系系统管理员！）</p>
           <% end %>
           <a href="javascript:void(0)" class="sy_btn_blue mr15 fr" onclick="submit_edit_project(<%= @project.id %>);" >保存</a>
         </li>
       </ul>
-<% end %>
-<% if User.current.member_of?(@project) && Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") %>
-       <div class="mt30">
-      <img src="/images/pic_del.gif" class="mr5">
-         <%= link_to(l(:button_delete_project), { :controller => 'projects', :action => 'archive', :id => @project, :status => params[:status], :type =>"project" },
-                     :data => {:confirm => l(:text_delete_project_are_you_sure)}, :method => :post) unless @project.archived? %>
-         <%#=link_to "删除该课程", course_path(@course), :method => :delete, :confirm=>"确认要删除该课程吗？"  %>
-      <span>（友情提示：删除该项目后如果您想恢复该项目，请联系系统管理员！）</span>
-    </div>
-<% end %>
-<div class="cl"></div>
+  <% end %>
+</div>