From 4cb22f2437f198fd2d8b6b8273fcfff04f485bac Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 22 Apr 2015 15:49:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E3=80=81=E4=B8=AA=E4=BA=BA=E5=A4=B4=E5=83=8F=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/avatar/_avatar_form.html.erb | 3 ++- app/views/avatar/_new_avatar_form.html.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb index fef9f7bdb..f5ecfeadd 100644 --- a/app/views/avatar/_avatar_form.html.erb +++ b/app/views/avatar/_avatar_form.html.erb @@ -47,7 +47,6 @@ <%= l(:button_upload_photo) %> - (个人头像建议90*90大小,课程和项目logo建议60*60大小,或者等比图像) <%= file_field_tag 'avatar[image]', @@ -69,6 +68,8 @@ :source_id => source.id.to_s } %> +(个人头像建议90*90大小,或者等比图像) + <% content_for :header_tags do %> <%= javascript_include_tag 'avatars' %> diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb index 8b81ebf66..627de34be 100644 --- a/app/views/avatar/_new_avatar_form.html.erb +++ b/app/views/avatar/_new_avatar_form.html.erb @@ -3,7 +3,6 @@ <%#= 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" %> <%= l(:button_upload_photo) %> -(个人头像建议90*90大小,课程和项目logo建议60*60大小,或者等比图像) <%= file_field_tag 'avatar[image]', :id => nil, :class => 'upload_file ', @@ -22,6 +21,7 @@ :source_id => source.id.to_s } %> +(课程和项目logo建议60*60大小,或者等比图像) <% content_for :header_tags do %> <%= javascript_include_tag 'avatars' %> <% end %> From 36f2643ad8dbd41ddd31ed0fa263b94b2d9e43dc Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 22 Apr 2015 16:33:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/avatar/_new_avatar_form.html.erb | 2 +- public/stylesheets/courses.css | 1 + public/stylesheets/project.css | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb index 627de34be..c94f9f87a 100644 --- a/app/views/avatar/_new_avatar_form.html.erb +++ b/app/views/avatar/_new_avatar_form.html.erb @@ -5,7 +5,7 @@ <%= l(:button_upload_photo) %> <%= file_field_tag 'avatar[image]', :id => nil, - :class => 'upload_file ', + :class => 'upload_avatar ', :size => "1", :multiple => false, :onchange => 'addInputAvatar(this);', diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 1fed23fc1..904f6a3a8 100644 --- a/public/stylesheets/courses.css +++ b/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; } diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 2f6a4babe..abd748dce 100644 --- a/public/stylesheets/project.css +++ b/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;}