jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into guange_dev

This commit is contained in:
sw 2015-05-15 17:36:44 +08:00
parent d2a7d41963 0e6c15c160
commit a44cba2e6a
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/attachments/_form_project.html.erb
View File

@ -125,8 +125,8 @@
:file_count => l(:label_file_count), :file_count => l(:label_file_count),
:delete_all_files => l(:text_are_you_sure_all) :delete_all_files => l(:text_are_you_sure_all)
} %> } %>
<% if container.nil? %> <% if defined?(container) %>
<span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span> <span id="upload_file_count" class="c_grey"><%= l(:label_no_file_uploaded)%></span>
<% end %> <% end %>
(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
</span> </span>

2
app/views/avatar/_avatar_form.html.erb
View File

@ -43,7 +43,7 @@
<div id="upload_progressbar" style="height:14px; margin-bottom: 10px;display: block"></div> <div id="upload_progressbar" style="height:14px; margin-bottom: 10px;display: block"></div>
</div> </div>
</span> </span>
<%= 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;" %>
<a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;"> <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
<span><%= l(:button_upload_photo) %></span> <span><%= l(:button_upload_photo) %></span>
</a> </a>

5
public/stylesheets/application.css
View File

@ -1598,7 +1598,8 @@ blockquote {
margin-right: 0.4em; margin-right: 0.4em;
border-radius: 4px; border-radius: 4px;
font-family: "Microsoft YaHei"; 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;} blockquote blockquote { margin-left: 0;}
@ -2780,4 +2781,4 @@ div.repos_explain{
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
} }
.upload_img img{max-width: 580px;width: 100%;} .upload_img img{max-width: 100%;}

1
public/stylesheets/courses.css
View File

@ -487,6 +487,7 @@ blockquote {
border-radius: 4px; border-radius: 4px;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
background: url('../images/requirements/reference.jpg'); 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;} 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;} .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}

1
public/stylesheets/project.css
View File

@ -388,6 +388,7 @@ blockquote {
border-radius: 4px; border-radius: 4px;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
background: url(http://test.forge.trustie.net/images/requirements/xreference.jpg.pagespeed.ic.h4inUJNyH0.jpg); 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} .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}