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

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
huang 2017-09-19 17:25:15 +08:00
parent 66ef740235 0b50a550b4
commit fcf78d07dd
17 changed files with 366 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/games_controller.rb
View File

@ -29,6 +29,7 @@ class GamesController < ApplicationController
# @st 0 实践任务 1 多选任务 2 单选任务
def show
# 展示全部实训
@is_subject = params[:is_subject]
if @game.status == 1
# 放置页面ajax数据还没获取就关闭
@game.update_attribute(:status, 0)

2
app/controllers/myshixuns_controller.rb
View File

@ -98,7 +98,7 @@ class MyshixunsController < ApplicationController
raise("实训云平台繁忙（繁忙等级：87）")
end
end
redirect_to shixun_exec_shixun_path(shixun, :type => 1)
redirect_to shixun_exec_shixun_path(shixun, :type => 1, :is_subject => params[:is_subject])
rescue Exception => e
flash[:error] = "实训云平台繁忙（繁忙等级：89）"
g.delete_project(@myshixun.gpid) if !g_project.try(:id).nil?

4
app/controllers/shixuns_controller.rb
View File

@ -384,7 +384,7 @@ class ShixunsController < ApplicationController
myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => @shixun.id).first
unless myshixun.blank?
logger.info("current task id is #{myshixun.current_task}")
redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun)
redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun, :is_subject => params[:is_subject])
return
end
ActiveRecord::Base.transaction do
@ -436,7 +436,7 @@ class ShixunsController < ApplicationController
raise("实训云平台繁忙（繁忙等级：81）")
end
logger.info("myshixun id si #{myshixun.id} and current_task id is#{myshixun.current_task.id}")
redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun)
redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun, :is_subject => params[:is_subject])
rescue Exception => e
flash[:error] = e.message
logger.info("failed to exec shixun: current task id is #{e}")

2
app/views/challenges/_single_or_multiple_question_show.html.erb
View File

@ -13,7 +13,7 @@
<% @challenge_choose.challenge_questions.each_with_index do |option, index| %>
<li class="clearfix">
<label class="panel-form-label fl <%= option.right_key ? 'color-orange03' : '' %>"><%= (option.position+ 65).chr %>：&nbsp;&nbsp;</label>
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 color-grey3">
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690 color-grey3 break-word">
<%= option.option_name %>
</div>
</li>

68
app/views/forums/forum_form_add.html Normal file
View File

@ -0,0 +1,68 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link href="../../../public/stylesheets/css/edu-common.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/edu-public.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/edu-class.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/taskstyle.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/font-awesome.css" rel="stylesheet" type="text/css"/>
<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
</head>
<body style="height: 100%; background: #fff;">
<div class="newContainer">
<div class="newMain clearfix">
<div class="edu-class-container edu-position">
<p class="mb10 font-14">
<i class="fa fa-map-marker mr5 color-grey"></i>
<a href="javascript:void(0)">kosasa</a> &gt; <a href="javascript:void(0)">讨论 </a> &gt; 新建
</p>
<div class="edu-con-top user_bg_shadow bor-grey-e">
<p class="ml15 color-grey3">新建话题</p>
</div>
<div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e pt30 pb30">
<ul>
<!--<li class="clearfix mb15 pl30 pr30">
<label class="panel-form-label fl color-dark-grey"><span class="color-orange mr5">*</span>类别&nbsp;&nbsp;&nbsp;</label>
<div class="with30 fl pr" select-for>
<input type="hidden" name="major_level" id="major_level" value="0">
<input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" readonly placeholder="选择话题类别"/>
<div class="down-select bor-grey-e user_bg_shadow" id="major_level_option">
<p data-major="3">通 告</p>
<p data-major="2">智能课堂</p>
<p data-major="1">实训项目</p>
</div>
</div>
</li>-->
<li class="clearfix mb15 pl30 pr30">
<label class="panel-form-label fl color-dark-grey"><span class="color-orange mr5">*</span>标题&nbsp;&nbsp;&nbsp;</label>
<input type="text" name="homework_common[name]" id="new_homework_name" value="" class="panel-form-width-690 panel-form-height-30 fl panel-box-sizing" maxlength="60" placeholder="最多60个字符">
<p class="color-orange" style="margin-left: 10%;"><i class="fa fa-exclamation-circle mr5"></i>标题不能超过60个字符</p>
</li>
<li class="clearfix mb5 pl30 pr30">
<label class="panel-form-label fl color-dark-grey"><span class="color-orange mr5">*</span>内容&nbsp;&nbsp;&nbsp;</label>
<input id="asset_id" name="asset_id" style="display:none" type="hidden">
<textarea class="panel-form-width-690 panel-form-height-150 fl panel-box-sizing"></textarea>
<p class="color-orange" style="margin-left: 10%;"><i class="fa fa-exclamation-circle mr5"></i>内容不能为空</p>
</li>
<li class="clearfix mb5 pl30 pr30">
<div class="mt5 clearfix">
<label class="panel-form-label fl">&nbsp;</label>
<a href="javascript:void(0);" class="fl" onclick="$('#_file').click();" title="请选择文件上传">
<i class="fa fa-upload mr5"></i>
<span>上传附件</span>
</a>
</div>
</li>
<li class="clearfix mt10 pl30 pr30">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0)" class="task-btn fr mr10">取消</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</body>
</html>

116
app/views/forums/forum_form_detail.html Normal file
View File

@ -0,0 +1,116 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link href="../../../public/stylesheets/css/edu-common.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/edu-public.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/edu-class.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/taskstyle.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/font-awesome.css" rel="stylesheet" type="text/css"/>
<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
</head>
<body style="height: 100%; background: #fff;">
<div class="newContainer">
<div class="newMain clearfix">
<div class="edu-class-container edu-position">
<p class="mb10 font-14">
<i class="fa fa-map-marker mr5 color-grey"></i>
<a href="javascript:void(0)">kosasa</a> &gt; <a href="javascript:void(0)">讨论 </a> &gt; 新建
</p>
<div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
<p class="ml15 color-grey3 fl">五个值得推荐的英语学习网站，不可错过哦！</p>
<p class="color-grey fr font-12 mr15 mt5"><a href="javascript:void(0)">返回</a></p>
</div>
<div class="edu-tab clearfix mb20 user_bg_shadow bor-grey-e">
<div class="panel-inner-fourm nobg">
<div class="clearfix pr">
<a href="/users/innov" class="fl"><img alt="用户头像" class="panel-list-img mr15" height="60" src="http://tx.haiqq.com/uploads/allimg/150331/214H3HN-8.jpg" width="60"></a>
<div class="panel-list-infobox fl" style="margin:0;margin-left: 9px">
<p><a href="/users/innov" class="font-14 mr15 color-grey">创新使者</a></p>
<p class="color-grey panel-lightgrey fl mt3">
<!--<span class="fl mr10 mt2">类别：分享</span>--><span class="fl mr10 mt2">发表于1年前</span>
</p>
</div>
<div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
<ul class="edu-position-hide undis">
<li><a href="javascript:void(0)">精&nbsp;&nbsp;选</a></li>
<li><a href="javascript:void(0);">编&nbsp;&nbsp;辑</a></li>
<li><a href="javascript:void(0)">删&nbsp;&nbsp;除</a></li>
</ul>
</div>
</div>
<div class="panel-inner-info clearfix">
<!--帖子内容-->
<strong><span style="background-color:#00D5FF;">上传文件</span></strong>
</div>
<ul class="panel-inner-info mt10">
<!--上传的文件内容-->
<li class="color-grey">
<a href="javascript:void(0)" class="link-color-grey">
<i class="fa fa-folder" aria-hidden="true"></i>
</a>
<a href="http://localhost:3000/attachments/download/160765/bigdata-logo.png" class="link-color-grey" length="58">bigdata-logo.png</a>
<span class="color-grey">(868 Bytes)</span>
<span title="kosasa">
<a href="/users/kosasa" class="link-color-grey">kosasa</a>,2017-09-19 09:02
</span>
</li>
</ul>
</div>
<div class="panel-mesbox" id="message_replies_box">
<div class="panel-mes-head clearfix">
<h4 class="fl">全部回复<span class="ml5">(1)</span></h4>
<p class="fr mr15">
<a href="javascript:void(0);" class="mr15 white-btn orange-btn" onclick="editor_focus(20198);"><i class="fa fa-comments-o mr5"></i>回复<!--<span class="ml5"></span>--></a>
<span id="praise_count_20198" class="fr mr10">
<a href="/praise_tread/praise_plus?obj_id=20198&amp;obj_type=Message&amp;type=activity&amp;user_activity_id=20198" data-remote="true" class="white-btn orange-btn" title="点赞">
<i class="fa fa-thumbs-up mr5"></i>赞
<span>0</span>
</a>
</span>
</p>
</div>
<!--回复框 messages/_message_all_replies.html.erb-->
<div class="comment_item_cont clearfix">
<div class="comment_reply_box">
<div class="J_Comment_Face fl">
<!--<%#= link_to image_tag(url_to_avatar(User.current), :width => "50", :height => "50"), :target => "_blank", :alt => "用户头像" %>-->
</div>
<!--<div nhname='new_message_<%= @topic.id%>' class="fr ml20 mr20" style="display:none; width: 92%;">
<%#= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :remote => true, :html => {:multipart => true, :id => 'message_form'} do |f| %>
<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>
<div class="cl"></div>
<p nhname='contentmsg_<%= @topic.id%>'></p>
<%# end%>
</div>-->
<div class="cl"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
function ThumbUp(item){
$(item).toggleClass("orange-btn");
$(item).toggleClass("orange-bg-btn");
if($(item).attr("attr-thumb")=="0"){
$(item).find("span").html(parseInt($(item).find("span").html())+1);
$(item).attr("attr-thumb","1");
}else{
$(item).find("span").html(parseInt($(item).find("span").html())-1);
$(item).attr("attr-thumb","0");
}
}
</script>
</body>
</html>

143
app/views/forums/forum_form_list.html Normal file
View File

@ -0,0 +1,143 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link href="../../../public/stylesheets/css/edu-common.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/edu-public.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/edu-class.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/taskstyle.css" rel="stylesheet" type="text/css"/>
<link href="../../../public/stylesheets/css/font-awesome.css" rel="stylesheet" type="text/css"/>
<script src="../../../public/javascripts/application.js" type="text/javascript" charset="utf-8"></script>
<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
</head>
<body style="height: 100%; background: #fff;">
<div class="newContainer">
<div class="newMain clearfix">
<div class="edu-class-container edu-position">
<p class="mb10 font-14">
<i class="fa fa-map-marker mr5 color-grey"></i>
<a href="/users/kosasa">kosasa</a> &gt; 讨论
</p>
<div class="edu-class-top clearfix mb30 pr user_bg_shadow bor-grey-e">
<div class="clearfix">
<div class="fl with60 mt5">
<a href="javascript:void(0)" class="fl"><img src="http://tx.haiqq.com/uploads/allimg/150331/214H3HN-8.jpg" class="bor-radius-all" width="60" height="60"/></a>
<div class="fl ml15">
<li class="font-16">胡莎莎</li>
<li class="mt5 color-grey">P547687645213</li>
</div>
</div>
<ul class="task-index-head-info fr with30" style="padding: 10px 0px;">
<li><span class="color-orange font-bd" id="all_syllabuses">983</span><br><span>被赞</span></li>
<li><span class="color-orange font-bd" id="all_syllabuses">983</span><br><span>回复/评论</span></li>
<li><span class="color-orange font-bd" id="all_syllabuses">983</span><br><span>主题</span></li>
</ul>
</div>
</div>
<div class="clearfix user_bg_shadow bor-grey-e">
<div class="clearfix pt10 pb10 pl15 pr15 bor-bottom-greyE">
<p class="color-grey3 fl font-16">问吧</p>
<a href="javascript:void(0)" class="mt3 white-btn orange-btn fr">+&nbsp;新话题</a>
</div>
<div id="forum_list" class="forum_table mh650">
<div class="forum_table_item">
<a class="fr mr15"><img src="http://tx.haiqq.com/uploads/allimg/150331/214H3HN-8.jpg" class="bor-radius-all mt3" width="50" height="50"/></a>
<div class="fl color-grey pr" style="flex: 1;">
<a href="javascript:void(0)">华沙沙</a>
<p class="font-16">
<a href="javascript:void(0)" class="clearfix item_name">五个值得推荐的英语学习网站，不可错过哦！</a>
</p>
<p style="width: 1103px;" class="overellipsis">1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈</p>
<p class="clearfix font-12 mt5">
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-eye mr5"></i>10</span>
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-thumbs-o-up mr5"></i>10</span>
<span class="mr50 fl" style="cursor: pointer;"><i class="fa fa-comments-o mr5"></i>10</span>
<!--<span class="fl">类别：分享</span>-->
<span class="fr mr5">最后更新：2小时前</span>
</p>
<div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
<ul class="edu-position-hide undis">
<li><a href="javascript:void(0)">精&nbsp;&nbsp;选</a></li>
<li><a href="javascript:void(0);">编&nbsp;&nbsp;辑</a></li>
<li><a href="javascript:void(0)">删&nbsp;&nbsp;除</a></li>
</ul>
</div>
</div>
</div>
<div class="forum_table_item">
<a class="fr mr15"><img src="http://tx.haiqq.com/uploads/allimg/150331/214H3HN-8.jpg" class="bor-radius-all mt3" width="50" height="50"/></a>
<div class="fl color-grey pr" style="flex: 1;">
<a href="javascript:void(0)">华沙沙</a>
<p class="font-16">
<a href="javascript:void(0)" class="clearfix item_name">五个值得推荐的英语学习网站，不可错过哦！</a>
</p>
<p style="width: 1103px;" class="overellipsis">1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈</p>
<p class="clearfix font-12 mt5">
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-eye mr5"></i>10</span>
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-thumbs-o-up mr5"></i>10</span>
<span class="mr50 fl" style="cursor: pointer;"><i class="fa fa-comments-o mr5"></i>10</span>
<!--<span class="fl">类别：分享</span>-->
<span class="fr mr5">最后更新：2小时前</span>
</p>
<div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
<ul class="edu-position-hide undis">
<li><a href="javascript:void(0)">精&nbsp;&nbsp;选</a></li>
<li><a href="javascript:void(0);">编&nbsp;&nbsp;辑</a></li>
<li><a href="javascript:void(0)">删&nbsp;&nbsp;除</a></li>
</ul>
</div>
</div>
</div>
<div class="forum_table_item">
<a class="fr mr15"><img src="http://tx.haiqq.com/uploads/allimg/150331/214H3HN-8.jpg" class="bor-radius-all mt3" width="50" height="50"/></a>
<div class="fl color-grey pr clearfix" style="flex: 1;">
<a href="javascript:void(0)">华沙沙</a>
<p class="font-16">
<a href="javascript:void(0)" class="clearfix item_name">五个值得推荐的英语学习网站，不可错过哦！</a>
</p>
<p style="width: 1103px;" class="overellipsis">1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈</p>
<p class="clearfix font-12 mt5">
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-eye mr5"></i>10</span>
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-thumbs-o-up mr5"></i>10</span>
<span class="mr50 fl" style="cursor: pointer;"><i class="fa fa-comments-o mr5"></i>10</span>
<!--<span class="fl">类别：分享</span>-->
<span class="fr mr5">最后更新：2小时前</span>
</p>
<div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
<ul class="edu-position-hide undis">
<li><a href="javascript:void(0)">精&nbsp;&nbsp;选</a></li>
<li><a href="javascript:void(0);">编&nbsp;&nbsp;辑</a></li>
<li><a href="javascript:void(0)">删&nbsp;&nbsp;除</a></li>
</ul>
</div>
</div>
</div>
</div>
<div style="text-align:center;" class="new_expand">
<div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">
<ul id="homework_pository_ref_pages">
<li><a href="javascript:void(0)" class="pages-big" data-remote="true">上一页</a></li>
<li><a class="active">1</a></li>
<li><a href="javascript:void(0)" class="page c_blue" data-remote="true">2</a></li>
<li><a href="javascript:void(0)" class="page c_blue" data-remote="true">3</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>
</div>
</div>
</div>
</div>
</body>
</html>

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

@ -27,7 +27,7 @@
<!--多选-->
<input type="checkbox" <%= (choose.current_choose_outputs.try(:answer).present? && (choose.current_choose_outputs.try(:answer).include? ((i + 65).chr))) ? "checked" : "" %> name="answer[]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-checkbox ml5">
<% end %>
<label class="<%= (!choose.current_choose_outputs.try(:answer).nil? && (choose.current_choose_outputs.try(:answer).include? ((i + 65).chr))) ? "color-orange05" : "" %>" for="result_<%= index %>_<%= i %>" style="top: 0px"><span><%= (question.position + 65).chr %></span>.<%= question.option_name %></label>
<label class="break-word <%=(!choose.current_choose_outputs.try(:answer).nil? && (choose.current_choose_outputs.try(:answer).include? ((i + 65).chr))) ? "color-orange05" : "" %>" for="result_<%= index %>_<%= i %>" style="top: 0px"><span><%= (question.position + 65).chr %></span>.<%= question.option_name %></label>
</span>
</p>
<% end %>

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

@ -55,7 +55,7 @@
</p>
</div>
<% if @is_teacher %>
<div class="fr edu-position edu-position-hidebox mr20 mt20">
<div class="fr edu-position edu-position-hidebox mr20 mt5">
<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
<ul class="edu-position-hide undis">
<% if homework_common.homework_type != 4 %>

9
app/views/layouts/base_myshixun.html.erb
View File

@ -17,6 +17,12 @@
</head>
<!--add by huang-->
<body onload="setupAjaxIndicator();" style="height: 100%">
<div class="loading_all <%= @is_subject ? '' : 'undis' %>" >
<div class="load">
<div class="loading_main"><img src="/images/../images/bigdata/bigdata-logo.png?1502328187" /><span>EDUCODER</span></div>
<p class="loading_seconde">LOADING<img src="/images/../images/bigdata/shenglue-ring.gif" /></p>
</div>
</div>
<div class="cl"></div>
<div class="page -layout-v -fit ">
@ -61,6 +67,9 @@
</body>
<!-- MathJax的配置 -->
<script type="text/javascript" src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
$(window).load(function (){
$(".loading_all").hide();
})
function g(o){return document.getElementById(o);}
function HoverLi1(n){
// for(var i=1;i<=2;i++){

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

@ -47,7 +47,7 @@
<% end %>
</div>
</div>
<div class="loading_all">
<div class="loading_all" style="display: none">
<div class="load">
<div class="loading_main"><img src="/images/../images/bigdata/bigdata-logo.png?1502328187" /><span>EDUCODER</span></div>
<p class="loading_seconde">LOADING<img src="/images/../images/bigdata/shenglue-ring.gif" /></p>

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

@ -1,8 +1,8 @@
<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %>
<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js',
'/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js'%>
<div class=" box_bg_shandow mt30 mb30">
<ul id="tab_nav" style="background:#fff;border-bottom:1px solid #eee;">
<div class="mt30 mb30 box_bg_shandow">
<ul id="tab_nav" style="background:#fff;border-bottom:1px solid #eee;border-top: 1px solid #eee;">
<li id="tab_nav_1" class="tab_hover_setting" onclick="HoverLi(1);">
<a href="javascript:void(0);" class="tab_type">配置</a>
</li>
@ -13,7 +13,7 @@
<!--<a href="javascript:void(0);" class="tab_type" >测试脚本</a>-->
<!--</li>-->
</ul>
<div class="task-pm-content">
<div class="task-pm-content" >
<div class="task-pm-box" style="border:0;">
<div class="tab_content clearfix" >

9
app/views/student_work/show.html.erb
View File

@ -172,10 +172,11 @@
<% end %>
<% end %>
<% end %>
<div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e" id="student_work_score_div">
<%= render :partial => 'student_work_score_div' %>
</div>
<% if @is_teacher || (@homework.homework_detail_manual.comment_status == 3 && @work.user != User.current ) %>
<div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e" id="student_work_score_div">
<%= render :partial => 'student_work_score_div' %>
</div>
<% end%>
</div>
<style type="text/css">

8
app/views/subjects/show.html.erb
View File

@ -61,9 +61,9 @@
<a class="task-btn task-btn-green" onclick="sure_box_redirect_without_newtab('<%= security_settings_path %>', '开启实训，请先绑定邮箱');" style = "display: none" id = "shixun_operation"><%= (myshixun.blank? ? "开始实战" : "继续实战") %></a>
<% else %>
<% if is_modify.blank? %>
<%= link_to (myshixun.blank? ? "开始实战" : "继续实战"), shixun_exec_shixun_path(shixun), :class => "task-btn task-btn-green ", :style=>"display: none", :id => "shixun_operation", :target => "_blank" %>
<%= link_to (myshixun.blank? ? "开始实战" : "继续实战"), shixun_exec_shixun_path(shixun, :is_subject => @subject.id), :class => "task-btn task-btn-green ", :style=>"display: none", :id => "shixun_operation", :target => "_blank" %>
<% else %>
<a class="task-btn task-btn-green" onclick="sure_box_redirect('<%= myshixun_reset_myshixun_path(myshixun) %>', '实训已经更新啦，系统正在为您重置');" style = "display: none" id = "shixun_operation"><%= (myshixun.blank? ? "开始实战" : "继续实战") %></a>
<a class="task-btn task-btn-green" onclick="sure_box_redirect('<%= myshixun_reset_myshixun_path(myshixun, :is_subject => @subject.id) %>', '实训已经更新啦，系统正在为您重置');" style = "display: none" id = "shixun_operation"><%= (myshixun.blank? ? "开始实战" : "继续实战") %></a>
<% end %>
<% end %>
<% else %>
@ -72,9 +72,9 @@
<a class="task-btn task-btn-green" onclick="sure_box_redirect_without_newtab('<%= security_settings_path %>', '开启实训，请先绑定邮箱');" style = "display: none" id = "shixun_operation">模拟实战</a>
<% else %>
<% if is_modify.blank? %>
<%= link_to "模拟实战", shixun_exec_shixun_path(shixun), :class => "task-btn task-btn-green ", :style=>"display: none", :id => "shixun_operation", :target => "_blank" %>
<%= link_to "模拟实战", shixun_exec_shixun_path(shixun, :is_subject => @subject.id), :class => "task-btn task-btn-green ", :style=>"display: none", :id => "shixun_operation", :target => "_blank" %>
<% else %>
<a class="task-btn task-btn-green" onclick="sure_box_redirect('<%= myshixun_reset_myshixun_path(myshixun) %>', '实训已经更新啦，系统正在为您重置');" style = "display: none" id = "shixun_operation">模拟实战</a>
<a class="task-btn task-btn-green" onclick="sure_box_redirect('<%= myshixun_reset_myshixun_path(myshixun, :is_subject => @subject.id) %>', '实训已经更新啦，系统正在为您重置');" style = "display: none" id = "shixun_operation">模拟实战</a>
<% end %>
<% end %>
<% end %>

2
public/javascripts/edu/course.js
View File

@ -159,7 +159,7 @@ function add_new_group(id){
'<div class="task_popup_con clearfix">' +
'<div class="pt20 clearfix mb20" style="width:400px;">' +
'<label class="panel-form-label label fl">分班名称&nbsp;&nbsp;&nbsp;&nbsp;</label>' +
'<input type="text" name="group_name" id="new_group_name" style="width:300px;" maxlength="20" class="pl10 task task-height-40 panel-box-sizing fl color-grey">' +
'<input type="text" name="group_name" id="new_group_name" style="width:300px;" placeholder="示例：分班" maxlength="20" class="pl10 task task-height-40 panel-box-sizing fl color-grey3">' +
'<div class="cl"></div>' +
'<span class="color-orange fl none" id="add_new_group_notice" style="margin-left:22.5%;"><i class="fa fa-exclamation-circle mr5" ></i>该分班已存在</span></div>' +
'<a href="javascript:void(0);" class="task-btn task-btn-blue fr mr20" onclick="submit_new_group_form('+id+');">确定</a>' +

7
public/stylesheets/css/edu-common.css
View File

@ -235,6 +235,7 @@ a.edu-txt-w140,.edu-txt-w140{ width:141px; display: inline-block;}
a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;}
.edu-txt-w50{ width:50px;}
.edu-w245{ width: 245px; }
.overellipsis{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
/* 筛选按钮 */
.edu-btn-search{ position: absolute; top:0; right:15px;}
.edu-bg-light-blue{ background:#f7f9fd; padding:5px;}
@ -326,6 +327,12 @@ html>body #ajax-indicator { position: fixed; }
}
/*----------------------列表结构*/
.forum_table .forum_table_item:nth-child(odd){background: #fafbfb}
.forum_table_item{padding: 10px 15px;display: flex;}
.forum_table_item .item_name{color: #333}
.forum_table_item .item_name:hover{color: #FF7500}
.edu-bg{ background:#fff;}
/*---------tab切换-----*/

4
public/stylesheets/css/taskstyle.css
View File

@ -93,7 +93,7 @@ a.task-header-name{ max-width:200px;}
.panel-form{margin:0 30px; padding:30px 0; }.panel-form li{ margin-bottom:20px; font-size: 14px; color:#666;}
.panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; }
.panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; color: #666;}
.panel-form-label1{ display:inline-block; width:20%; min-width:90px; text-align:right; line-height:40px; }
.panel-form input,.panel-form textarea{ border:1px solid #e2e2e2;color:#666;line-height: 1.9;}
.panel-box-sizing{-moz-box-sizing: border-box; /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; }
@ -380,7 +380,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
/*模拟实战---加载等待*/
.loading_all{background:#ffffff;z-index: 100000;width: 100%;height: 100%;position: fixed;left: 0px;top:0px;text-align: center;display: none;}
.loading_all{background:#ffffff;z-index: 100000;width: 100%;height: 100%;position: fixed;left: 0px;top:0px;text-align: center;}
.loading_main img{border-radius: 4px;}
.loading_main span{font-size: 44px;font-weight: bold;color: #ff7500;letter-spacing: 5px;margin-left: 5px;}
.load{width: auto;top:50%;margin-top:-100px;position: relative;}