修改base_homwwork显示的内容
This commit is contained in:
parent
557c414b27
commit
cc42511a38
|
|
@ -2,7 +2,7 @@
|
|||
<% for attachment in attachments %>
|
||||
<p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
|
||||
<span title="<%= attachment.filename%>">
|
||||
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
|
||||
<%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:id => 'attachment_' -%>
|
||||
</span>
|
||||
<% if attachment.is_text? %>
|
||||
<%= link_to image_tag('magnifier.png'),
|
||||
|
|
|
|||
|
|
@ -105,66 +105,26 @@
|
|||
<tr>
|
||||
<td valign="top" colspan="2" style="font-size: 16px;padding-left: 8px;">
|
||||
<strong>
|
||||
<%= l(:label_new_course_description) %> :
|
||||
<%= l(:label_homework_description) %> :
|
||||
</strong>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="font_lighter_sidebar" colspan="2" style="padding-left: 8px;">
|
||||
<%= textilizable course.description %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign="top" style="padding-left: 8px;">
|
||||
<%= l(:label_create_time) %> :
|
||||
</td>
|
||||
<td class="font_lighter_sidebar">
|
||||
<%= format_time course.created_at %>
|
||||
<%= textilizable @bid.description %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign="top" style="padding-left: 8px; width:62px;">
|
||||
<%= l(:lable_course_teacher) %> :
|
||||
<%= l(:label_limit_time) %>:
|
||||
|
||||
</td>
|
||||
<td class="font_lighter_sidebar">
|
||||
<%= link_to(course.teacher.lastname+course.teacher.firstname, user_path(course.teacher)) %>
|
||||
<%= @bid.deadline %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign="top" style="padding-left: 8px;">
|
||||
<%= l(:label_class_period) %> :
|
||||
</td>
|
||||
<td class="font_lighter_sidebar">
|
||||
<%= course.class_period.to_s %>
|
||||
<%= l(:label_class_hour) %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign="top" style="padding-left: 8px;">
|
||||
<%= l(:label_main_term) %> :
|
||||
</td>
|
||||
<td class="font_lighter_sidebar">
|
||||
<%= course.time.to_s %>
|
||||
<%= course.term %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign="top" style="padding-left: 8px;">
|
||||
<%= l(:label_teacher_work_unit) %> :
|
||||
</td>
|
||||
<!-- modified by zjc 有@user.user_extensions.occupation改为 @user.user_extensions.school 并添加超链接 -->
|
||||
<% unless @user.user_extensions.nil? || @user.user_extensions.school.nil? %>
|
||||
<td class="font_lighter_sidebar">
|
||||
<%= link_to @user.user_extensions.school,"http://#{Setting.host_course}/?school_id=#{@user.user_extensions.school.id}" %>
|
||||
</td>
|
||||
<% end %>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="user_underline"></div>
|
||||
|
|
@ -174,8 +134,10 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<%= l(:label_limit_time) %>:
|
||||
<%= @bid.deadline %>
|
||||
<% if @bid.attachments.any?%>
|
||||
<% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false)} %>
|
||||
<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -183,33 +145,9 @@
|
|||
<%#= @bid.homework_type==Bid::HomeworkFile ? "提交文件" : "提交项目" %>
|
||||
</td-->
|
||||
</tr>
|
||||
<% unless @bid.parent_id.nil? %>
|
||||
<tr>
|
||||
<td>
|
||||
<div style=" color: rgb(255, 0, 0); width:200px">
|
||||
<% author=Bid.find(@bid.parent_id).author %>
|
||||
作业来源于<%= link_to(author.lastname+author.firstname, user_path(Bid.find(@bid.parent_id).author)) %>
|
||||
的需求：<%= link_to(Bid.find(@bid.parent_id).name, respond_path(Bid.find(@bid.parent_id))) %>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- tags -->
|
||||
<div class="user_fans">
|
||||
<div class="user_underline"></div>
|
||||
<table style="font-family:'微软雅黑'; padding-left: 8px">
|
||||
<tr>
|
||||
<td><!-- added by william -for tag -->
|
||||
<%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"} %>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
<!--homework-->
|
||||
<div class="user_fans">
|
||||
|
||||
|
|
|
|||
|
|
@ -1894,6 +1894,7 @@ zh:
|
|||
label_new_course_password: 课程密码
|
||||
label_new_course_school: 开课学校
|
||||
label_new_course_description: 课程描述
|
||||
label_homework_description: 作业描述
|
||||
label_new_join_order: 请输入课程密码
|
||||
label_task_submit_form_accessory: 作业最终以附件形式提交
|
||||
label_task_submit_form_project: 作业最终以项目形式提交
|
||||
|
|
|
|||
Loading…
Reference in New Issue