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

Merge branch 'guange_homework' into szzh

This commit is contained in:
sw 2015-09-02 10:42:36 +08:00
parent e42b6d65db d5be41eebc
commit 6b1e0b1407
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/users/_user_homework_form.html.erb
View File

@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div id="homework_editor" style="display: none"> <div id="homework_editor" style="display: none"></div>
<div class="mt10"> <div class="mt10">
<% if edit_mode %> <% if edit_mode %>
<%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %> <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %>
@ -29,6 +29,7 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="mt10"> <div class="mt10">
<!--<input type="text" class="InputBox W700 SearchIcon" placeholder="发送到课程" />--> <!--<input type="text" class="InputBox W700 SearchIcon" placeholder="发送到课程" />-->
<%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w720",:value => "请选择发布作业的课程"} %> <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w720",:value => "请选择发布作业的课程"} %>
@ -39,6 +40,7 @@
<%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework} %> <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework} %>
</div> </div>
<div class="mt5"> <div class="mt5">
<a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_comm_homework('new_homework_common');">发送</a> <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_comm_homework('new_homework_common');">发送</a>
<span class="fr mr10 mt3">或</span> <span class="fr mr10 mt3">或</span>
@ -56,14 +58,14 @@
<div class="advanced_option" style="display:none;"> <div class="advanced_option" style="display:none;">
<div class="mt10"> <div class="mt10">
<select class="InputBox W120" required="true" name="program[language]"> <select class="InputBox W120" name="program[language]">
<option value="1" selected>C语言</option> <option value="1" selected>C语言</option>
<option value="2">C++</option> <option value="2">C++</option>
</select> </select>
</div> </div>
<div class="mt10"> <div class="mt10">
<textarea class="InputBox W320 fl mr10" placeholder="测试输入" required name="program[input][]"></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" required name="program[output][]"></textarea> <textarea class="InputBox W320 fl mr10" placeholder="测试输入" name="program[input][]"></textarea><textarea class="InputBox W320 fl mr5" placeholder="测试输出" name="program[output][]"></textarea>
<a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a> <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
@ -84,3 +86,8 @@
</div> </div>
</script> </script>
<script type="text/javascript">
$(function (){
$("#course_id").append("<option value='-1' id='option_select' hidden selected>请选择发布作业的课程</option>");
});
</script>