kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_cs' into dev_cxt

This commit is contained in:
cxt 2017-10-13 10:44:32 +08:00
parent c3cf3d0edd 3039110297
commit 2b6455afef
142 changed files with 326 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/account/avatar.html.erb
View File

@ -16,7 +16,7 @@
<div class="avatar-upload">
<input class="avatar-src" name="avatar_src" type="hidden">
<input class="avatar-data" name="avatar_data" type="hidden">
<a href="javascript:void(0);" class="task-btn task-btn-blue ml5" type="button" onClick="$('input[id=avatarInput]').click();">本地上传</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange ml5" type="button" onClick="$('input[id=avatarInput]').click();">本地上传</a>
<span id="avatar-name"></span>
<input class="avatar-input" style="display:none;" id="avatarInput" name="avatar_file" type="file">
<input type="hidden" id="source_id" value="<%= @user.id %>"/>
@ -100,7 +100,7 @@
testend = teststr.match(/[^\\]+\.[^\(]+/i); //直接完整文件名的
filename.innerHTML = testend;
$(filename).css("color", '#333');
$(".avatar-save").removeClass("task-btn-grey").addClass("task-btn-blue");
$(".avatar-save").removeClass("task-btn-grey").addClass("task-btn-orange");
$(".avatar-save").on("click", save_avatar);
}

6
app/views/account/security_settings.html.erb
View File

@ -4,7 +4,7 @@
<% if @user.phone.blank? %>
<li class="font-14 mt10 color-grey"><i class="fa fa-exclamation-circle color-orange mr5"></i>未绑定</li>
<li class="font-14 mt10">&nbsp;</li>
<li><a href="<%= change_or_bind_path(:type => 'phone') %>" class="task-btn task-btn-blue">绑定</a></li>
<li><a href="<%= change_or_bind_path(:type => 'phone') %>" class="task-btn task-btn-orange">绑定</a></li>
<% else %>
<li class="font-14 mt10 color-grey"><i class="fa fa-check-circle color-light-green mr5"></i>已绑定</li>
<li class="font-14 mt10 t_l color-grey">您绑定的手机：<%= @user.user_phone %></li>
@ -16,7 +16,7 @@
<% if @user.mail.blank? %>
<li class="font-14 mt10 color-grey"><i class="fa fa-exclamation-circle color-orange mr5"></i>未绑定</li>
<li class="font-14 mt10">&nbsp;</li>
<li><a href="<%= change_or_bind_path(:type => 'mail') %>" class="task-btn task-btn-blue">绑定</a></li>
<li><a href="<%= change_or_bind_path(:type => 'mail') %>" class="task-btn task-btn-orange">绑定</a></li>
<% else %>
<li class="font-14 mt10 color-grey"><i class="fa fa-check-circle color-light-green mr5"></i>已绑定</li>
<li class="font-14 mt10 t_l color-grey">您绑定的邮箱：<%= @user.user_mail %></li>
@ -27,7 +27,7 @@
<!--<li class="font-20"><i class="fa fa-wechat color-grey font-16 mr5"></i>微信绑定</li>-->
<!--<li class="font-14 mt10 color-grey"><i class="fa fa-exclamation-circle color-orange mr5"></i>未绑定</li>-->
<!--<li class="font-14 mt10">&nbsp;</li>-->
<!--<li><a href="#" class=" task-btn task-btn-blue">绑定</a></li>-->
<!--<li><a href="#" class=" task-btn task-btn-orange">绑定</a></li>-->
<!--</ul>-->
<!--<ul class="panel-user-setting-ul clearfix">-->

2
app/views/admin/_authentication_list.html.erb
View File

@ -36,7 +36,7 @@
<input type="text" class="task-form-90 task-height-40 panel-box-sizing fl edu-form-noborder" placeholder="我得说点儿什么，最多200个字符">
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="submit_reject_reason('<%= apply_user.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="submit_reject_reason('<%= apply_user.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="hide_reject_reason(this);" >取消</a>
</li>
</div>

4
app/views/courses/_compare_code_tips_1.html.erb
View File

@ -10,8 +10,8 @@
<p class="task-popup-text-center font-16" id="compare-tips-1">代码查重已完成，点击查看结果</p>
</div>
<div class="task-popup-submit clearfix" style="width: 174px;">
<a href="javascript:void(0);" class="task-btn task-btn-blue fl" onclick = "compare_code_btn(<%=homework.id%>,<%=courseid%>)">重新查重</a>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick = "see_last_compare_code(<%=courseid%>,<%=homework.id%>)">查看结果</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fl" onclick = "compare_code_btn(<%=homework.id%>,<%=courseid%>)">重新查重</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick = "see_last_compare_code(<%=courseid%>,<%=homework.id%>)">查看结果</a>
</div>
</div>

2
app/views/courses/_compare_code_tips_2.html.erb
View File

@ -10,7 +10,7 @@
<p class="task-popup-text-center font-16"><%=des%></p>
</div>
<div class="task-popup-sure clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="yes_btn(<%=status%>,<%=courseid%>,<%=homework.id%>)">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="yes_btn(<%=status%>,<%=courseid%>,<%=homework.id%>)">确定</a>
</div>
</div>

2
app/views/courses/_join_private_course.html.erb
View File

@ -28,7 +28,7 @@
</li>
<p id="none_checked_notice" class="color-red none f12" style="margin-left: 54px;">请至少选择一个身份</p>
<li class="clearfix mt10">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr mr60" onclick="submit_join_course();">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr mr60" onclick="submit_join_course();">确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="hideModal()">取消</a>
</li>
</ul>

2
app/views/courses/new.html.erb
View File

@ -84,7 +84,7 @@
</li>
<li class=" clearfix pb20">
<label class="panel-form-label label fl">&nbsp;&nbsp;&nbsp;&nbsp;</label>
<a href="javascript:void(0);" class="task-btn task-btn-blue fl mr20" onclick="submit_new_course();">保存</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fl mr20" onclick="submit_new_course();">保存</a>
<%= link_to '取消', courses_path, :class => 'task-btn fl' %>
</li>
</ul>

2
app/views/courses/settings.html.erb
View File

@ -79,7 +79,7 @@
</li>
<li class="mt20 clearfix pb20">
<label class="panel-form-label label fl">&nbsp;&nbsp;</label>
<a href="javascript:void(0);" class="task-btn task-btn-blue fl mr20" onclick="submit_edit_course(<%= @course.id%>);">保存</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fl mr20" onclick="submit_edit_course(<%= @course.id%>);">保存</a>
<%= link_to '取消', course_path(@course), :class => 'task-btn fl ' %>
</li>
</ul>

2
app/views/courses/settings/_add_teachers.html.erb
View File

@ -52,7 +52,7 @@
</ul>
<a href="javascript:void(0);" class="pop_close task-btn" style="margin-top: 197px;">取消</a>
<a href="javascript:void(0);" class="task-btn task-btn-blue" style="margin-top: 197px;" onclick="submit_add_teacher_form()">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange" style="margin-top: 197px;" onclick="submit_add_teacher_form()">确定</a>
</div>
<% end %>
</div>

2
app/views/courses/settings/_change_manager.html.erb
View File

@ -28,7 +28,7 @@
</div>
<% end %>
<span class="color-orange fl none" id="change_manager_notice"><i class="fa fa-exclamation-circle mr5" ></i>请选择一个教师</span>
<a href="javascript:void(0);" onclick="submit_change_manager_form();" class="task-btn task-btn-blue fr">确定</a>
<a href="javascript:void(0);" onclick="submit_change_manager_form();" class="task-btn task-btn-orange fr">确定</a>
<a href="javascript:void(0);" class="pop_close task-btn fr mr10">取消</a>
<div class="cl"></div>
</div>

2
app/views/courses/settings/_choose_course_group.html.erb
View File

@ -15,7 +15,7 @@
<% end %>
</div>
<div class="task-popup-submit02 clearfix" style="width:120px;">
<a href="javascript:void(0);" id="choose_course_group_submit" class="task-btn task-btn-blue fr sure">确定</a>
<a href="javascript:void(0);" id="choose_course_group_submit" class="task-btn task-btn-orange fr sure">确定</a>
<a href="javascript:void(0);" class="pop_close task-btn fr mr10 cancel">取消</a>
</div>
</div>

2
app/views/courses/settings/_import_students.html.erb
View File

@ -20,7 +20,7 @@
<div class="cl"></div>
<span id="upload_file_count_notice" class="fl c_red none"></span>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" style="margin-right: 27px;" id="submit_resource" onclick="submit_course_resource();hideModal();">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" style="margin-right: 27px;" id="submit_resource" onclick="submit_course_resource();hideModal();">确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="$('#datetimepicker_mask').datetimepicker('destroy');hideModal();">取消</a>
<div class="cl"></div>
<% end %>

4
app/views/courses/settings/_moduels.html.erb
View File

@ -29,7 +29,7 @@
<% end %>
</form>
</ul>
<a href="javascript:void(0);" class="task-btn task-btn-blue fl" onclick="$('#update_position').submit();" >保存</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fl" onclick="$('#update_position').submit();" >保存</a>
<a href="javascript:void(0);" class="task-btn fl ml10" >取消</a>
<div class="cl"></div>
<script>
@ -84,7 +84,7 @@
'<input type="text" style="width:300px;" class="task task-height-40 panel-box-sizing fl color-grey" id="subtopic_name">' +
'<div class="cl"></div>' +
'</div>' +
'<a href="javascript:void(0);" onclick="create_subtopic();" class="task-btn task-btn-blue fr">确定</a>' +
'<a href="javascript:void(0);" onclick="create_subtopic();" class="task-btn task-btn-orange fr">确定</a>' +
'<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fr mr10">取消</a>'+
'</div>'+
'</div>'

2
app/views/courses/settings/_search_not_students_list.html.erb
View File

@ -32,7 +32,7 @@
<div class="cl"></div>
</div>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" style="" onclick="submit_add_student_form()">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" style="" onclick="submit_add_student_form()">确定</a>
<a href="javascript:void(0);" class="pop_close task-btn fr mr10" onclick="hideModal();">取消</a>
</div>

2
app/views/exercise/_edit_MC.html.erb
View File

@ -55,7 +55,7 @@
<label class="fl" style="line-height: 40px;">分</label>
<p class="fr">
<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[单选题]属于客观题将由系统自动评分，请设置标准答案</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-blue" onclick="edit_poll_question($(this),<%= exercise_question.id %>,1);">保存</a>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange" onclick="edit_poll_question($(this),<%= exercise_question.id %>,1);">保存</a>
<a href="javascript:void(0)" class="fr task-btn mr10" onclick="$('#edit_poll_questions_<%=exercise_question.id %>').hide();$('#show_poll_questions_<%=exercise_question.id %>').show();">取消</a>
</p>
</li>

2
app/views/exercise/_edit_MCQ.html.erb
View File

@ -60,7 +60,7 @@
<label class="fl" style="line-height: 40px;">分</label>
<p class="fr">
<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[多选题]属于客观题将由系统自动评分，请设置标准答案</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-blue" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">保存</a>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">保存</a>
<a href="javascript:void(0)" class="fr task-btn mr10" onclick="$('#edit_poll_questions_<%=exercise_question.id %>').hide();$('#show_poll_questions_<%=exercise_question.id %>').show();">取消</a>
</p>
</li>

4
app/views/exercise/_edit_head.html.erb
View File

@ -6,7 +6,7 @@
<textarea id="mustBe" name="exercise[exercise_description]" class="panel-box-sizing panel-form-width-100" placeholder="试卷须知：共有选择、填空、简答3种题型，其中选择题包括单选题和多选题;您可以在此处填写本次试卷答题的相关说明"><%= @exercise.try(:exercise_description) %></textarea>
</div>
<p class="fr">
<a href="javascript:void(0)" onclick="ex_head_submit($(this));" class="fr task-btn mr15 task-btn-blue">保存</a>
<a href="javascript:void(0)" onclick="ex_head_submit($(this));" class="fr task-btn mr15 task-btn-orange">保存</a>
<a href="javascript:void(0)" onclick="ex_head_cancel();" class="fr task-btn mr10">取消</a>
</p>
<% end %>
@ -28,4 +28,4 @@
}
});
});
</script>
</script>

2
app/views/exercise/_edit_multi.html.erb
View File

@ -26,7 +26,7 @@
<p class="fr">
<span class="font-12 color-grey" style="display: block;">温馨提示：[简答题]属于主观题需要人工评分，未作答的情况下系统将自动评分</span>
<span class="font-12 color-grey mb10 ml50" style="display: block;">&nbsp;&nbsp;参考答案仅作为人工评分的参考</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-blue" onclick="edit_poll_question($(this),<%= exercise_question.id %>,4);">保存</a>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange" onclick="edit_poll_question($(this),<%= exercise_question.id %>,4);">保存</a>
<a href="javascript:void(0)" class="fr task-btn mr10" onclick="$('#edit_poll_questions_<%=exercise_question.id %>').hide();$('#show_poll_questions_<%=exercise_question.id %>').show();">取消</a>
</p>
</li>

2
app/views/exercise/_edit_single.html.erb
View File

@ -49,7 +49,7 @@
<label class="fl" style="line-height: 40px;">分</label>
<p class="fr">
<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[填空题]属于客观题将由系统自动评分，请设置标准答案</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-blue"onclick="edit_poll_question($(this),<%= exercise_question.id %>,3);">保存</a>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange"onclick="edit_poll_question($(this),<%= exercise_question.id %>,3);">保存</a>
<a href="javascript:void(0)" class="fr task-btn mr10" onclick="$('#edit_poll_questions_<%=exercise_question.id %>').hide();$('#show_poll_questions_<%=exercise_question.id %>').show();">取消</a>
</p>
</li>

2
app/views/exercise/_exercise_setting.html.erb
View File

@ -350,7 +350,7 @@
<!--</div>-->
<div class="clearfix mt15 mb15 mr15 pr10 <%= edit_mode ? '' : 'none' %>" id="exam_setting_submit_block">
<a href="javascript:void(0);" onclick="ex_setting_form_submit();" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="ex_setting_form_submit();" class="task-btn task-btn-orange fr">保存</a>
<a href="javascript:void(0);" onclick="s_op_confirm_box('<%= student_exercise_list_exercise_path(@exercise) %>', '修改的内容将全部丢失<br/>是否确认取消保存')" class="task-btn fr mr10">取消</a>
</div>
</div>

2
app/views/exercise/_new_MC.html.erb
View File

@ -55,7 +55,7 @@
<label class="fl" style="line-height: 40px;">分</label>
<p class="fr">
<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[单选题]属于客观题将由系统自动评分，请设置标准答案</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-blue" id="add_new_question">保存</a>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange" id="add_new_question">保存</a>
<a href="javascript:void(0)" class="fr task-btn mr10" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
</p>
</li>

2
app/views/exercise/_new_MCQ.html.erb
View File

@ -50,7 +50,7 @@
<label class="fl" style="line-height: 40px;">分</label>
<p class="fr">
<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[多选题]属于客观题将由系统自动评分，请设置标准答案</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-blue" id="add_new_question">保存</a>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange" id="add_new_question">保存</a>
<a href="javascript:void(0)" class="fr task-btn mr10" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
</p>
</li>

2
app/views/exercise/_new_head.html.erb
View File

@ -12,6 +12,6 @@
<textarea id="mustBe" name="exercise[exercise_description]" class="panel-box-sizing panel-form-width-100" placeholder="试卷须知：共有选择、填空、简答3种题型，其中选择题包括单选题和多选题;您可以在此处填写本次试卷答题的相关说明"><%= @exercise.try(:exercise_description) %></textarea>
</div>
<p class="fr">
<a href="javascript:void(0)" onclick="ex_head_submit($(this));" class="fr task-btn mr15 task-btn-blue">保存</a>
<a href="javascript:void(0)" onclick="ex_head_submit($(this));" class="fr task-btn mr15 task-btn-orange">保存</a>
</p>
<% end %>

2
app/views/exercise/_new_multi.html.erb
View File

@ -24,7 +24,7 @@
<p class="fr">
<span class="font-12 color-grey" style="display: block;">温馨提示：[简答题]属于主观题需要人工评分，未作答的情况下系统将自动评分</span>
<span class="font-12 color-grey mb10 ml50" style="display: block;">&nbsp;&nbsp;参考答案仅作为人工评分的参考</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-blue" id="add_new_question">保存</a>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange" id="add_new_question">保存</a>
<a href="javascript:void(0)" class="fr task-btn mr10" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
</p>
</li>

2
app/views/exercise/_new_single.html.erb
View File

@ -33,7 +33,7 @@
<label class="fl" style="line-height: 40px;">分</label>
<p class="fr">
<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[填空题]属于客观题将由系统自动评分，请设置标准答案</span>
<a href="javascript:void(0)" class="fr task-btn task-btn-blue" id="add_new_question">保存</a>
<a href="javascript:void(0)" class="fr task-btn task-btn-orange" id="add_new_question">保存</a>
<a href="javascript:void(0)" class="fr task-btn mr10" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
</p>
</li>

85
app/views/exercise/_select_examination_list.html.erb Normal file
View File

@ -0,0 +1,85 @@
<div class="task-popup" style="width:620px;">
<div class="task-popup-title clearfix">
<h3 class="fl color-grey3">选择试卷</h3>
<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
</div>
<div class="task-popup-content">
<div class="clearfix mb15 test_nav_content">
<a href="javascript:void(0)" class="edu-filter-cir-grey mr20 active fl">我的试卷</a>
<!--<a href="javascript:void(0)" class="edu-filter-cir-grey mr20 fl">公共试卷</a>-->
<div class="edu-find fr with40 mr20 pr">
<div class="edu-find-input">
<input type="text" class="with100 panel-box-sizing" name="search" placeholder="输入试卷标题的关键字进行搜索" value="" id="exercise_name_search">
<span class="edu-close" onclick="colse_searchbox();" style="top:-4px" data-tip-down="关闭">×</span>
</div>
<a href="javascript:void(0);" style="top:-1px" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
</div>
</div>
<!--我的试卷-->
<div class="test_content" id="test_nav_1">
<div class="mh400">
<table class="edu-pop-table interval-td color-grey bor-grey-e" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="pl5 pr5">
<input type="radio" name="test[]" value="1" id="test_1" class="ml-3 mr5 magic-radio">
<label style="top:0px;line-height: 27px;width: 544px;" class="task-hide color-grey3" for="test_1">示例试卷</label>
</td>
</tr>
<tr>
<td class="pl5 pr5">
<input type="radio" name="test[]" value="2" id="test_2" class="ml-3 mr5 magic-radio">
<label style="top:0px;line-height: 27px;width: 544px;" class="task-hide color-grey3" for="test_2">示例试卷</label>
</td>
</tr>
<tr>
<td class="pl5 pr5">
<input type="radio" name="test[]" value="3" id="test_3" class="ml-3 mr5 magic-radio">
<label style="top:0px;line-height: 27px;width: 544px;" class="task-hide color-grey3" for="test_3">示例试卷</label>
</td>
</tr>
<tr>
<td class="pl5 pr5">
<input type="radio" name="test[]" value="4" id="test_4" class="ml-3 mr5 magic-radio">
<label style="top:0px;line-height: 27px;width: 544px;" class="task-hide color-grey3" for="test_4">示例试卷示例试卷示例试卷示例试卷示例试卷示例试卷示例试卷示例试卷示例试卷示例试卷示例试卷</label>
</td>
</tr>
</tbody>
</table>
</div>
<div class="clearfix mt15">
<div class="fl pages_little_show">
<ul>
<li><a href="javascript:void(0)" data-remote="true">上一页</a></li>
<li><a href="javascript:void(0)" class="active">1</a></li> <li><a href="/homework_bank/shixuns?page=2" class="page c_blue" data-remote="true">2</a></li>
<li><a href="javascript:void(0)" class="page" data-remote="true">3</a></li>
<li><a href="javascript:void(0)">...</a></li>
<li><a href="javascript:void(0)" class="page" data-remote="true">8</a></li>
<li><a href="javascript:void(0)" class="pages-big pages-border-right" data-remote="true">下一页</a></li>
</ul>
<div class="cl"></div>
</div>
<div class="fr">
<a href="javascript:void(0);" class="task-btn task-btn-orange fr">确认</a>
<a href="javascript:void(0);" class="task-btn fr pop_close mr10">取消</a>
</div>
</div>
</div>
</div>
</div>
<!--
<script>
$(function(){
$(".test_nav_content a").live("click",function(){
$(".test_nav_content a").removeClass("active");
$(this).addClass("active");
var index=parseInt($(this).index())+1;
$(".test_content").addClass("undis");
$("#test_nav_"+index).removeClass("undis");
})
})
</script>-->

10
app/views/exercise/index.html.erb
View File

@ -59,6 +59,7 @@
<p class="ml15 color-grey3 fl">试卷列表</p>
<% if @is_teacher %>
<a href="<%= new_exercise_path(:course_id => @course.id) %>" class="white-btn orange-btn fr mr20 mt3" title="新建">+&nbsp;新建</a>
<a href="javascript:void(0)" onclick="select_test()" class="white-btn orange-btn fr mr20 mt3">+&nbsp;试卷选用</a>
<!--<a href="javascript:void(0)" class="white-btn orange-btn fr mr20 mt3" data-remote="true" title="题库选用">+&nbsp;题库选用</a>-->
<!--<a href="javascript:void(0)" class="white-btn orange-btn fr mr20 mt3" data-remote="true" title="导出成绩">导出成绩</a>-->
<% end %>
@ -72,4 +73,11 @@
</div>
</div>
</div>
</div>
</div>
<script>
function select_test(){
var htmlvalue = "<%= j(render :partial => 'exercise/select_examination_list') %>";
pop_box_new(htmlvalue, 620, 300);
}
</script>

2
app/views/exercise/setting.html.erb
View File

@ -370,7 +370,7 @@
<!--</div>-->
<div class="clearfix mt15 mb15 mr15 pr10 <%= edit_mode ? '' : 'none' %>" id="exam_setting_submit_block">
<a href="javascript:void(0);" onclick="ex_setting_form_submit();" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="ex_setting_form_submit();" class="task-btn task-btn-orange fr">保存</a>
<a href="javascript:void(0);" onclick="s_op_confirm_box('<%= student_exercise_list_exercise_path(@exercise) %>', '修改的内容将全部丢失<br/>是否确认取消保存')" class="task-btn fr mr10">取消</a>
</div>
</div>

2
app/views/files/_attachment_history_popub.html.erb
View File

@ -57,7 +57,7 @@
</p>
<div class="clearfix">
<a href="javascript:void(0);" onclick ="upload_attachment_version(event);" onfocus = 'this.blur()' id='upload_files_submit_btn' class="task-btn task-btn-blue fr">确定</a>
<a href="javascript:void(0);" onclick ="upload_attachment_version(event);" onfocus = 'this.blur()' id='upload_files_submit_btn' class="task-btn task-btn-orange fr">确定</a>
<a href="javascript:void(0);" onclick="attachment_fresh_for_destroy()" class="task-btn fr mr10">取消</a>
</div>
<% end %>

2
app/views/files/_hidden_file.html.erb
View File

@ -25,7 +25,7 @@
<div class="cl"></div>
</div>
<div class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" id="submit_file" onclick="submit_republish_file();">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" id="submit_file" onclick="submit_republish_file();">确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="$('#datetimepicker_mask').datetimepicker('destroy');hideModal();">取消</a>
</div>
<% end %>

2
app/views/files/_upload_course_files.erb
View File

@ -71,7 +71,7 @@
<div class="cl"></div>
</div>
<span id="upload_file_count_notice" class="fl c_red none"></span>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" style="margin-right: 27px;" id="submit_resource" onclick="submit_course_resource();">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" style="margin-right: 27px;" id="submit_resource" onclick="submit_course_resource();">确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="$('#datetimepicker_mask').datetimepicker('destroy');hideModal();">取消</a>
<div class="cl"></div>
<% end %>

30
app/views/games/_code_actions.html.erb
View File

@ -8,14 +8,14 @@
<div id="prev_step_area">
<% if @game.challenge.position > 1 %>
<%= link_to "上一关 ", {:controller => 'games', :action => "prev_step", :id => @game, :myshixun_id => @myshixun},
:class => "shixun-task-btn task-btn-blue mr15 mt8", :id => "prev_step", :remote => true %>
:class => "shixun-task-btn task-btn-orange mr15 mt8", :id => "prev_step", :remote => true %>
<% end %>
</div>
<div id="code_test">
<% if @st == 0 %>
<a href="javascript:void(0)" class="shixun-task-btn task-btn-blue mr15 mt8" onclick="training_task_submmit();">评测</a>
<a href="javascript:void(0)" class="shixun-task-btn task-btn-orange mr15 mt8" onclick="training_task_submmit();">评测</a>
<% else %>
<a href="javascript:void(0)" class="shixun-task-btn task-btn-blue mr15 mt8" onclick="choice_submmit();">评测</a>
<a href="javascript:void(0)" class="shixun-task-btn task-btn-orange mr15 mt8" onclick="choice_submmit();">评测</a>
<% end %>
</div>
<div id="code_estimate">
@ -25,11 +25,11 @@
<% if @had_done == 0 %>
<% if show_next_stage?(@game, @myshixun.shixun.try(:status)) %>
<%= link_to "下一关 ", {:controller => 'games', :action => "next_step", :id => @game, :myshixun_id => @myshixun},
:class => "shixun-task-btn task-btn-blue mr15 mt8", :id => "next_step", :remote => true %>
<!--<a href="javascript:void(0);" onclick="shixun_next_step();" class="task-btn task-btn-blue mr15 mt8">下 一 步</a>-->
:class => "shixun-task-btn task-btn-orange mr15 mt8", :id => "next_step", :remote => true %>
<!--<a href="javascript:void(0);" onclick="shixun_next_step();" class="task-btn task-btn-orange mr15 mt8">下 一 步</a>-->
<% end %>
<% else %>
<a href="<%= shixun_path(@myshixun.shixun) %>" id="exit_shixun" class="shixun-task-btn task-btn-blue mt8 mr15">离开</a>
<a href="<%= shixun_path(@myshixun.shixun) %>" id="exit_shixun" class="shixun-task-btn task-btn-orange mt8 mr15">离开</a>
<% end %>
</div>
<script>
@ -210,28 +210,28 @@
icon.find("i").attr("class", "fa fa-unlock fr font-18 mt5 color-light-green w20_center");
icon.find("a:last").attr("title", "已完成");
if( data.had_done == 0 ) {
$("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-blue mr15 mt8' id='next_step' data-remote='true'>下一关</a><a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-blue mt8 mr15' >离开</a>");
$("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-orange mr15 mt8' id='next_step' data-remote='true'>下一关</a><a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-orange mt8 mr15' >离开</a>");
var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 0}) %>";
}else{
$("#code_estimate").html("<a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-blue mt8 mr15' >离开</a>");
$("#code_estimate").html("<a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-orange mt8 mr15' >离开</a>");
var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 1}) %>";
}
// 传递具体屏幕的宽高，实现不同浏览器与不同分辨率都能撑满屏幕
pop_box_new2(htmlvalue, window.innerWidth, window.innerHeight);
$("#reset_code_to_bengin").show(); // 显示加载上次通过的代码
}
var html = "<a href='javascript:void(0)' class='task-btn task-btn-blue mr15 mt8' onclick='training_task_submmit();'>评测</a>";
var html = "<a href='javascript:void(0)' class='task-btn task-btn-orange mr15 mt8' onclick='training_task_submmit();'>评测</a>";
$("#code_test").html(html); // 恢复评测
if(data.position > 1){
$("#prev_step_area").html("<a href='<%= prev_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-blue mr15 mt8' id='prev_step' data-remote='true'>上一关</a>")
$("#prev_step_area").html("<a href='<%= prev_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-orange mr15 mt8' id='prev_step' data-remote='true'>上一关</a>")
}
var codeEstimate = $("#code_estimate").children("a").html();
if(codeEstimate == undefined){
return;
}else if(codeEstimate.trim() == "下一关"){
$("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-blue mr15 mt8' id='next_step' data-remote='true'>下一关</a><a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-blue mt8 mr15' >离开</a>");
$("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-orange mr15 mt8' id='next_step' data-remote='true'>下一关</a><a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-orange mt8 mr15' >离开</a>");
} else if(codeEstimate.trim() == "离开"){
$("#code_estimate").html("<a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-blue mt8 mr15' >离开</a>");
$("#code_estimate").html("<a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-orange mt8 mr15' >离开</a>");
}
}
// 访问60次，即120s后后台还未改变状态即执行
@ -247,12 +247,12 @@
nAjaxLoading.hide();
nInfoAjaxLoading.hide();
if(data.position > 1){
$("#prev_step_area").html("<a href='<%= prev_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-blue mr15 mt8' id='prev_step' data-remote='true'>上一关</a>")
$("#prev_step_area").html("<a href='<%= prev_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-orange mr15 mt8' id='prev_step' data-remote='true'>上一关</a>")
}
if( data.had_done == 0 ) {
$("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-blue mr15 mt8' id='next_step' data-remote='true'>下一关</a><a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-blue mt8 mr15' >离开</a>");
$("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-orange mr15 mt8' id='next_step' data-remote='true'>下一关</a><a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-orange mt8 mr15' >离开</a>");
}
var html = "<a href='javascript:void(0)' class='task-btn task-btn-blue mr15 mt8' onclick='training_task_submmit();'>评测</a>";
var html = "<a href='javascript:void(0)' class='task-btn task-btn-orange mr15 mt8' onclick='training_task_submmit();'>评测</a>";
var html_1 = "实训云平台繁忙（繁忙等级：88）";
$("#code_test").html(html);

2
app/views/games/_game_answer_tip_pop.html.erb
View File

@ -14,7 +14,7 @@
</div>
<div class="task-popup-submit clearfix">
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="<%= @viewed == 2 ? "minus_shixun_score();" : "" %>hideModal();">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="<%= @viewed == 2 ? "minus_shixun_score();" : "" %>hideModal();">确定</a>
</div>
</div>

2
app/views/games/_send_error_pop.html.erb
View File

@ -10,7 +10,7 @@
</div>
<div class=" clearfix mb20 mr15">
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fr">取消</a>
<a href="javascript:void(0);" onclick="problem_report('<%= User.current.id %>');" class="task-btn task-btn-blue fr mr10">确定</a>
<a href="javascript:void(0);" onclick="problem_report('<%= User.current.id %>');" class="task-btn task-btn-orange fr mr10">确定</a>
</div>
<script>
// 给导师和管理员发送error

4
app/views/games/show.js.erb
View File

@ -17,10 +17,10 @@
// 选择题
<% if params[:choose] == "true" %>
<% if @had_done == 0 %>
$("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-blue mr15 mt8' id='next_step' data-remote='true'>下一关</a>");
$("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-orange mr15 mt8' id='next_step' data-remote='true'>下一关</a>");
var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 0}) %>";
<% else %>
$("#code_estimate").html("<a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-blue mt8 mr15' >退出实训</a>");
$("#code_estimate").html("<a href='<%= shixun_path(@myshixun.shixun) %>' class='task-btn task-btn-orange mt8 mr15' >退出实训</a>");
var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game => @game, :myshixun => @myshixun, :had_done => 1}) %>";
<% end %>
// 传递具体屏幕的宽高，实现不同浏览器与不同分辨率都能撑满屏幕

2
app/views/homework_bank/_homework_bank_list.html.erb
View File

@ -21,7 +21,7 @@
<%= link_to '实训', homework_bank_index_path(:type => @type, :property => 4), :class => 'edu-filter-cir-grey mr5 font-12 fl', :id => 'homework_bank_pro_4', :remote => true %>
<%#= link_to '试卷', homework_bank_path(:type => @type, :property => 5), :class => 'edu-filter-cir-grey mr5', :remote => true %>
</p>
<a href="javascript:void(0)" onclick="alert_choose_homework_bank_type()" class="task-btn task-btn-blue fr mr15 mt5">新建</a>
<a href="javascript:void(0)" onclick="alert_choose_homework_bank_type()" class="task-btn task-btn-orange fr mr15 mt5">新建</a>
<div class="cl"></div>
</div>
<div style="min-height: 380px;">

2
app/views/homework_bank/_new_common_homework.html.erb
View File

@ -61,7 +61,7 @@
%>
</li>
<li class="clearfix mt10">
<a href="javascript:void(0);" onclick="submit_new_common_homework(1);" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="submit_new_common_homework(1);" class="task-btn task-btn-orange fr">保存</a>
<% if edit_mode %>
<%= link_to '取消', homework_bank_path(@homework), :class => 'task-btn fr mr10' %>
<% else %>

2
app/views/homework_bank/_new_group_homework.html.erb
View File

@ -77,7 +77,7 @@
%>
</li>
<li class="clearfix mt10">
<a href="javascript:void(0);" onclick="submit_new_common_homework(3, true);" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="submit_new_common_homework(3, true);" class="task-btn task-btn-orange fr">保存</a>
<% if edit_mode %>
<%= link_to '取消', homework_bank_path(@homework), :class => 'task-btn fr mr10' %>
<% else %>

2
app/views/homework_bank/_new_program_homework.html.erb
View File

@ -130,7 +130,7 @@
%>
</li>
<li class="clearfix mt10">
<a href="javascript:void(0);" onclick="submit_new_common_homework(2);" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="submit_new_common_homework(2);" class="task-btn task-btn-orange fr">保存</a>
<% if edit_mode %>
<%= link_to '取消', homework_bank_path(@homework), :class => 'task-btn fr mr10' %>
<% else %>

5
app/views/homework_bank/_new_shixun_homework_list.html.erb
View File

@ -1,3 +1,4 @@
<div class="mh440">
<table class="edu-pop-table color-grey edu-txt-center table-pa5" cellspacing="0" cellpadding="0">
<thead>
<tr>
@ -21,10 +22,10 @@
<% end %>
</tbody>
</table>
</div>
<div class="clearfix">
<div class="clearfix fr mt15">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="new_shixun_homework_bank();">选择</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="new_shixun_homework_bank();">选择</a>
<a href="javascript:void(0);" class="task-btn fr pop_close mr10" onclick="hideModal();">取消</a>
</div>
<div class="fl pages_right_min mt10">

2
app/views/homework_bank/_send_homework_bank.html.erb
View File

@ -25,7 +25,7 @@
<% end %>
<div>
<span class="color-red undis fl" id="search_course_notice_h"></span>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="submit_send_hb_to_course();">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="submit_send_hb_to_course();">确定</a>
<a href="javascript:void(0);" class="pop_close task-btn fr mr10">取消</a>
<div class="cl"></div>
</div>

2
app/views/homework_common/_new_common_homework.html.erb
View File

@ -57,7 +57,7 @@
<!--<%#= render :partial => 'homework_common/reference_answers_attachments', :locals => {:container => @ref_answer} %>-->
<!--</li>-->
<li class="clearfix mt10 pl30 pr30">
<a href="javascript:void(0);" onclick="submit_new_common_homework(1);" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="submit_new_common_homework(1);" class="task-btn task-btn-orange fr">保存</a>
<% if edit_mode %>
<%= link_to '取消', student_work_index_path(:homework => @homework.id), :class => 'task-btn fr mr10' %>
<% else %>

2
app/views/homework_common/_new_group_homework.html.erb
View File

@ -75,7 +75,7 @@
<!--</a>-->
<!--</li>-->
<li class="clearfix mt10">
<a href="javascript:void(0);" onclick="submit_new_common_homework(3, true);" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="submit_new_common_homework(3, true);" class="task-btn task-btn-orange fr">保存</a>
<% if edit_mode %>
<%= link_to '取消', student_work_index_path(:homework => @homework.id), :class => 'task-btn fr mr10' %>
<% else %>

2
app/views/homework_common/_new_program_homework.html.erb
View File

@ -128,7 +128,7 @@
<!--</a>-->
<!--</li>-->
<li class="clearfix mt10">
<a href="javascript:void(0);" onclick="submit_new_common_homework(2);" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="submit_new_common_homework(2);" class="task-btn task-btn-orange fr">保存</a>
<% if edit_mode %>
<%= link_to '取消', student_work_index_path(:homework => @homework.id), :class => 'task-btn fr mr10' %>
<% else %>

2
app/views/homework_common/_new_shixun_homework_list.html.erb
View File

@ -25,7 +25,7 @@
</div>
<div class="clearfix">
<div class="clearfix fr mt15">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="new_shixun_homework();">选择</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="new_shixun_homework();">选择</a>
<a href="javascript:void(0);" class="task-btn fr pop_close mr10" onclick="hideModal();">取消</a>
</div>
<div class="fl pages_right_min mt10">

2
app/views/homework_common/setting.html.erb
View File

@ -66,7 +66,7 @@
</div>
</div>
<div class="clearfix mt15 mb15 mr15 pl30 pr30 <%= edit_mode ? '' : 'none' %>" id="homework_setting_submit_block">
<a href="javascript:void(0);" id="homework_setting_form_submit" class="task-btn task-btn-blue fr">确定</a>
<a href="javascript:void(0);" id="homework_setting_form_submit" class="task-btn task-btn-orange fr">确定</a>
<a href="javascript:void(0);" onclick="s_op_confirm_box('<%= student_work_index_path(:homework => @homework.id) %>', '修改的内容将全部丢失<br/>是否确认取消保存')" class="task-btn fr mr10">取消</a>
</div>
</div>

2
app/views/managements/_add_auto_users_trial.html.erb
View File

@ -17,7 +17,7 @@
<span id="choose_courses_notice" class="c_red"></span>
<div class="task-popup-submit clearfix ml25">
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl pop_close mr10">取消</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="school_submit();" class="task-btn task-btn-blue fr" >确定</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="school_submit();" class="task-btn task-btn-orange fr" >确定</a>
</div>
<div class="cl"></div>
</div>

2
app/views/managements/_all_department.html.erb
View File

@ -14,7 +14,7 @@
<span id="choose_courses_notice" class="c_red ml35"></span>
<div class="task-popup-submit clearfix ml25">
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl pop_close mr10">取消</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="department_submit();" class="task-btn task-btn-blue fr" >确定</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="department_submit();" class="task-btn task-btn-orange fr" >确定</a>
</div>
<div class="cl"></div>
</div>

2
app/views/managements/_all_schools.html.erb
View File

@ -14,7 +14,7 @@
<span id="choose_courses_notice" class="c_red"></span>
<div class="task-popup-submit clearfix ml25">
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl pop_close mr10">取消</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="school_submit();" class="task-btn task-btn-blue fr" >确定</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="school_submit();" class="task-btn task-btn-orange fr" >确定</a>
</div>
<div class="cl"></div>
</div>

2
app/views/managements/_applicable_course_list.html.erb
View File

@ -73,7 +73,7 @@
'<div class="cl"></div>' +
'<div class="task-popup-submit clearfix ml25">' +
'<a href="javascript:void(0);" class="task-btn fl pop_close mr10">取消</a>' +
'<a href="javascript:void(0);" onclick="submit_new_major('+ courselist_id +');" class="task-btn task-btn-blue fr" >确定</a>' +
'<a href="javascript:void(0);" onclick="submit_new_major('+ courselist_id +');" class="task-btn task-btn-orange fr" >确定</a>' +
'</div>' +
'</div>'+
'</div>';

2
app/views/managements/_authentication_list.html.erb
View File

@ -36,7 +36,7 @@
<input type="text" class="task-form-90 task-height-40 panel-box-sizing fl edu-form-noborder" placeholder="我得说点儿什么，最多200个字符">
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="submit_reject_reason('<%= apply_user.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="submit_reject_reason('<%= apply_user.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="hide_reject_reason(this);" >取消</a>
</li>
</div>

2
app/views/managements/_create_department.html.erb
View File

@ -23,7 +23,7 @@
<span id="choose_courses_notice" class="c_red"></span>
<div class="task-popup-submit clearfix ml25">
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl pop_close mr10">取消</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="school_submit();" class="task-btn task-btn-blue fr" >确定</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="school_submit();" class="task-btn task-btn-orange fr" >确定</a>
</div>
<div class="cl"></div>
</div>

2
app/views/managements/_modify_mirror_modal.html.erb
View File

@ -48,7 +48,7 @@
</form>
</div>
<div class="clearfix mb20 mr15">
<a href="javascript:void(0);" id="update_mirror_form_submit" class="task-btn task-btn-blue fr">确定</a>
<a href="javascript:void(0);" id="update_mirror_form_submit" class="task-btn task-btn-orange fr">确定</a>
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fr mr10">取消</a>
</div>
</div>

6
app/views/managements/_new_add_unit.html.erb
View File

@ -13,9 +13,9 @@
<input type="hidden" value="<%= @school_name%>" name="school_name" class="w150">
<%= image_tag(@school.logo_link, id: "avatar_image", :class=>"school_avatar ml25")%>
<a type="button" onclick="$('#file').click();" style="margin: 86px 0 0 0px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 70px;" class="task-btn task-btn-blue ">上传图片</a>
<a type="button" onclick="$('#file').click();" style="margin: 86px 0 0 0px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 70px;" class="task-btn task-btn-orange ">上传图片</a>
<%= file_field_tag 'logo',:style => "display:none;", :id => "file", :onchange => "showPreview(this)"%>
<a type="button"style="margin: 86px 0 0 0px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 70px;" class="task-btn task-btn-blue ">删除图片</a>
<a type="button"style="margin: 86px 0 0 0px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 70px;" class="task-btn task-btn-orange ">删除图片</a>
<div class="task-popup" style="width: 575px;">
@ -94,7 +94,7 @@
</li>
<li class="clearfix" style="margin-right:57px;">
<a href="javascript:void(0);" onclick="hideModal();" id="cancel_school" class="task-btn fr mr10">取消</a>
<a href="javascript:void(0);" id="apply_school" class="task-btn task-btn-blue fr">确定</a>
<a href="javascript:void(0);" id="apply_school" class="task-btn task-btn-orange fr">确定</a>
</li>
</ul>
</div>

2
app/views/managements/_new_major.html.erb
View File

@ -69,7 +69,7 @@
</div>
<div class="task-popup-submit clearfix ml25">
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl pop_close mr10">取消</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="new_major_submit();" class="task-btn task-btn-blue fr" >确定</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="new_major_submit();" class="task-btn task-btn-orange fr" >确定</a>
</div>
<div class="cl"></div>
</div>

2
app/views/managements/_pro_authentication_list.html.erb
View File

@ -35,7 +35,7 @@
<input type="text" class="task-form-90 task-height-40 panel-box-sizing fl edu-form-noborder" placeholder="我得说点儿什么，最多200个字符">
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="submit_reject_reason('<%= apply_user.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="submit_reject_reason('<%= apply_user.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="hide_reject_reason(this);" >取消</a>
</li>
</div>

2
app/views/managements/_shixun_authorization_list.html.erb
View File

@ -24,7 +24,7 @@
<input type="text" class="task-form-90 task-height-40 panel-box-sizing fl edu-form-noborder" placeholder="我得说点儿什么，最多200个字符">
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="shixun_submit_reject_reason('<%= authorization.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="shixun_submit_reject_reason('<%= authorization.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="shixun_hide_reject_reason(this);" >取消</a>
</li>
</div>

2
app/views/managements/_subject_authorization_list.html.erb
View File

@ -27,7 +27,7 @@
<input type="text" class="task-form-90 task-height-40 panel-box-sizing fl edu-form-noborder" placeholder="我得说点儿什么，最多200个字符">
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="subject_submit_reject_reason('<%= authorization.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="subject_submit_reject_reason('<%= authorization.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="subject_hide_reject_reason(this);" >取消</a>
</li>
</div>

2
app/views/managements/_trial_authorization_list.html.erb
View File

@ -35,7 +35,7 @@
<input type="text" class="task-form-90 task-height-40 panel-box-sizing fl edu-form-noborder" placeholder="我得说点儿什么，最多200个字符">
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="submit_reject_reason('<%= authorization.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="submit_reject_reason('<%= authorization.id %>', this);" >确定</a>
<a href="javascript:void(0);" class="task-btn fr mr10" onclick="hide_reject_reason(this);" >取消</a>
</li>
</div>

2
app/views/managements/_update_department.html.erb
View File

@ -13,7 +13,7 @@
<span id="choose_courses_notice" class="color-red ml40"></span>
<div class="task-popup-submit clearfix ml25">
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl pop_close mr10">取消</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="school_submit();" class="task-btn task-btn-blue fr" >确定</a>
<a href="javascript:void(0);" onfocus='this.blur();' onclick="school_submit();" class="task-btn task-btn-orange fr" >确定</a>
</div>
<div class="cl"></div>
</div>

2
app/views/managements/add_departments_part.html.erb
View File

@ -117,7 +117,7 @@
</li>
<li class="clearfix" style="margin-left:50%;">
<a href="javascript:void(0);" class="task-btn mr10">取消</a>
<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="submit_department()">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="submit_department()">确定</a>
</li>
</ul>
</div>

4
app/views/managements/applicable_course.html.erb
View File

@ -1,7 +1,7 @@
<%= form_tag(url_for(applicable_course_managements_path),:id=>"classroom",:method => "post",:remote=>true) do %>
<div class="edu-con-top clearfix xmt10">
<input class="fl task-form-20 task-height-30 ml35 " name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;" id="Look_name">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 " onclick="$('#classroom').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 " onclick="$('#classroom').submit();">搜索</a>
<a href="javascript:clearSearchCondition()" class="fl task-btn ml5 " id="clear_contents">清除</a>
<a href="javascript:void(0)" class="task-btn task-btn-green fr mr30" onclick="alert_new_major_type('<%= %>')">新增课程</a>
</div>
@ -27,7 +27,7 @@
'<div class="cl"></div>' +
'<div class="task-popup-submit clearfix ml25">' +
'<a href="javascript:void(0);" class="task-btn fl pop_close mr10">取消</a>' +
'<a href="javascript:void(0);" onclick="submit_new_course();" class="task-btn task-btn-blue fr" >确定</a>' +
'<a href="javascript:void(0);" onclick="submit_new_course();" class="task-btn task-btn-orange fr" >确定</a>' +
'</div>' +
'</div>'+
'<% end %>';

2
app/views/managements/auto_users_trial.html.erb
View File

@ -1,7 +1,7 @@
<div class="edu-class-top mt15 clearfix ">
<div class="fl with30">
<input type="text" name="research_contents" class="fl task-form-60 task-height-40 panel-box-sizing" placeholder="输入关键字进行搜索">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt5" onclick="$('#management_search_user').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt5" onclick="$('#management_search_user').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn ml5 mt5" id="clear_contents">清除</a>
</div>
<a href="javascript:void(0)" class="task-btn task-btn-green fr mt6 mr30" onclick="add_auto_users_trial()">新增</a>

2
app/views/managements/class_publish_shixuns.html.erb
View File

@ -11,7 +11,7 @@
<option value="cla_name">实训套件名称搜索</option>
</select>
<input class="fl task-form-20 task-height-30" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;" id="cla_sx_Look_name">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5" onclick="$('#class_publish_shixuns_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5" onclick="$('#class_publish_shixuns_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="fl task-btn ml5 mt2 ">清除</a>
<input name="sx_order" type="hidden">
</div>

2
app/views/managements/class_shixuns.html.erb
View File

@ -17,7 +17,7 @@
<option value="cla_name">实训套件名称搜索</option>
</select>
<input class="fl task-form-20 task-height-30" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;" id="cla_sx_Look_name" >
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5" onclick="$('#class_shixuns_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5" onclick="$('#class_shixuns_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition()" class="fl task-btn ml5 mt2 ">清除</a>
<input name="sx_order" type="hidden">
</div>

2
app/views/managements/classroom.html.erb
View File

@ -17,7 +17,7 @@
<option value="cla_name">课程名称搜索</option>
</select>
<input class="fl task-form-20 task-height-30 mt20" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;" id="Look_name">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt20" onclick="$('#classroom').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt20" onclick="$('#classroom').submit();">搜索</a>
<a href="javascript:clearSearchCondition()" class="fl task-btn ml5 mt2 mt20" id="clear_contents">清除</a>
<span class="fr shixun_webssh">
<input type="checkbox" class="mr5 magic-checkbox" name="support_shixuns_search_title" value="1" id="join_course_role_0">

4
app/views/managements/classroom_classment.html.erb
View File

@ -18,7 +18,7 @@
<option value="dep_name">创建者单位搜索</option>
</select>
<input class="task-form-20 task-height-30 fl" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;" id="Look_name" >
<a href="javascript:void(0);" class=" task-btn task-btn-blue ml5 mt3 fl mb5 " onclick="$('#class_publish_shixuns_search').submit();">搜索</a>
<a href="javascript:void(0);" class=" task-btn task-btn-orange ml5 mt3 fl mb5 " onclick="$('#class_publish_shixuns_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="task-btn ml5 mt3 fl mb5" id="clear_contents" >清除</a>
<span class="fr shixun_webssh">
<input type="checkbox" class="mr5 magic-checkbox" name="homepage_show" value="1" id="join_course_role_0">
@ -45,7 +45,7 @@
:format => "xls"
),
:method => "POST",
:class => "task-btn task-btn-blue ml5 mt3 fr mb5 mr30" %>
:class => "task-btn task-btn-orange ml5 mt3 fr mb5 mr30" %>
</div>
</div>
<% end %>

2
app/views/managements/classroom_classment.js.erb
View File

@ -9,4 +9,4 @@ $("#export_course_to_excel").html('<%= link_to "导出Excel",
:format => "xls"
),
:method => "POST",
:class => "task-btn task-btn-blue ml5 mt3 fr mb5 mr30"%>');
:class => "task-btn task-btn-orange ml5 mt3 fr mb5 mr30"%>');

2
app/views/managements/close_shixuns.html.erb
View File

@ -7,7 +7,7 @@
</select>
<input class="fl task-form-20 task-height-30" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;">
<li class="fl ml10">
<a href="javascript:void(0)" class="task-btn task-btn-blue" onclick="$('#close_shixuns_search').submit();">搜索</a>
<a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="$('#close_shixuns_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>
</li>
<% end %>

2
app/views/managements/depart.html.erb
View File

@ -1,7 +1,7 @@
<%= form_tag(url_for(depart_managements_path), :id => "depart_search", :method => "post", :remote => true ) do %>
<div class="edu-con-top clearfix mb20 xmt10">
<input class="fl task-form-20 task-height-30 ml35" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;" >
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt2" onclick="$('#depart_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt2" onclick="$('#depart_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="fl task-btn ml5 mt2" id="clear_contents">清除</a>
<input name="sx_order" type="hidden" />
</div>

2
app/views/managements/departments.html.erb
View File

@ -1,7 +1,7 @@
<%= form_tag(url_for(departments_managements_path),:id=>"department_search",:method => "post",:remote=>true) do %>
<div class="edu-con-top clearfix mb20 xmt10">
<input class="fl task-form-20 task-height-30 ml35" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt2" onclick="$('#department_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt2" onclick="$('#department_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="fl task-btn ml5 mt2" id="clear_contents">清除</a>
<%= link_to '创建',{:controller => 'managements', :action => 'create_departments'}, :remote => true, :class => "task-btn task-btn-green fr mt6 mr30" %>
<input name="sx_order" type="hidden"/>

2
app/views/managements/departments_part.html.erb
View File

@ -1,7 +1,7 @@
<%= form_tag(url_for(departments_part_managements_path),:id=>"department_part_search",:method => "post",:remote=>true) do %>
<div class="edu-con-top clearfix mb20 xmt10">
<input class="fl task-form-20 task-height-30 ml35" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt2" onclick="$('#department_part_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt2" onclick="$('#department_part_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="fl task-btn ml5 mt2" id="clear_contents">清除</a>
<%= link_to "新建单位",add_departments_part_managements_path(),:class => "task-btn task-btn-green fr mt6 mr30" %>
<input name="sx_order" type="hidden">

2
app/views/managements/profession.html.erb
View File

@ -3,7 +3,7 @@
<%= select_tag :major_level,options_for_select(major_level_option, 0), {:id=>"major_level_p", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 10px 0px 25px;"} %>
<%= select_tag :discipline_category_id,options_for_select(discipline_category_option, nil), {:id=>"discipline_category_id_p", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 30px 0px 50px;"} %>
<%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option, nil), {:id=> "first_level_discipline_id_p", :class=>"fl task-form-20 task-height-30", :style => "margin:0px 30px 0px 25px;"} %>
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 " onclick="$('#profession').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 " onclick="$('#profession').submit();">搜索</a>
<a href="javascript:clearSearchCondition()" class="fl task-btn ml5 mt2 " id="clear_contents">清除</a>
<%= link_to '新增',{ :controller => 'managements', :action => 'new_major', }, :remote => true, :class => "task-btn task-btn-green fr mr30" %>
<input type="hidden" name="sx_order"/>

2
app/views/managements/publish_shixuns.html.erb
View File

@ -7,7 +7,7 @@
</select>
<input class="fl task-form-20 task-height-30" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;">
<li class="fl ml10">
<a href="javascript:void(0)" class="task-btn task-btn-blue" onclick="$('#publish_shixuns_search').submit();">搜索</a>
<a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="$('#publish_shixuns_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>
</li>
<span class="fr shixun_webssh">

2
app/views/managements/shixun_feedback.html.erb
View File

@ -3,7 +3,7 @@
<!--<div class="edu-con-top clearfix mb20">-->
<!--<input class="fl task-form-20 task-height-30 ml25" id="shixun_Look_name" name="search" maxlength="" placeholder="输入实训名称关键字进行搜索" type="text" style="height: 21px;">-->
<!--<li class="fl ml10">-->
<!--<a href="javascript:void(0)" class="task-btn task-btn-blue" onclick="$('#managements_shixuns_search').submit();">搜索</a>-->
<!--<a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="$('#managements_shixuns_search').submit();">搜索</a>-->
<!--<a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>-->
<!--</li>-->
<!--</div>-->

2
app/views/managements/shixun_feedback_message.html.erb
View File

@ -3,7 +3,7 @@
<!--<div class="edu-con-top clearfix mb20">-->
<!--<input class="fl task-form-20 task-height-30 ml25" id="shixun_Look_name" name="search" maxlength="" placeholder="输入实训名称关键字进行搜索" type="text" style="height: 21px;">-->
<!--<li class="fl ml10">-->
<!--<a href="javascript:void(0)" class="task-btn task-btn-blue" onclick="$('#managements_shixuns_search').submit();">搜索</a>-->
<!--<a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="$('#managements_shixuns_search').submit();">搜索</a>-->
<!--<a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>-->
<!--</li>-->
<!--</div>-->

2
app/views/managements/shixuns.html.erb
View File

@ -15,7 +15,7 @@
</select>
<input class="fl task-form-20 task-height-30" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;">
<li class="fl ml10">
<a href="javascript:void(0)" class="task-btn task-btn-blue" onclick="$('#managements_shixuns_search').submit();">搜索</a>
<a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="$('#managements_shixuns_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>
</li>
</div>

2
app/views/managements/unit.html.erb
View File

@ -1,7 +1,7 @@
<%= form_tag(url_for(unit_managements_path), :id => "unit", :method => "post", :remote => true ) do %>
<div class="edu-con-top clearfix mb20 xmt10">
<input class="fl task-form-20 task-height-30 ml35" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt-2" onclick="$('#unit').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt-2" onclick="$('#unit').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="fl task-btn ml5 mt2" id="clear_contents">清除</a>
<input type="hidden" name="sx_order"/>
</div>

4
app/views/managements/update_user.html.erb
View File

@ -307,7 +307,7 @@
</li>
<li class="clearfix mb20" style="margin-right:41px;">
<a href="javascript:void(0);" id="user_form_link" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" id="user_form_link" class="task-btn task-btn-orange fr">保存</a>
<a href="javascript:void(0);" onclick="cancel_edit_account();" class="task-btn fr mr10">取消</a>
</li>
</ul>
@ -346,7 +346,7 @@
<!--</li>-->
<!--<li class="clearfix mb20" style="margin-right:41px;">-->
<!--<a href="javascript:void(0);" id="my_account_form_link" class="task-btn task-btn-blue fr">保存</a>-->
<!--<a href="javascript:void(0);" id="my_account_form_link" class="task-btn task-btn-orange fr">保存</a>-->
<!--<a href="javascript:void(0);" onclick="cancel_edit_account();" class="task-btn fr mr10">取消</a>-->
<!--</li>-->
<!--</div>-->

4
app/views/managements/upload_logo.html.erb
View File

@ -14,7 +14,7 @@
<li class="clearfix">
<label class="panel-form-label1 fl"><span class="color-red mr5">*</span>单位全称：</label>
<input id="schoolname" name="schoolname" type="text" class="task-form-40 task-height-40 panel-box-sizing fl" onBlur='ifNameRepeat();$("#schoolrepeatnotice").attr("value",1);' placeholder="学校名称或者工作单位名称" value="<%= @school.name %>" readonly>
<a href="<%= all_schools_managements_path(:school_id => @school.id, :upload => 1) %>" data-remote="true" class="fl task-btn task-btn-blue ml5 mt2">更改</a>
<a href="<%= all_schools_managements_path(:school_id => @school.id, :upload => 1) %>" data-remote="true" class="fl task-btn task-btn-orange ml5 mt2">更改</a>
</li>
<li class="clearfix mb10">
<label class="panel-form-label1 fl" >&nbsp;</label>
@ -76,7 +76,7 @@
</li>
<li class="clearfix" style="margin-left:50%;">
<a href="javascript:void(0);" class="task-btn mr10">取消</a>
<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="submit_department()">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="submit_department()">确定</a>
</li>
</ul>
</div>

2
app/views/managements/users.html.erb
View File

@ -30,7 +30,7 @@
<div id="search_school_result_list" style="width: 330px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display:none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
</div>
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt5" onclick="$('#managements_users_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt5" onclick="$('#managements_users_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn ml5 mt5" id="clear_contents">清除</a>
<!-- <a href="javascript:void(0);" class="fr task-btn task-btn-green mt5"> 新建用户</a>-->

2
app/views/managements/users_trial.html.erb
View File

@ -31,7 +31,7 @@
</div>
<div class="fl with30">
<input type="text" name="research_contents" class="fl task-form-60 task-height-40 panel-box-sizing" placeholder="输入关键字进行搜索">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt5" onclick="$('#management_search_user').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt5" onclick="$('#management_search_user').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn ml5 mt5" id="clear_contents">清除</a>
</div>
</div>

2
app/views/memos/_form.html.erb
View File

@ -51,7 +51,7 @@
<%= render :partial => 'forums/file_form', :locals => {:container => @memo} %>
</li>
<li class="clearfix mt10 pl30 pr30">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="submitCoursesBoard()">保存</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" onclick="submitCoursesBoard()">保存</a>
<a href="<%= forums_path %>" class="task-btn fr mr10">取消</a>
</li>
</ul>

2
app/views/memos/_memo_all_replies.html.erb
View File

@ -13,7 +13,7 @@
<%#= f.hidden_field :parent_id, :required => true, value: @memo.parent_id %>
<div nhname='toolbar_container_<%= @memo.id%>'></div>
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id %>' name="content"></textarea>
<a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="mt10 task-btn task-btn-blue fr">发送</a>
<a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="mt10 task-btn task-btn-orange fr">发送</a>
<div class="cl"></div>
<p nhname='contentmsg_<%= @memo.id%>'></p>
<% end%>

2
app/views/memos/show.html.erb
View File

@ -24,7 +24,7 @@
<p class="color-grey3 fl" style="font-size: 16px;">
<%= h @memo.subject %>
<% if @memo.sticky %>
<span class="btn-top btn-cir-red mt5 ml5">顶</span>
<span class="btn-top btn-cir-orange mt5 ml5">顶</span>
<% end %>
</p>
<!-- <p class="color-grey fr font-12 mr15 mt5"><a href="javascript:void(0)">返回</a></p>-->

2
app/views/messages/_course_show.html.erb
View File

@ -47,7 +47,7 @@
<h6 class="panel-list-title">
<%= @topic.subject %>
<% if @topic.sticky == 1 %>
<span class="btn-top btn-cir-red mt5 ml5">顶</span>
<span class="btn-top btn-cir-orange mt5 ml5">顶</span>
<% end %>
</h6>
<!--<p class="fr panel-lightgrey">

2
app/views/messages/_message_all_replies.html.erb
View File

@ -12,7 +12,7 @@
<input type="hidden" name="journal_id" value="<%= @topic.id %>"/>
<div nhname='toolbar_container_<%= @topic.id%>'></div>
<textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @topic.id%>' name="content"></textarea>
<a id="new_message_submit_btn_<%= @topic.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="mt10 task-btn task-btn-blue fr">发布</a>
<a id="new_message_submit_btn_<%= @topic.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="mt10 task-btn task-btn-orange fr">发布</a>
<div class="cl"></div>
<p nhname='contentmsg_<%= @topic.id%>'></p>
<% end%>

2
app/views/my/_apply_add_department.html.erb
View File

@ -23,7 +23,7 @@
<textarea id="remarks" style="resize: none;" class="task-form-70 task-height-100 panel-box-sizing fl" placeholder="如果有特别需要说明的事项，请在此填写"></textarea>
</li>
<li class="clearfix" style="margin-right:55px;">
<a href="javascript:void(0);" id="apply_department" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" id="apply_department" class="task-btn task-btn-orange fr">保存</a>
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fr mr10">取消</a>
</li>
</ul>

2
app/views/my/_apply_add_school.html.erb
View File

@ -74,7 +74,7 @@
<textarea id="remarks" style="resize: none;" class="task-form-70 task-height-100 panel-box-sizing fl" placeholder="如果有特别需要说明的事项，请在此填写"></textarea>
</li>
<li class="clearfix" style="margin-right:57px;">
<a href="javascript:void(0);" id="apply_school" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" id="apply_school" class="task-btn task-btn-orange fr">保存</a>
<a href="javascript:void(0);" onclick="hideModal();" id="cancel_school" class="task-btn fr mr10">取消</a>
</li>
</ul>

2
app/views/my/account.html.erb
View File

@ -251,7 +251,7 @@
<div class="cl"></div>
</li>
<li class="clearfix" style="margin-right:41px;">
<a href="javascript:void(0);" id="my_account_form_link" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" id="my_account_form_link" class="task-btn task-btn-orange fr">保存</a>
<a href="javascript:void(0);" onclick="cancel_edit_account();" class="task-btn fr mr10">取消</a>
</li>
</ul>

4
app/views/school/index.html.erb
View File

@ -83,8 +83,8 @@
</li>
<li style="width: 50%; float: left">
<input type="text" id="key_word" name="key_word" onkeydown="word_keydown(event);" class="fl task-form-35 task-height-30"/>
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml5 mt3" onclick="ssearch()" value="<%= l(:label_search) %>">搜索</a>
<!--<input type="button" class="enterprise fl task-btn task-btn-blue task-height-30 ml20 " value="<%= l(:label_search) %>" onclick="ssearch()" >-->
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt3" onclick="ssearch()" value="<%= l(:label_search) %>">搜索</a>
<!--<input type="button" class="enterprise fl task-btn task-btn-orange task-height-30 ml20 " value="<%= l(:label_search) %>" onclick="ssearch()" >-->
</li>
</ul>
</div>

8
app/views/school/upload_logo.html.erb
View File

@ -16,7 +16,7 @@ function showPreview(source) {
<div>
<input type="hidden" value="<%= @school_name%>" name="school_name" class="w150">
<%= image_tag(@school.logo_link, id: "avatar_image", :class=>"school_avatar ml25")%>
<a type="button" onclick="$('#file').click();" style="margin: 86px 0 0 0px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 70px;" class="task-btn task-btn-blue ">上传图片</a>
<a type="button" onclick="$('#file').click();" style="margin: 86px 0 0 0px;float: left;padding: 2px 5px;border: 1px solid #eaeaea;cursor: pointer;text-decoration: none;width: 70px;" class="task-btn task-btn-orange ">上传图片</a>
<%= file_field_tag 'logo',:style => "display:none;", :id => "file", :onchange => "showPreview(this)"%>
<div style="clear: both;"></div>
<div class="mt15">学校名称：<input type="text" name="name" placeholder="现在对应的学校名称" value="<%= @school.name%>" class="schoolName ml10"/></div>
@ -61,8 +61,8 @@ function showPreview(source) {
</select>
</div>
<div style="margin-top: 20px;">
<a href="javascript:void(0);" class="fl task-btn task-btn-blue" onclick="submit_edit_school($(this));">提交</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-blue ml30" onclick="history.go(-1);">取消</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange" onclick="submit_edit_school($(this));">提交</a>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml30" onclick="history.go(-1);">取消</a>
<%#= submit_tag('提交',:class=>'mr5') %>
<%#= submit_tag('取消') %>
</div>
@ -184,7 +184,7 @@ function showPreview(source) {
<!--</li>-->
<!--<li class="clearfix" style="margin-left:50%;">-->
<!--<a href="javascript:void(0);" onclick="hideModal();" id="" class="task-btn mr10">取消</a>-->
<!--<a href="javascript:void(0);" id="" class="task-btn task-btn-blue ">确定</a>-->
<!--<a href="javascript:void(0);" id="" class="task-btn task-btn-orange ">确定</a>-->
<!--</li>-->
<!--</ul>-->
<!--</div>-->

2
app/views/shixuns/_achieve_ways.html.erb
View File

@ -41,7 +41,7 @@
<input id = "points_tusi" placeholder = "选中的文件路径" class = "fl panel-form-width-200 panel-box-sizing" style = "width:440px;"/>
</div>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" style="margin-top: 20px;margin-left:20px;" id = "add_path">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" style="margin-top: 20px;margin-left:20px;" id = "add_path">确定</a>
<a href="javascript:void(0);" class="pop_close task-btn mb10 fr" style="margin-top: 20px;" id = "back_page">取消</a>
</div>
</div>

2
app/views/shixuns/_add_collaborators.html.erb
View File

@ -29,7 +29,7 @@
</div>
</div>
<a href="javascript:void(0);" class="pop_close task-btn mb10" style="margin-top: 20px;" onclick="reset_input();" >取消</a>
<a href="javascript:void(0);" class="task-btn task-btn-blue" style="margin-top: 20px;" onclick="submit_add_collaborators_form()">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange" style="margin-top: 20px;" onclick="submit_add_collaborators_form()">确定</a>
<% end %>
<div class="cl"></div>
<span class="color-orange fl none" id="add_teacher_notice"></span>

2
app/views/shixuns/_apply_mirror.html.erb
View File

@ -8,7 +8,7 @@
<label class="panel-form-label fl"><span class="color-red fl mt3">*</span>详细描述：&nbsp;&nbsp;</label>
<textarea class="fl task-form-80 task-height-150"></textarea>
</li>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr">确定</a>
<a href="javascript:void(0);" class="pop_close task-btn fr mr10">取消</a>
<div class="cl"></div>
</div>

2
app/views/shixuns/_apply_publish_notice.html.erb
View File

@ -14,6 +14,6 @@
</p>
</div>
<div class="task-popup-OK clearfix">
<a href="<%= shixun_path(@shixun) %>" class="task-btn task-btn-blue" onclick="hideModal();">知道啦</a>
<a href="<%= shixun_path(@shixun) %>" class="task-btn task-btn-orange" onclick="hideModal();">知道啦</a>
</div>
</div>

2
app/views/shixuns/_form.html.erb
View File

@ -110,7 +110,7 @@
</span>
</li>
<li class="clearfix">
<a href="javascript:void(0)" class="task-btn task-btn-blue fr" onclick="submit_new_project();">提交</a>
<a href="javascript:void(0)" class="task-btn task-btn-orange fr" onclick="submit_new_project();">提交</a>
<%= link_to "取消", shixuns_path, :class => "task-btn fr mr10" %>
</li>
<% end %>

6
app/views/shixuns/_monitor_tip.html.erb
View File

@ -1,7 +1,7 @@
<div class="task-popup" style="width: 563px;">
<div class=" task-popup-title clearfix">
<h3 class="fl color-grey">提示</h3>
<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
<!--<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>-->
</div>
<div class="task-popup-content">
<p class="task-popup-text-center font-16">
@ -21,9 +21,9 @@
</div>
<div class="task-popup-submit02 clearfix" style="padding-left: 47px;">
<% if result && @status == 1 %>
<%= link_to "知道啦", shixun_path(@shixun), :class => "task-btn task-btn-blue pop_close" %>
<%= link_to "知道啦", shixun_path(@shixun), :class => "task-btn task-btn-orange pop_close" %>
<% else %>
<a href="javascript:void(0);" class="task-btn task-btn-blue pop_close">知道啦</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange pop_close">知道啦</a>
<% end %>
</div>
</div>

2
app/views/shixuns/_search_course_list.html.erb
View File

@ -22,7 +22,7 @@
</ul>
<div class="cl"></div>
</div>
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" id="submit_send_shixun">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange fr" id="submit_send_shixun">确定</a>
<a href="javascript:void(0);" onclick="hideModal();" class="pop_close task-btn fr mr10">取消</a>
<div class="cl"></div>
</div>

2
app/views/shixuns/_shixun_pob.html.erb
View File

@ -9,6 +9,6 @@
</p>
</div>
<div class="task-popup-submit02 clearfix" style="padding-left: 47px;">
<a href="#" class="task-btn task-btn-blue pop_close">知道啦</a>
<a href="#" class="task-btn task-btn-orange pop_close">知道啦</a>
</div>
</div>

Some files were not shown because too many files have changed in this diff Show More