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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
cxt 2015-11-11 16:33:31 +08:00
parent 62cd410e1e 84348d15ea
commit 70ce172b88
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@
</div> </div>
<div id="homework_attachments"> <div id="homework_attachments">
<%= render :partial => 'users/special_user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %> <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
</div> </div>
<div class="mt5 fl"> <div class="mt5 fl">
@ -111,11 +111,9 @@
</div> </div>
<div class="mt5"> <div class="mt5">
<!--<a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">确定</a>--> <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">确定</a>
<%= submit_tag '确定',:onclick=>'popupRegex();new_student_work();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText fr' %>
<span class="fr mr10 mt3">或</span> <span class="fr mr10 mt3">或</span>
<%#= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%> <%= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
<a href="<%=user_homeworks_user_path(User.current.id) %>" class=" fr grey_btn mr10 mt3" ><%= l(:button_cancel)%></a>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<% end%> <% end%>