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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
yuanke 2016-11-04 21:09:03 +08:00
parent 44724c6905 e25096e7e6
commit 04966115c4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/student_work/_evaluation_un_group_work.html.erb
View File

@ -25,7 +25,7 @@
<em style="bottom:45px;"></em> <em style="bottom:45px;"></em>
<font style="bottom:45px;"></font> <font style="bottom:45px;"></font>
<p class="fb"><%= project.name %></p> <p class="fb break_word mw280"><%= project.name %></p>
<p class="mb10"> <p class="mb10">
<span class="mr15">创建者：<%= project.creater %></span><span>成员数量：<%= project.members.count %></span></p> <span class="mr15">创建者：<%= project.creater %></span><span>成员数量：<%= project.members.count %></span></p>

8
app/views/student_work/_student_work_list.html.erb
View File

@ -1,5 +1,5 @@
<div class="fl pr" style="padding-bottom:10px; width:720px;"> <div class="fl pr" style="padding-bottom:10px; width:720px;">
<span class="c_dark f14 fb fl mr15"> <span class="c_dark f14 fb fl mr10">
作品 作品
<font class="f12 c_red"> <font class="f12 c_red">
<% if @homework.homework_type == 3 %> <% if @homework.homework_type == 3 %>
@ -27,16 +27,16 @@
<% end %> <% end %>
</span> </span>
<%if @is_teacher || @homework.homework_detail_manual.comment_status == 3 || @homework.is_open == 1%> <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3 || @homework.is_open == 1%>
<div class="hworkSearchBox mr15"> <div class="hworkSearchBox mr10">
<input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/> <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
<a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a> <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
</div> </div>
<%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit fl mr20"}) unless course_group_list(@course).empty? %> <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit fl mr10"}) unless course_group_list(@course).empty? %>
<%if @homework.homework_type == 2 && @is_teacher %> <%if @homework.homework_type == 2 && @is_teacher %>
<%= link_to "代码查重", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fl',:remote => true %> <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fl',:remote => true %>
<% end %> <% end %>
<% end%> <% end%>
<% if @homework.homework_type == 3 && my_work && my_work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") %> <% if !@is_teacher && @homework.homework_type == 3 && my_work && my_work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") %>
<div class="mt5 fr"> <div class="mt5 fr">
<a href="javascript:void(0);" class="memberBtn fl mt3" title="添加小组成员" onclick="add_or_delete_group_member();">合作成员</a> <a href="javascript:void(0);" class="memberBtn fl mt3" title="添加小组成员" onclick="add_or_delete_group_member();">合作成员</a>
</div> </div>