diff --git a/app/views/attachments/_form_project.html.erb b/app/views/attachments/_form_project.html.erb index 998766b27..d1cdf8cc9 100644 --- a/app/views/attachments/_form_project.html.erb +++ b/app/views/attachments/_form_project.html.erb @@ -125,9 +125,9 @@ :file_count => l(:label_file_count), :delete_all_files => l(:text_are_you_sure_all) } %> - <% if container.nil? %> - <%= l(:label_no_file_uploaded)%> - <% end %> + <% if defined?(container) %> + <%= l(:label_no_file_uploaded)%> + <% end %> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb index 43aaf9132..632ea5d4d 100644 --- a/app/views/avatar/_avatar_form.html.erb +++ b/app/views/avatar/_avatar_form.html.erb @@ -43,7 +43,7 @@
-<%= 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 => "btn_addPic", :style => "text-decoration:none;" %> +<%#= 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 => "btn_addPic", :style => "text-decoration:none;" %> <%= l(:button_upload_photo) %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 35e41453e..edde12527 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1598,7 +1598,8 @@ blockquote { margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; - background: url('../images/requirements/reference.jpg') + background: url('../images/requirements/reference.jpg'); + background-size: 100% 100%; } blockquote blockquote { margin-left: 0;} @@ -2780,4 +2781,4 @@ div.repos_explain{ padding-top: 20px; padding-bottom: 20px; } -.upload_img img{max-width: 580px;width: 100%;} +.upload_img img{max-width: 100%;} diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 132cddadc..5333b91a7 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -487,6 +487,7 @@ blockquote { border-radius: 4px; font-family: "Microsoft YaHei"; background: url('../images/requirements/reference.jpg'); + background-size: 100% 100%; } a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;} .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 74d7c58b3..d6bef6524 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -388,6 +388,7 @@ blockquote { border-radius: 4px; font-family: "Microsoft YaHei"; background: url(http://test.forge.trustie.net/images/requirements/xreference.jpg.pagespeed.ic.h4inUJNyH0.jpg); + background-size: 100% 100%; } /*上传项目图片*/ .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}