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

Merge branch 'develop' into szzh

This commit is contained in:
sw 2015-07-17 17:59:55 +08:00
parent a7666af597 eeb2e4b044
commit 7fc9059a8d
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/views/homework_common/index.html.erb
View File

@ -48,6 +48,32 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<% if homework.homework_type == 2 && homework.homework_detail_programing%>
<table class="border_ce" cellpadding="0" cellspacing="0">
<tbody>
<tr class="<%= cycle("", "b_grey") %>">
<td class="td_tit">
输入
</td>
<td class="td_tit">
输出
</td>
</tr>
<% homework.homework_tests.each do |test|%>
<tr class="<%= cycle("", "b_grey") %>">
<td class="td_tit">
<%=test.input%>
</td>
<td class="td_tit">
<%= test.output%>
</td>
</tr>
<% end%>
</tbody>
</table>
<% end%>
<div class="cl"></div>
<div class="mt5"> <div class="mt5">
<% unless homework.attachments.empty?%> <% unless homework.attachments.empty?%>
<span class="tit_fb" style="width: auto;"> 附件：</span> <span class="tit_fb" style="width: auto;"> 附件：</span>

22
app/views/student_work/index.html.erb
View File

@ -127,13 +127,31 @@
<%= student_anonymous_comment @homework %> <%= student_anonymous_comment @homework %>
<%= student_new_homework @homework %> <%= student_new_homework @homework %>
<% end %> <% end %>
<div class="cl"></div> <div class="cl"></div>
<div id="bid_description_<%= @homework.id%>" class="mt5 upload_img"> <div id="bid_description_<%= @homework.id%>" class="mt5 upload_img">
<%= @homework.description.html_safe %> <%= @homework.description.html_safe %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
<table class="border_ce" cellpadding="0" cellspacing="0">
<tbody>
<% @homework.homework_tests.each do |test|%>
<tr class="<%= cycle("", "b_grey") %>">
<td class="td_tit">
<%=test.input%>
</td>
<td class="td_tit">
<%= test.output%>
</td>
</tr>
<% end%>
</tbody>
</table>
<% end%>
<div class="cl"></div>
<div class="mt5"> <div class="mt5">
<% unless @homework.attachments.empty?%> <% unless @homework.attachments.empty?%>
<span class="tit_fb" style="width: auto;"> 附件：</span> <span class="tit_fb" style="width: auto;"> 附件：</span>