Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
70ce172b88
|
@ -95,7 +95,7 @@
|
|||
</div>
|
||||
|
||||
<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 class="mt5 fl">
|
||||
|
@ -111,11 +111,9 @@
|
|||
</div>
|
||||
|
||||
<div class="mt5">
|
||||
<!--<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' %>
|
||||
<a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">确定</a>
|
||||
<span class="fr mr10 mt3">或</span>
|
||||
<%#= 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>
|
||||
<%= link_to "取消", user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
<% end%>
|
||||
|
|
Loading…
Reference in New Issue