Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/views/admins/shixun_settings/shared/_td.html.erb

@@ -17,15 +17,16 @@
 </td>
 <td>
   <!-- 图片上传，稍后添加-->
+  --
 
-  <a href="javascript:void(0);" id="object_upload_img_<%= shixun.id %>" onclick="$('#upload_img_<%= shixun.id %>').click();">
+<!--  <a href="javascript:void(0);" id="object_upload_img_<%#= shixun.id %>" onclick="$('#upload_img_<%= shixun.id %>').click();">-->
-    <%= File.exist?(disk_filename("Shixun",shixun.id)) ? "重新上传" : "上传图片" %>
+    <%#= File.exist?(disk_filename("Shixun",shixun.id)) ? "重新上传" : "上传图片" %>
-  </a>
+<!--  </a>-->
-  <% if File.exist?(disk_filename("Shixun",shixun.id)) %>
+  <%# if File.exist?(disk_filename("Shixun",shixun.id)) %>
-    <%= image_tag(url_to_avatar(shixun), :class => "w80 h80 fl ml5 shixun_image_show", :id => "shixun_image_show_#{shixun.id}") %>
+    <%#= image_tag(url_to_avatar(shixun), :class => "w80 h80 fl ml5 shixun_image_show", :id => "shixun_image_show_#{shixun.id}") %>
-  <% else %>
+  <%# else %>
-    <img src="" class="w80 h80 fl ml5 shixun_image_show none" id="shixun_image_show_<%= shixun.id %>"/>
+<!--    <img src="" class="w80 h80 fl ml5 shixun_image_show none" id="shixun_image_show_<%#= shixun.id %>"/>-->
-  <% end %>
+  <%# end %>
 
 </td>
 <td><%= link_to shixun.owner.try(:show_real_name),"/users/#{shixun.owner.login}",target:'_blank' %></td>