Merge branch 'dev_aliyun' into educoder

app/views/files/_tool_settings.html.erb

@@ -5,16 +5,16 @@
             <% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project") %>
                <i class="fa fa-align-justify color-grey-9">
                 <ul class="homepagePostSettiongText">
-                  <% if hidden_unproject_infos %>
-                      <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li>
-                  <% else %>
-                      <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')") %></li>
-                  <% end %>
-                  <% if params[:tag_name].blank? %>
-                      <li><%= link_to '更新版本',attachments_versions_path(file, :project_id => project.id), :class => "postOptionLink", :remote => true %></li>
-                  <% else %>
-                      <li><%= link_to '更新版本',attachments_versions_path(file, :tag_name => params[:tag_name].force_encoding("UTF-8"), :project_id => project.id, :other => params[:other]),:class => "postOptionLink",:remote=>true %></li>
-                  <% end %>
+                  <%# if hidden_unproject_infos %>
+<!--                      <li><%#= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li>-->
+                  <%# else %>
+<!--                      <li><%#= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')") %></li>-->
+                  <%# end %>
+                  <%# if params[:tag_name].blank? %>
+<!--                      <li><%#= link_to '更新版本',attachments_versions_path(file, :project_id => project.id), :class => "postOptionLink", :remote => true %></li>-->
+                  <%# else %>
+<!--                      <li><%#= link_to '更新版本',attachments_versions_path(file, :tag_name => params[:tag_name].force_encoding("UTF-8"), :project_id => project.id, :other => params[:other]),:class => "postOptionLink",:remote=>true %></li>-->
+                  <%# end %>
 
                   <% if project.is_public? %>
                       <li>
@@ -38,15 +38,15 @@
                 </i>
             <% end %>
         <% else %>
-           <i class="fa fa-align-justify color-grey-9">
-            <ul class="resourceSendO">
-              <% if hidden_unproject_infos %>
-                  <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
-              <% else %>
-                  <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')")  %></li>
-              <% end %>
-            </ul>
-           </i>
+<!--           <i class="fa fa-align-justify color-grey-9">-->
+<!--            <ul class="resourceSendO">-->
+              <%# if hidden_unproject_infos %>
+<!--                  <li><%#= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>-->
+              <%# else %>
+<!--                  <li><%#= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send_hidden('#{file.id}','#{User.current.id}','file')")  %></li>-->
+              <%# end %>
+<!--            </ul>-->
+<!--           </i>-->
         <% end %>
     <% end %>
   </li>