Revert "测验头部和新建题目的改版"
This reverts commit c33bf1b163
.
Conflicts:
public/stylesheets/css/courses.css
This commit is contained in:
parent
c031e23a1f
commit
5a6e64beb2
|
@ -132,9 +132,7 @@ class ExerciseController < ApplicationController
|
|||
@exercise.time = params[:exercise][:time].blank? ? -1 : params[:exercise][:time]
|
||||
@exercise.end_time = Time.at(params[:exercise][:end_time].to_time.to_i + 16*60*60 -1)
|
||||
@exercise.publish_time = params[:exercise][:publish_time]
|
||||
@exercise.show_result = params[:show_result].blank? ? 1 : params[:show_result]
|
||||
@exercise.question_random = params[:question_random]
|
||||
@exercise.choice_random = params[:choice_random]
|
||||
@exercise.show_result = params[:exercise][:show_result].blank? ? 1 : params[:exercise][:show_result]
|
||||
if @exercise.save
|
||||
respond_to do |format|
|
||||
format.js
|
||||
|
|
|
@ -175,43 +175,4 @@ module ExerciseHelper
|
|||
standard_answer
|
||||
end
|
||||
|
||||
# 问题随机的下拉列表
|
||||
def question_random_select
|
||||
type = []
|
||||
option1 = []
|
||||
option1 << "题目不随机打乱"
|
||||
option1 << 0
|
||||
type << option1
|
||||
option2 = []
|
||||
option2 << "题目随机打乱"
|
||||
option2 << 1
|
||||
type << option2
|
||||
end
|
||||
|
||||
# 选项随机的下拉列表
|
||||
def choice_random_select
|
||||
type = []
|
||||
option1 = []
|
||||
option1 << "选项不随机打乱"
|
||||
option1 << 0
|
||||
type << option1
|
||||
option2 = []
|
||||
option2 << "选项随机打乱"
|
||||
option2 << 1
|
||||
type << option2
|
||||
end
|
||||
|
||||
#允许学生查看结果的下拉列表
|
||||
def show_result_select
|
||||
type = []
|
||||
option1 = []
|
||||
option1 << "允许学生查看测验结果"
|
||||
option1 << 1
|
||||
type << option1
|
||||
option2 = []
|
||||
option2 << "不允许学生查看测验结果"
|
||||
option2 << 0
|
||||
type << option2
|
||||
end
|
||||
|
||||
end
|
|
@ -16,13 +16,13 @@
|
|||
</div>
|
||||
<div class="cl"></div>
|
||||
<textarea class="testDes mt10" name="exercise[exercise_description]" id="exercise_description" placeholder="发布须知:试题类型有选择和填空两种,其中选择题包括单选题和多选题。您可以在此处填写测验相关说明。" ><%=exercise.exercise_description %></textarea>
|
||||
<div class="ur_editor_footer">
|
||||
<%= select_tag :question_random, options_for_select(question_random_select,@exercise.question_random), {:id=>"edit_question_random", :class=>"blue_select mr10 fl"} %>
|
||||
<%= select_tag :choice_random, options_for_select(choice_random_select,@exercise.choice_random), {:id=>"edit_choice_random", :class=>"blue_select mr10 fl"} %>
|
||||
<%= select_tag :show_result, options_for_select(show_result_select,@exercise.show_result), {:id=>"edit_show_result", :class=>"blue_select mr10 fl"} %>
|
||||
|
||||
<a data-button="ok" onclick="pollsSubmit($(this));" class="big_blue_btn fr borderRadius">保存</a>
|
||||
<a data-button="cancel" onclick="pollsCancel();" class="big_grey_btn fr borderRadius mr10">取消</a>
|
||||
<div class="ur_editor_footer" style="padding-top: 10px;">
|
||||
<a class="btn_submit c_white" data-button="ok" onclick="pollsSubmit($(this));">
|
||||
保存
|
||||
</a>
|
||||
<a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
|
||||
<%= l(:button_cancel)%>
|
||||
</a>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
|
|
|
@ -168,54 +168,16 @@
|
|||
$("#edit_poll_questions_"+question_id).show();
|
||||
$("#poll_questions_title_"+question_id).focus();
|
||||
}
|
||||
// 选项的选择
|
||||
function toggle_select(doc, type){
|
||||
if(doc.hasClass("question_choice_blue")){
|
||||
doc.removeClass("question_choice_blue").addClass("question_choice_white");
|
||||
if(type == "1"){
|
||||
$("#question_standard_answer").html("请点击选项");
|
||||
$("#exercise_choice").val("");
|
||||
}else{
|
||||
var eles = doc.parent().parent().find("a.question_choice_blue");
|
||||
var str = "";
|
||||
if(eles.length > 0){
|
||||
for(var i=0; i<eles.length; i++){
|
||||
str += $(eles[i]).html();
|
||||
}
|
||||
$("#question_standard_answer").html(str);
|
||||
$("#exercise_choice").val(str);
|
||||
} else{
|
||||
$("#question_standard_answer").html("请点击选项");
|
||||
$("#exercise_choice").val("");
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if(type == "1"){
|
||||
doc.parent().parent().find("a.question_choice_blue").removeClass("question_choice_blue").addClass("question_choice_white");
|
||||
doc.removeClass("question_choice_white").addClass("question_choice_blue");
|
||||
$("#question_standard_answer").html(doc.html());
|
||||
$("#exercise_choice").val(doc.html());
|
||||
} else{
|
||||
doc.removeClass("question_choice_white").addClass("question_choice_blue");
|
||||
var eles = doc.parent().parent().find("a.question_choice_blue");
|
||||
var str = "";
|
||||
for(var i=0; i<eles.length; i++){
|
||||
str += $(eles[i]).html();
|
||||
}
|
||||
$("#question_standard_answer").html(str);
|
||||
$("#exercise_choice").val(str);
|
||||
}
|
||||
}
|
||||
}
|
||||
//单选题
|
||||
function add_single_answer(doc, type)
|
||||
function add_single_answer(doc)
|
||||
{
|
||||
var li = doc.parent().before("<li class='ur_item new_answer'><a class='question_choice_white fl mr10 choice_btn' title='设为答案' href='javascript:void(0)' onclick='toggle_select($(this), "+ type +");'></a><input maxlength='200' class='w600' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
|
||||
"<a class='icon_remove' title='删除' onclick='remove_single_answer($(this))'></a>"+
|
||||
var li = doc.parent().after("<li class='ur_item'><label name='select_items' class='w60'>选项 <span class='ur_index'></span>: </label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
|
||||
"<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove' title='删除' onclick='remove_single_answer($(this))'></a>"+
|
||||
"</li><div class='cl'></div>");
|
||||
var select_items =$("li.new_answer",li.parent());
|
||||
li.prev().prev().find("a.question_choice_white").html(String.fromCharCode(64 + select_items.length));
|
||||
doc.prev("a.question_choice_dash").html(String.fromCharCode(64 + select_items.length + 1));
|
||||
var select_items =$("label[name='select_items']",li.parent());
|
||||
for(var i=0; i<select_items.length; i++){
|
||||
$(select_items[i]).html("选项"+String.fromCharCode(64 + parseInt(i+1))+"<span class='ur_index'></span>: ");
|
||||
}
|
||||
}
|
||||
function add_candidate_answer(doc)
|
||||
{
|
||||
|
@ -252,11 +214,10 @@
|
|||
{
|
||||
var parent = doc.parent().parent();
|
||||
doc.parent().remove();
|
||||
|
||||
var select_items =$("li.ur_item",parent);
|
||||
var select_items =$("label[name='select_items']",parent);
|
||||
var candiate_items =$("label[name='candiate_items']",parent);
|
||||
for(var i=0; i<select_items.length; i++){
|
||||
$(select_items[i]).find("a.choice_btn").html(String.fromCharCode(64 + parseInt(i+1)));
|
||||
$(select_items[i]).html("选项"+String.fromCharCode(64 + parseInt(i+1))+"<span class='ur_index'></span>: ");
|
||||
}
|
||||
for(var i=0; i<candiate_items.length; i++){
|
||||
$(candiate_items[i]).html("候选答案"+revert_to_chinese_num(i + 1)+"<span class='ur_index'></span>: ");
|
||||
|
|
|
@ -3,14 +3,6 @@
|
|||
:url=>create_exercise_question_exercise_path(exercise.id),
|
||||
:remote=>true ) do |f| %>
|
||||
<div class="questionContainer">
|
||||
<div class="mb10 ur_item">
|
||||
<% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %>
|
||||
<label>分值<span class="ur_index"></span>: </label>
|
||||
<input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:60px; text-align:center; padding-left:0px;">分
|
||||
<span class="fr c_red" style="width: 60px;" id="question_standard_answer">请点击选项</span>
|
||||
<span class="fr">标准答案:</span>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div class="ur_editor_title">
|
||||
<label class="questionLabel mt8">问题: </label>
|
||||
<input name="question_type" value="1" type="hidden">
|
||||
|
@ -18,44 +10,52 @@
|
|||
</div>
|
||||
<div class="ur_editor_content">
|
||||
<ul>
|
||||
<li class="ur_item">
|
||||
<% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %>
|
||||
<label>分数<span class="ur_index"></span>: </label>
|
||||
<input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<div>
|
||||
<input style="display: none;" name="exercise_choice" id="exercise_choice"/>
|
||||
<li class="ur_item new_answer">
|
||||
<a class="question_choice_white fl mr10 choice_btn" title="设为答案" href="javascript:void(0)" onclick="toggle_select($(this), 1);">A</a>
|
||||
<input maxlength="200" class="w600" type='text' name='question_answer[0]' placeholder='输入选项内容'>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item new_answer">
|
||||
<a class="question_choice_white fl mr10 choice_btn" title="设为答案" href="javascript:void(0)" onclick="toggle_select($(this), 1);">B</a>
|
||||
<input maxlength="200" class="w600" type='text' name='question_answer[1]' placeholder='输入选项内容'>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item new_answer">
|
||||
<a class="question_choice_white fl mr10 choice_btn" title="设为答案" href="javascript:void(0)" onclick="toggle_select($(this), 1);">C</a>
|
||||
<input maxlength="200" class="w600" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item new_answer">
|
||||
<a class="question_choice_white fl mr10 choice_btn" title="设为答案" href="javascript:void(0)" onclick="toggle_select($(this), 1);">D</a>
|
||||
<input maxlength="200" class="w600" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class='cl'></div>
|
||||
<li class="ur_item">
|
||||
<a class="question_choice_dash fl mr10 choice_btn">E</a>
|
||||
<div class="dash-block new-question w600" onclick='add_single_answer($(this), 1);'>新建选项</div>
|
||||
</li>
|
||||
<div class='cl'></div>
|
||||
<li class="ur_item">
|
||||
<label name='select_items' class='w60'>选项A<span class="ur_index"></span>: </label>
|
||||
<input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
|
||||
<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item">
|
||||
<label name='select_items' class='w60'>选项B<span class="ur_index"></span>: </label>
|
||||
<input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
|
||||
<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item">
|
||||
<label name='select_items' class='w60'>选项C<span class="ur_index"></span>: </label>
|
||||
<input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
|
||||
<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item">
|
||||
<label name='select_items' class='w60'>选项D<span class="ur_index"></span>: </label>
|
||||
<input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
|
||||
<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item">
|
||||
<label>标准答案<span class="ur_index"></span>: </label>
|
||||
<input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A,在此输入A即可" type="text">
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="ur_editor_footer">
|
||||
<a class="big_blue_btn borderRadius fr" data-button="ok" id="add_new_question">保存</a>
|
||||
<a class="big_grey_btn borderRadius fr mr10" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
|
||||
<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
|
||||
<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
|
|
|
@ -3,14 +3,6 @@
|
|||
:url=>create_exercise_question_exercise_path(exercise.id),
|
||||
:remote=>true ) do |f| %>
|
||||
<div class="questionContainer">
|
||||
<div class="mb10 ur_item">
|
||||
<% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
|
||||
<label>分值<span class="ur_index"></span>: </label>
|
||||
<input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:60px; text-align:center; padding-left:0px;">分
|
||||
<span class="fr c_red" style="width: 60px;" id="question_standard_answer">请点击选项</span>
|
||||
<span class="fr">标准答案:</span>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div class="ur_editor_title">
|
||||
<label class="questionLabel mt8">问题: </label>
|
||||
<input name="question_type" value="2" type="hidden">
|
||||
|
@ -18,43 +10,52 @@
|
|||
</div>
|
||||
<div class="ur_editor_content">
|
||||
<ul>
|
||||
<li class="ur_item">
|
||||
<% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
|
||||
<label>分数<span class="ur_index"></span>: </label>
|
||||
<input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<div>
|
||||
<input style="display: none;" name="exercise_choice" id="exercise_choice"/>
|
||||
<li class="ur_item new_answer">
|
||||
<a class="question_choice_white fl mr10 choice_btn" title="设为答案" href="javascript:void(0)" onclick="toggle_select($(this), 2);">A</a>
|
||||
<input maxlength="200" class="w600" type='text' name='question_answer[0]' placeholder='输入选项内容'>
|
||||
<li class="ur_item">
|
||||
<label name='select_items' class='w60'>选项A<span class="ur_index"></span>: </label>
|
||||
<input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
|
||||
<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item new_answer">
|
||||
<a class="question_choice_white fl mr10 choice_btn" title="设为答案" href="javascript:void(0)" onclick="toggle_select($(this), 2);">B</a>
|
||||
<input maxlength="200" class="w600" type='text' name='question_answer[1]' placeholder='输入选项内容'>
|
||||
<li class="ur_item">
|
||||
<label name='select_items' class='w60'>选项B<span class="ur_index"></span>: </label>
|
||||
<input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
|
||||
<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item new_answer">
|
||||
<a class="question_choice_white fl mr10 choice_btn" title="设为答案" href="javascript:void(0)" onclick="toggle_select($(this), 2);">C</a>
|
||||
<input maxlength="200" class="w600" type='text' name='question_answer[2]' placeholder='输入选项内容'>
|
||||
<li class="ur_item">
|
||||
<label name='select_items' class='w60'>选项C<span class="ur_index"></span>: </label>
|
||||
<input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
|
||||
<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item new_answer">
|
||||
<a class="question_choice_white fl mr10 choice_btn" title="设为答案" href="javascript:void(0)" onclick="toggle_select($(this), 2);">D</a>
|
||||
<input maxlength="200" class="w600" type='text' name='question_answer[3]' placeholder='输入选项内容'>
|
||||
<li class="ur_item">
|
||||
<label name='select_items' class='w60'>选项D<span class="ur_index"></span>: </label>
|
||||
<input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
|
||||
<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
|
||||
<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
|
||||
</li>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
<li class="ur_item">
|
||||
<a class="question_choice_dash fl mr10 choice_btn">E</a>
|
||||
<div class="dash-block new-question w600" onclick='add_single_answer($(this), 2);'>新建选项</div>
|
||||
<label>标准答案<span class="ur_index"></span>: </label>
|
||||
<input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A,B,C,在答案输入框填入ABC即可" type="text">
|
||||
</li>
|
||||
<div class='cl'></div>
|
||||
<div class="cl"></div>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="ur_editor_footer">
|
||||
<a class="big_blue_btn borderRadius fr" data-button="ok" id="add_new_question">保存</a>
|
||||
<a class="big_grey_btn borderRadius fr mr10" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
|
||||
<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
|
||||
<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
alert("请先保存正在编辑的题目再新建。");
|
||||
} else{
|
||||
$("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC', :locals => {:exercise=>exercise}) %>");
|
||||
$("#question_score").focus();
|
||||
$("#poll_questions_title").focus();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
|||
alert("请先保存正在编辑的题目再新建。");
|
||||
} else{
|
||||
$("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ', :locals => {:exercise=>exercise}) %>");
|
||||
$("#question_score").focus();
|
||||
$("#poll_questions_title").focus();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
|||
alert("请先保存正在编辑的题目再新建。");
|
||||
} else{
|
||||
$("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single', :locals => {:exercise=>exercise}) %>");
|
||||
$("#question_score").focus();
|
||||
$("#poll_questions_title").focus();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3,12 +3,6 @@
|
|||
:url=>create_exercise_question_exercise_path(exercise.id),
|
||||
:remote=>true ) do |f| %>
|
||||
<div class="questionContainer">
|
||||
<div class="mb10 ur_item">
|
||||
<% score = exercise.exercise_questions.where("question_type=3").last.nil? ? "": exercise.exercise_questions.where("question_type=3").last.question_score %>
|
||||
<label>分值<span class="ur_index"></span>: </label>
|
||||
<input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:60px; text-align:center; padding-left:0px;">分
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<div class="ur_editor_title">
|
||||
<label class="questionLabel mt8">问题: </label>
|
||||
<input name="question_type" value="3" type="hidden">
|
||||
|
@ -16,6 +10,12 @@
|
|||
</div>
|
||||
<div class="ur_editor_content" id="new_single">
|
||||
<ul>
|
||||
<li class="ur_item">
|
||||
<% score = exercise.exercise_questions.where("question_type=3").last.nil? ? "": exercise.exercise_questions.where("question_type=3").last.question_score %>
|
||||
<label>分数<span class="ur_index"></span>: </label>
|
||||
<input id="question_score" value="<%= score%>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
<div>
|
||||
<li class="ur_item">
|
||||
<label name='candiate_items'>候选答案一<span class="ur_index"></span>: </label>
|
||||
|
@ -42,8 +42,8 @@
|
|||
</ul>
|
||||
</div>
|
||||
<div class="ur_editor_footer">
|
||||
<a class="big_blue_btn borderRadius fr" data-button="ok" id="add_new_question">保存</a>
|
||||
<a class="big_grey_btn borderRadius fr mr10" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
|
||||
<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
|
||||
<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<div class="testStatus" onmouseover="$('#poll_head_edit_pen').show();" onmouseout="$('#poll_head_edit_pen').hide();"><!--头部显示 start-->
|
||||
<a href="javascript:" class="testEdit" title="编辑" id="poll_head_edit_pen" onclick="pollsEdit();" style="top:0;display:none"></a>
|
||||
<div class="testStatus"><!--头部显示 start-->
|
||||
<a href="javascript:" class="testEdit" title="编辑" onclick="pollsEdit();"></a>
|
||||
<!-- <a class='ur_icon_add' title='导入' id="import_btn" onclick="importPoll();"></a> -->
|
||||
<h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
|
||||
<div class="fontGrey2">
|
||||
|
@ -12,10 +12,5 @@
|
|||
<% end %>
|
||||
</div>
|
||||
<pre class="fontGrey2 font_cus" style="white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:pre-wrap;white-space:-o-pre-wrap;word-break:normal;word-wrap: break-word;"><%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%></pre>
|
||||
<div class="ur_editor_footer mt10">
|
||||
<%= select_tag :question_random, options_for_select(question_random_select,@exercise.question_random), {:id=>"edit_question_random", :class=>"grey_select fl", :disabled=>"disabled", :style=>"margin-right: 128px;"} %>
|
||||
<%= select_tag :choice_random, options_for_select(choice_random_select,@exercise.choice_random), {:id=>"edit_choice_random", :class=>"grey_select fl", :disabled=>"disabled"} %>
|
||||
<%= select_tag :show_result, options_for_select(show_result_select,@exercise.show_result), {:id=>"edit_show_result", :class=>"grey_select mr10 fr", :disabled=>"disabled"} %>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
|
@ -1,6 +0,0 @@
|
|||
class AddColumnToExercises < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :exercises, :question_random, :integer, :default => 0
|
||||
add_column :exercises, :choice_random, :integer, :default => 0
|
||||
end
|
||||
end
|
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
# It's strongly recommended to check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(:version => 20161129084352) do
|
||||
ActiveRecord::Schema.define(:version => 20161128072528) do
|
||||
|
||||
create_table "activities", :force => true do |t|
|
||||
t.integer "act_id", :null => false
|
||||
|
@ -820,13 +820,11 @@ ActiveRecord::Schema.define(:version => 20161129084352) do
|
|||
t.integer "exercise_status"
|
||||
t.integer "user_id"
|
||||
t.integer "time"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
t.datetime "publish_time"
|
||||
t.datetime "end_time"
|
||||
t.integer "show_result"
|
||||
t.integer "question_random", :default => 0
|
||||
t.integer "choice_random", :default => 0
|
||||
end
|
||||
|
||||
create_table "first_pages", :force => true do |t|
|
||||
|
|
|
@ -604,10 +604,3 @@ a:hover.ex_icon_edit{ background:url(/images/course/icons.png) -21px -276px no-
|
|||
.archive_course_notice {width:220px; position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-265px; top:-15px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
|
||||
.archive_course_notice em {display:block; border-width:10px; position:absolute;top:26px; left:-20px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;}
|
||||
.archive_course_notice span {display:block; border-width:10px; position:absolute;top:26px; left:-18px; border-style:dashed solid dashed dashed; border-color:transparent #fff transparent transparent; font-size:0; line-height:0;}
|
||||
|
||||
/* 新版测验 */
|
||||
.blue_select{ background: #3b94d6; font-size: 12px; color: #fff; padding: 5px 10px;}
|
||||
.grey_select{ background: #c3c3c3; font-size: 12px; color: #fff; padding: 5px 10px;}
|
||||
a.question_choice_white{ background: #fff; color: #000000; width: 34px; height: 30px; border: 1px solid #ddd; text-align: center; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
|
||||
a.question_choice_blue{ background: #3b94d6; color: #fff; width: 34px; height: 30px; border: 1px solid #ddd; text-align: center; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
|
||||
.question_choice_dash{ background: #fff; color: #000000; width: 34px; height: 30px; border: 1px dashed #ddd; text-align: center; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
|
||||
|
|
Loading…
Reference in New Issue