课程--作业附件显示问题;问题跟踪附件显示问题

This commit is contained in:
whimlex 2015-03-27 17:00:23 +08:00
parent 3d2fc8e5ef
commit 54908423bc
4 changed files with 11 additions and 7 deletions

View File

@ -9,7 +9,7 @@
<% if options[:length] %> <% if options[:length] %>
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%> <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
<% else %> <% else %>
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%> <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true, :length => 32 -%>
<% end %> <% end %>
</span> </span>
<%if is_float%> <%if is_float%>
@ -26,9 +26,7 @@
<span title="<%= attachment.description%>"> <span title="<%= attachment.description%>">
<%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %> <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
</span> </span>
<span class="size">( <span class="size">(<%= number_to_human_size attachment.filesize , :precision => 0 %>)</span>
<%= number_to_human_size attachment.filesize %>)
</span>
<% if options[:deletable] %> <% if options[:deletable] %>
<% if attachment.container_type == 'HomeworkAttach' %> <% if attachment.container_type == 'HomeworkAttach' %>
<%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id}, <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id},

View File

@ -178,7 +178,7 @@
</tr> </tr>
<tr> <tr>
<td valign="top" colspan="2"> <td valign="top" colspan="2">
<% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 7} %> <% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 15} %>
<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %> <%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
</td> </td>
</tr> </tr>

View File

@ -136,7 +136,11 @@ en:
# 项目托管平台 # 项目托管平台
# #
# 问题跟踪 # 问题跟踪
label_issues_sum: 'Total'
lable_issues_undo: 'Unresolved'
label_successful_create: Successfully created label_successful_create: Successfully created
# #

View File

@ -49,8 +49,7 @@ zh:
label_issue_tracking: 问题跟踪 label_issue_tracking: 问题跟踪
label_release_issue: 发布问题 label_release_issue: 发布问题
label_issues_sum: 问题总数:
lable_issues_undo: 未解决:
project_module_boards: 讨论区 project_module_boards: 讨论区
project_module_boards_post: 发帖 project_module_boards_post: 发帖
@ -144,6 +143,9 @@ zh:
# #
# 问题跟踪 # 问题跟踪
label_successful_create: 创建成功 label_successful_create: 创建成功
label_issues_sum: '问题总数'
lable_issues_undo: '未解决:'
# #