Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/avatar/_avatar_form.html.erb

@@ -47,7 +47,6 @@
   <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
   </a>
-  <span class="c_orange ml25 f12">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
   <!--         :accept => 'image/png,image/gif,image/jpeg', -->
 <span class="add_avatar" style="margin-left: -55px;width: 70px">
 	<%= file_field_tag 'avatar[image]',
@@ -69,6 +68,8 @@
         	:source_id => source.id.to_s
    } %>
 </span>
+<span class="c_orange ml25 f12">(个人头像建议90*90大小，或者等比图像)</span>
+
 </div>
 <% content_for :header_tags do %>
   <%= javascript_include_tag 'avatars' %>

app/views/avatar/_new_avatar_form.html.erb

@@ -3,10 +3,9 @@
 </a>
 <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %>
 <a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
-<span class="c_orange ml25 mt43 f12 fl ">(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像)</span>
 <%= file_field_tag 'avatar[image]',
                    :id => nil,
-                   :class => 'upload_file ',
+                   :class => 'upload_avatar ',
                    :size => "1",
                    :multiple => false,
                    :onchange => 'addInputAvatar(this);',
@@ -22,6 +21,7 @@
                            :source_id => source.id.to_s
                    } %>
 <!--</span>-->
+<span class="c_orange ml25 mt43 f12 fl ">(课程和项目logo建议60*60大小，或者等比图像)</span>
 <% content_for :header_tags do %>
     <%= javascript_include_tag 'avatars' %>
 <% end %>

public/stylesheets/courses.css

@@ -331,6 +331,7 @@ a:hover.st_add{ color:#ff8e15;}
 .upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;}
 .upbtn:hover{border:1px solid #64bdd9; color:#64bdd9;cursor: pointer;}
 .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
+.upload_avatar{margin-left: -350px;margin-top: 40px;width: 60px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
 /* 功能倒计时*/
 .w_img{ float:left; margin:10px 10px 15px 0px;}
 .w_p{ float:left; color:#15bccf; font-size:16px; font-weight:bold; margin-top:70px; }

public/stylesheets/project.css

@@ -368,6 +368,7 @@ blockquote {
 }
 /*上传项目图片*/
 .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
+.upload_avatar{margin-left: -350px;margin-top: 40px;width: 60px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
 /*配置*/
 .pro_st_ttl{ height:24px;}
 .pro_st_ctt{height:auto; clear:both;}