Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
This commit is contained in:
commit
93bc2ae4dd
|
|
@ -190,7 +190,7 @@ class HomeworkCommonController < ApplicationController
|
|||
# homework_bank.save
|
||||
# homework.update_attributes(:homework_bank_id => homework_bank.id)
|
||||
# end
|
||||
redirect_to student_work_index_path(:homework => homework.id, :host=> Setting.host_course)
|
||||
redirect_to setting_homework_common_path(homework, :is_new => 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -340,7 +340,7 @@ class HomeworkCommonController < ApplicationController
|
|||
end
|
||||
@homework.save
|
||||
@homework_detail_manual.save
|
||||
redirect_to setting_homework_common_path(@homework)
|
||||
redirect_to student_work_index_path(:homework => @homework.id, :host=> Setting.host_course)
|
||||
end
|
||||
|
||||
def edit
|
||||
|
|
|
|||
|
|
@ -147,6 +147,24 @@ class ManagementsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# 实训留言
|
||||
def shixun_feedback
|
||||
@menu_type = 9
|
||||
@sub_type = 1
|
||||
@discusses = Discuss.where(:dis_type => "Shixun").reorder("created_at desc")
|
||||
@discusses_count = @discusses.count
|
||||
@limit = 20
|
||||
@is_remote = true
|
||||
@page = (params['page'] || 1).to_i
|
||||
@discusses_pages = Paginator.new @discusses_count, @limit, @page
|
||||
@offset ||= @discusses_pages.offset
|
||||
@discusses = paginateHelper @discusses, @limit
|
||||
respond_to do |format|
|
||||
format.js
|
||||
format.html
|
||||
end
|
||||
end
|
||||
|
||||
# 专业列表
|
||||
def profession
|
||||
@major=Major.where("0=0")
|
||||
|
|
|
|||
|
|
@ -2055,9 +2055,9 @@ class UsersController < ApplicationController
|
|||
id = ids + ids2
|
||||
id = id.uniq
|
||||
if @user == User.current
|
||||
@shixuns = Shixun.where(:id => id).order("created_at desc")
|
||||
@shixuns = Shixun.where(:id => id).order("updated_at desc")
|
||||
else
|
||||
@shixuns = Shixun.where(:status => [2, 3], :id => id).order("created_at desc")
|
||||
@shixuns = Shixun.where(:status => [2, 3], :id => id).order("updated_at desc")
|
||||
end
|
||||
@limit = 5
|
||||
@is_remote = true
|
||||
|
|
|
|||
|
|
@ -258,10 +258,10 @@ module ApplicationHelper
|
|||
myshixun = Myshixun.where(:shixun_id => shixun.id, :user_id => user.id).first
|
||||
if myshixun.nil?
|
||||
0
|
||||
elsif !myshixun.nil? && myshixun.games.select{|game| game.status == 2}.count == 0
|
||||
elsif myshixun.games.select{|game| game.status == 2}.count == 0
|
||||
-1
|
||||
elsif myshixun.games.select{|game| game.status == 0}.count > 0
|
||||
[myshixun.games.select{|game| game.status == 0}.count + 1]
|
||||
[myshixun.games.select{|game| game.status == 2}.count + 1]
|
||||
else
|
||||
myshixun.games.select{|game| game.status == 2}.count
|
||||
end
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</div>
|
||||
</li>
|
||||
<p class="color-red ml95" style="height: 25px;"><span id="stage_name_notice" style="display: none;"><i class="fa fa-exclamation-circle color-red mr5"></i>技能标签不能为空</span></p>
|
||||
<div class="prop-notice-info mb10 ml95">
|
||||
<div class="prop-notice-info mb10 ml40">
|
||||
<ol>
|
||||
<% if @st == 0 %>
|
||||
<li>学员未参考答案通过了本阶段的评测时将获得技能，否则不能获得技能</li>
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
function add_tag(){
|
||||
var num = $(".task-bd-grey").children('div').length;
|
||||
var val = $(".task-tag-input").val().trim();
|
||||
var nSkill = $(".knowledge_frame");
|
||||
if (val != ""){
|
||||
testLength = $(".task-tag-input").val().trim().length;
|
||||
$("#add_shixun_skill").before("<div class='task-tag tag-grey mt5 mr10 fl' id='knowledge_" + num + "'>" +
|
||||
|
|
@ -51,6 +52,11 @@
|
|||
}
|
||||
$("#shixun_skill_input").val("");
|
||||
$("#add_shixun_skill").hide();
|
||||
if (nSkill.length > 0){
|
||||
$("#challenge_skill_update").submit(); //当增加或者保存技能标签以后执行保存操作
|
||||
}else{
|
||||
$("#stage_name_notice").show();
|
||||
}
|
||||
}
|
||||
|
||||
function close_tag(thisObj){
|
||||
|
|
@ -58,7 +64,7 @@
|
|||
var obj = $(thisObj).parent();
|
||||
$(obj).remove();
|
||||
}
|
||||
$(document).click(function(e){
|
||||
/* $(document).click(function(e){
|
||||
if(e.target.id==$("#edit_skill").attr("id")||e.target.id==$("#add_knowledge").attr("id")||e.target.className==$(".knowledge_frame").attr("class")||e.target.className==$(".close").attr("class")||e.target.id==$("#shixun_skill_input").attr("id")){
|
||||
return;
|
||||
}else{
|
||||
|
|
@ -68,12 +74,11 @@
|
|||
if(nSkill.length!==SnSkill) {
|
||||
$("#challenge_skill_update").submit(); //当增加或者保存技能标签以后执行保存操作
|
||||
}
|
||||
|
||||
}else{
|
||||
$("#stage_name_notice").show();
|
||||
}
|
||||
}
|
||||
});
|
||||
});*/
|
||||
// function challenge_skill_update(){
|
||||
// var nSkill = $(".knowledge_frame");
|
||||
// add_tag();
|
||||
|
|
|
|||
|
|
@ -84,3 +84,6 @@
|
|||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="save-tip">
|
||||
<div class="save-tip-content">已保存</div>
|
||||
</div>
|
||||
|
|
@ -20,20 +20,20 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="task-pm-box mt20">
|
||||
<div class="panel-header">
|
||||
<h3 class="shixun_title">技能标签</h3>
|
||||
</div>
|
||||
<div class="clearfix pl15 pt15 pr15 pb15 df">
|
||||
<div class="fl"><img src="" width="150"/></div>
|
||||
<div class="fl ml20" style="flex: 1">
|
||||
<p>本勋章包含技能标签：</p>
|
||||
<div class="modal-list clearfix">
|
||||
<li>基本输入输出</li><li>基本输入输出</li><li>基本输入输出</li><li>基本输入输出</li>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
<!--<div class="task-pm-box mt20">-->
|
||||
<!--<div class="panel-header">-->
|
||||
<!--<h3 class="shixun_title">技能标签</h3>-->
|
||||
<!--</div>-->
|
||||
<!--<div class="clearfix pl15 pt15 pr15 pb15 df">-->
|
||||
<!--<div class="fl"><img src="" width="150"/></div>-->
|
||||
<!--<div class="fl ml20" style="flex: 1">-->
|
||||
<!--<p>本勋章包含技能标签：</p>-->
|
||||
<!--<div class="modal-list clearfix">-->
|
||||
<!--<li>基本输入输出</li><li>基本输入输出</li><li>基本输入输出</li><li>基本输入输出</li>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
|
||||
<div id="challenge_list">
|
||||
<%= render :partial => "content_list" %>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
<% if PraiseTread.praised(discuss) %>
|
||||
<a href='<%= praise_tread_praise_plus_path({:obj_id => discuss.id,
|
||||
:obj_type => discuss.class
|
||||
}) %>' data-remote="true" title="点赞" class="fr mt5">
|
||||
}) %>' data-remote="true" data-tip-down="点赞" class="fr mt5">
|
||||
<i class="fa fa-thumbs-up color_Purple_grey"></i>
|
||||
<%= discuss.praise_tread_cache ? discuss.praise_tread_cache.praise_num : 0 %>
|
||||
</a>
|
||||
<% else %>
|
||||
<a href='<%= praise_tread_praise_minus_path({:obj_id => discuss.id,
|
||||
:obj_type => discuss.class
|
||||
}) %>' data-remote="true" class="fr mt5" title="取消点赞" >
|
||||
}) %>' data-remote="true" class="fr mt5" data-tip-down="取消点赞" >
|
||||
<i class="fa fa-thumbs-up color-light-green"></i>
|
||||
<%= discuss.praise_tread_cache ? discuss.praise_tread_cache.praise_num : 0 %>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<li class="blacktab_con" onclick="check_tab('blacktab_con','blacktab_hover',this);">
|
||||
<a href="javascript:void(0);" class="tab_type tab_color" >评测信息</a>
|
||||
</li>
|
||||
<a href="javascript:void(0);" onclick="valuation_extend_and_zoom();" id="valuation_extend_and_zoom"><i class="fa fa-arrows-alt font-16 color-grey fr mt10 mr15" ></i></a>
|
||||
<a href="javascript:void(0);" onclick="valuation_extend_and_zoom();" id="valuation_extend_and_zoom"><i class="fa fa-expand font-16 color-grey fr mt10 mr15" ></i></a>
|
||||
<div class="cl"></div>
|
||||
</ul>
|
||||
<div class="cl"></div>
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
</div>
|
||||
|
||||
<div class="clearfix mt15 <%= 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-blue 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>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<% when 8 %>
|
||||
消息
|
||||
<% when 9 %>
|
||||
留言
|
||||
<%= @sub_type == 1 ? "实训留言列表" : "" %>
|
||||
<% when 10 %>
|
||||
<%= @sub_type == 1 ? "实名认证":(@sub_type == 2? "试用授权":(@sub_type == 3?"部门审批":(@sub_type == 4?"单位审批":(@sub_type == 5?"全部实训发布":(@sub_type == 6?"课程实训发布":"职业认证")))))%>
|
||||
<% when 11 %>
|
||||
|
|
@ -86,7 +86,12 @@
|
|||
</ul>
|
||||
</li>
|
||||
<li class="fl edu-admin-nav-li"><a href="javascript:void(0);" class="edu-admin-nav-a">消息</a></li>
|
||||
<li class="fl edu-admin-nav-li"><a href="javascript:void(0);" class="edu-admin-nav-a">留言</a></li>
|
||||
<li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 9 %>">
|
||||
<a href="javascript:void(0);" class="edu-admin-nav-a">留言</a>
|
||||
<ul class="edu-admin-nav-inner edu-absolute">
|
||||
<li><%= link_to "实训留言", shixun_feedback_managements_path %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 10 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">审批</a>
|
||||
<ul class="edu-admin-nav-inner">
|
||||
<li><%= link_to "实名认证", :controller => "managements", :action => "identity_authentication" %></li>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
<table class="edu-pop-table edu-txt-center" cellspacing="0" cellpadding="0" style="table-layout: fixed;">
|
||||
<thead>
|
||||
<th width="5%">序号</th>
|
||||
<th width="25%" style="text-align: left">实训名称</th>
|
||||
<th width="40%" style="text-align: left">评论内容</th>
|
||||
<th width="10%">评论者</th>
|
||||
<th width="10%">评论时间</th>
|
||||
<th width="10%"></th>
|
||||
<!--<i class="fa <%#= @sx_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up" %> color-light-green ml5" title="功能完善中，敬请期待"></i>-->
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @discusses.each_with_index do |dis, index| %>
|
||||
<tr>
|
||||
<% shixun = dis.dis %>
|
||||
<td><%= (@page - 1)*@limit + index + 1 %></td>
|
||||
<td><span class="table_Name_text"><%= shixun.nil? ? "" : (link_to shixun.name, shixun_path(shixun), :target => "_blank") %></span></td>
|
||||
<td style="text-align: left"><%= dis.content %></td>
|
||||
<td><%=link_to dis.user.show_real_name, user_path(dis.user), :target => "_blank" %></td>
|
||||
<td><%= format_time dis.created_at %></td>
|
||||
<td>
|
||||
<!--<a>回复</a>-->
|
||||
<!--<a>删除</a>-->
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="cl"></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">
|
||||
<%= pagination_links_full @discusses_pages, @discusses_count, :per_page_links => false, :flag => true, :is_new => true %>
|
||||
</ul>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
<div class="edu-class-container">
|
||||
<%#= form_tag(url_for(shixuns_managements_path), :id => "managements_shixuns_search", :method => "post", :remote => true ) do %>
|
||||
<!--<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:clearSearchCondition();" class="task-btn mr10">清除</a>-->
|
||||
<!--</li>-->
|
||||
<!--</div>-->
|
||||
<%# end %>
|
||||
<div class="ex_container" id="management_shixun_feedback_list">
|
||||
<%= render :partial => "shixun_feedback_list" %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1 @@
|
|||
$("#management_shixun_feedback_list").html("<%= j(render :partial => 'shixun_feedback_list') %>");
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
<div class="edu-class-container">
|
||||
<%= form_tag(url_for(shixuns_managements_path), :id => "managements_shixuns_search", :method => "post", :remote => true ) do %>
|
||||
<div class="edu-con-top clearfix mb20">
|
||||
|
|
@ -18,12 +17,13 @@
|
|||
<a href="javascript:void(0)" class="task-btn task-btn-blue" onclick="$('#managements_shixuns_search').submit();">搜索</a>
|
||||
<a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>
|
||||
</li>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="ex_container" id="management_shixun_list">
|
||||
<%= render :partial => "managements/shixun_list" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
//导航条的点击事件
|
||||
$(".all_shixun_Item li").on("click",function(){
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@
|
|||
// 新建实训
|
||||
function shixun_new(mail){
|
||||
if(mail){
|
||||
notice_box_redirect('<%= security_settings_path %>', '新建实训，请先绑定邮箱');
|
||||
sure_box_redirect('<%= security_settings_path %>', '新建实训，请先绑定邮箱');
|
||||
}else{
|
||||
window.location.href= '<%= new_shixun_path %>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<li class="fl <%= @order == 'updated_at' ? 'check_nav' : "" %>">
|
||||
<%= link_to "最热", subjects_path(:order => "updated_at", :search => @search, :sort => @sort), :remote => true %>
|
||||
</li>
|
||||
<li class="fr" style="width: auto">共<span class="color-orange"><%= @subjects_count %></span>个检索结果</li>
|
||||
<li class="fr" style="width: auto;cursor:default;">共<span class="color-orange"><%= @subjects_count %></span>个检索结果</li>
|
||||
</ul>
|
||||
<div class="content clearfix mh320">
|
||||
<% if @subjects.blank? %>
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
<p class="font-14 three_lines_show task-text-center mb20 color-dark-grey justify break_word" style="text-align: left;">
|
||||
<%= subject.description.blank? ? "轻松学习#{subject.name}~" : subject.description %>
|
||||
</p>
|
||||
<p class="color-grey bor-bottom-greyE mb5 clearfix" style="text-align: center;">
|
||||
<p class="color-grey bor-bottom-greyE mb5 clearfix" style="text-align:center;">
|
||||
<span class="pl5 pr5"><i class="fa fa-pause-circle color-light-green transform90 pr5" aria-hidden="true" data-tip-down="章节"></i><em><%= subject.stages.count %></em></span>
|
||||
<span class="pl5 pr5"><i class="fa fa-gamepad color-light-green pr5" aria-hidden="true" data-tip-down="实训"></i><em><%= subject.stage_shixuns.count %></em></span>
|
||||
<span class="pl5 pr5"><i class="fa fa-viacoin color-light-green pr5" aria-hidden="true" data-tip-down="总经验值"></i><em><%= subject.subject_score %></em></span>
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
<div class="with75 fl pr15" style="box-sizing: border-box;">
|
||||
<div class="with75 fl pr15 mb20" style="box-sizing: border-box;width: 73%">
|
||||
<!--简介-->
|
||||
<% if !@subject.description.blank? || User.current.manager_of_subject?(@subject) %>
|
||||
<div class="pb20 produce-content">
|
||||
<p class="clearfix">
|
||||
<span class="fl font-16 font-bd">简介</span>
|
||||
<div class="produce-content mb30">
|
||||
<p class="clearfix mb20">
|
||||
<span class="fl font-18 font-bd">简介</span>
|
||||
<% if User.current.manager_of_subject?(@subject) %>
|
||||
<a href="<%= edit_subject_path(@subject) %>"><i class="fa fa-pencil fr mt10 mr5 color-grey-c edit-produce"data-tip-down="编辑"></i></a>
|
||||
<% end %>
|
||||
</p>
|
||||
<div class="mt10 color-dark-grey <%= @subject.description.blank? ? 'color-light-grey' : '' %> justify">
|
||||
<pre class="pre_word" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.description.blank? ? "暂未填写" : (@subject.description) %></pre>
|
||||
<div class="color-dark-grey <%= @subject.description.blank? ? 'color-light-grey' : '' %> justify">
|
||||
<pre class="pre_word font-15" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.description.blank? ? "暂未填写" : (@subject.description) %></pre>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<!--新版阶段列表-->
|
||||
<div class="lesson-saved-list mb20">
|
||||
<div class="lesson-saved-list mb40">
|
||||
<% count = 0 %>
|
||||
<% @stages.each_with_index do |stage, s_index| %>
|
||||
<div class="lesson-saved-list-item pt10 pb10 bor-top-greyE" id="stage_div_<%= stage.id %>">
|
||||
<p class="clearfix title-line">
|
||||
<i class="fa fa-pause-circle color-light-green font-16 transform90"></i>
|
||||
<span class="font-16 font-bd">第<%= s_index + 1 %>章 <%= stage.name %></span>
|
||||
<div class="lesson-saved-list-item pt20 pb20 bor-grey-e user_bg_shadow mb20" style = "border-radius:4px;" id="stage_div_<%= stage.id %>">
|
||||
<p class="clearfix title-line ml20 mr20">
|
||||
<i class="fa fa-pause-circle color-light-green font-22 transform90 mr5"></i>
|
||||
<span class="font-18 font-bd">第<%= s_index + 1 %>章 <%= stage.name %></span>
|
||||
<% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %>
|
||||
<a href="javascript:void(0);" class="fr" onclick="edit_stage(<%= stage.id %>)"><i class="fa fa-pencil mt8 color-grey-c edit" data-tip-down="编辑"></i></a>
|
||||
<a href="javascript:void(0);" class="fr" onclick="delete_confirm_box_2('<%= stage_path(stage) %>', '确定要删除该阶段吗？');"><i class="fa fa-trash mt8 mr10 color-grey-c delete" data-tip-down="删除"></i></a>
|
||||
|
|
@ -29,44 +29,45 @@
|
|||
<% end %>
|
||||
</p>
|
||||
<div class="detail_for_paragraph clearfix">
|
||||
<p class="ml20 color-dark-grey mt10 mb10 justify"><%= stage.description %></p>
|
||||
<p class="color-dark-grey mt20 mb25 ml20 mr20 justify font-15"><%= stage.description %></p>
|
||||
<% stage.stage_shixuns.each_with_index do |stage_shixun, index| %>
|
||||
<% shixun = stage_shixun.shixun %>
|
||||
<div class="clearfix pt10 pb10 ml20 pl10 mb10 paragraph" id="stage_shixun_<%= shixun.id %>"
|
||||
<div class="clearfix pt10 pb10 paragraph pl20 pr20" id="stage_shixun_<%= shixun.id %>"
|
||||
style="<%= allow_shixun_exec(shixun) ? "" : "cursor: pointer" %>;" onclick="<%= allow_shixun_exec(shixun) ? "" : "shixun_link('#{shixun.identifier}')" %>">
|
||||
<li class="fl li-width63">
|
||||
<i class="fa fa-sort-up color-grey-c fl mt5 mr10 transform90 font-18"></i>
|
||||
<i class="fa fa-sort-up color-grey-c fl transform90 font-18 icon-set mr5"></i>
|
||||
<span class="color-grey3 paragraph_name"><%= s_index + 1 %>-<%= index + 1 %> <%= shixun.name %></span>
|
||||
</li>
|
||||
<li class="fr mr20 status_li">
|
||||
<li class="fr status_li">
|
||||
<% if @subject.status < 2 %>
|
||||
<span class="color-grey paragraph_status"><%= shixun.shixun_status %></span>
|
||||
<% else %>
|
||||
<% if shixun.status > 1 %>
|
||||
<% case my_shixun_status(shixun, User.current) %>
|
||||
<% when '已通关' %>
|
||||
<span class="status_sx">已通关</span> <i class="fr fa fa-check-circle color-light-green font-18 mr5 mt5" title="已通关"></i>
|
||||
<span class="color-grey status_sx">已通关</span> <i class="fr fa fa-check-circle color-light-green font-18 mr5 mt5" title="已通关"></i>
|
||||
<% when '未通关' %>
|
||||
<span class="status_sx">未通关</span> <i class="fr fa fa-play-circle color-light-green font-18 mr5 mt5" title="未通关"></i>
|
||||
<span class="color-grey status_sx">未通关</span> <i class="fr fa fa-play-circle color-light-green font-18 mr5 mt5" title="未通关"></i>
|
||||
<% when '未开启' %>
|
||||
<span class="status_sx">未开启</span> <i class="fr fa fa-play-circle color-grey-c font-18 mr5 mt5" title="未开启"></i>
|
||||
<span class="color-grey status_sx">未开启</span> <i class="fr fa fa-play-circle color-grey-c font-18 mr5 mt5" title="未开启"></i>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<span class="status_sx">模拟实战</span> <i class="fr fa fa-play-circle color-light-green font-18 mr5 mt5" title="已通关"></i>
|
||||
<span class="color-grey status_sx">模拟实战</span> <i class="fr fa fa-play-circle color-light-green font-18 mr5 mt5" title="已通关"></i>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if allow_shixun_exec(shixun) %>
|
||||
<% if shixun.status > 1 %>
|
||||
<% myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => shixun.id).first %>
|
||||
<% if myshixun.blank? %>
|
||||
<%= link_to "开始实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange ", :style=>"display: none", :id => "shixun_operation", :remote => true %>
|
||||
<%= link_to "开始实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-green ", :style=>"display: none", :id => "shixun_operation", :remote => true %>
|
||||
<% else %>
|
||||
<%= link_to "继续实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange", :style=>"display: none", :id => "shixun_operation", :remote => true %>
|
||||
<%= link_to "继续实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-green", :style=>"display: none", :id => "shixun_operation", :remote => true %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= link_to "模拟实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange", :style=>"display: none", :id => "shixun_operation", :remote => true %>
|
||||
<%= link_to "模拟实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-green", :style=>"display: none", :id => "shixun_operation", :remote => true %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<%= link_to "查看详情", shixun_path(shixun), :class => "task-btn task-btn-green ml10", :style=>"display: none", :target => "_blank" %>
|
||||
</li>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
@ -118,38 +119,38 @@
|
|||
<% end %>
|
||||
</div>
|
||||
<div class="with25 fr">
|
||||
<div class="edu-class-right-box ml15 mb20 user_bg_shadow bor-grey-e pl15 pt15 pr15">
|
||||
<p class="font-16">学习须知
|
||||
<div class="edu-class-right-box ml15 mb20 user_bg_shadow bor-grey-e pl20 pt20 pr20 pb20">
|
||||
<p class="font-18">学习须知
|
||||
<% if User.current.manager_of_subject?(@subject) %>
|
||||
<a href="<%= edit_subject_path(@subject) %>"><i class="fa fa-pencil fr mt10 mr5 color-grey-c edit-produce font-12"data-tip-down="编辑"></i></a>
|
||||
<% end %>
|
||||
</p>
|
||||
<p class="mt10 mb10 color-dark-grey justify"><pre class="pre_word" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes %></pre></p>
|
||||
<p class="mt10 mb10 color-dark-grey justify"><pre class="pre_word font-15" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes %></pre></p>
|
||||
</div>
|
||||
<div class="edu-class-right-box ml15 user_bg_shadow bor-grey-e pt15 mb20" style="border-bottom: none">
|
||||
<p class="font-16 ml15 mr15">教学团队
|
||||
<div class="edu-class-right-box ml15 user_bg_shadow bor-grey-e pt20 mb40 pl20 pr20">
|
||||
<p class="font-18">教学团队
|
||||
<% if User.current == @subject.user %>
|
||||
<i class="fa fa-pencil fr mt10 mr5 color-grey-c edit-produce font-12"data-tip-down="编辑" onclick="edit_produce();"></i>
|
||||
<% end %>
|
||||
</p>
|
||||
<div class="bor-bottom-greyE pl15 pr15">
|
||||
<div style="text-align: center" class="mb10 mt20">
|
||||
<p style="line-height: 15px"><%= image_tag(url_to_avatar(@subject.user), :width =>"40", :height => "40", :class => "bor-radius-all", :alt=>"头像") %></p>
|
||||
<p style="line-height: 15px"><%= @subject.user.try(:show_name) %></p>
|
||||
<p style="line-height: 27px" class="color-dark-grey font-12"><%= @subject.user.school_name %></p><!--+ @subject.user.identity-->
|
||||
<div class="mb30">
|
||||
<div style="text-align: center" class="mb30 mt30">
|
||||
<p style="line-height: 15px"><%= image_tag(url_to_avatar(@subject.user), :width =>"80", :height => "80", :class => "bor-radius-all", :alt=>"头像") %></p>
|
||||
<!--<p style="line-height: 15px"><%#= @subject.user.try(:show_name) %></p>-->
|
||||
<!--<p style="line-height: 27px" class="color-dark-grey font-12"><%#= @subject.user.school_name %></p><!–+ @subject.user.identity–>-->
|
||||
</div>
|
||||
<pre class="pre_word mb10 color-dark-grey produce justify clearfix" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.user.user_extensions.brief_introduction.blank? ? "暂未填写" : @subject.user.user_extensions.brief_introduction %></pre>
|
||||
<pre class="pre_word color-dark-grey produce justify clearfix font-15" style="color: #666;font-family: '微软雅黑','宋体';"><span class="color-black"><%= @subject.user.try(:show_name) %>：</span><%= @subject.user.user_extensions.brief_introduction.blank? ? "这家伙很懒,什么都没有留下" : @subject.user.user_extensions.brief_introduction %><span id="pre-content" class="undis"><%= @subject.user.user_extensions.brief_introduction.blank? ? "" : @subject.user.user_extensions.brief_introduction %></span></pre>
|
||||
<textarea id="user_produce_text" class="mb10 with100 panel-box-sizing produce_text undis" style="min-height: 100px;"></textarea>
|
||||
<input id="current_user_id" value="<%= User.current.id %>" type="hidden">
|
||||
</div>
|
||||
<% subject_co_users(@subject).each do |user| %>
|
||||
<div class="bor-bottom-greyE pl15 pr15">
|
||||
<div style="text-align: center" class="mb10 mt20">
|
||||
<p style="line-height: 15px"><%= image_tag(url_to_avatar(user), :width =>"40", :height => "40", :class => "bor-radius-all", :alt=>"头像") %></p>
|
||||
<p style="line-height: 15px"><%= user.try(:show_name) %></p>
|
||||
<p style="line-height: 27px" class="color-dark-grey font-12"><%= user.school_name + user.identity %></p>
|
||||
<div class="bor-top-greyE mb30">
|
||||
<div style="text-align: center" class="mb20 mt20">
|
||||
<p style="line-height: 15px"><%= image_tag(url_to_avatar(user), :width =>"80", :height => "80", :class => "bor-radius-all", :alt=>"头像") %></p>
|
||||
<!--<p style="line-height: 15px"><%#= user.try(:show_name) %></p>-->
|
||||
<!--<p style="line-height: 27px" class="color-dark-grey font-12"><%#= user.school_name + user.identity %></p>-->
|
||||
</div>
|
||||
<pre class="pre_word mb10 color-dark-grey produce justify clearfix" style="color: #666;font-family: '微软雅黑','宋体';"><%= user.user_extensions.brief_introduction.blank? ? "暂未填写" : user.user_extensions.brief_introduction %></pre>
|
||||
<pre class="pre_word mb10 color-dark-grey produce justify clearfix font-15" style="color: #666;font-family: '微软雅黑','宋体';"><span class="color-black"><%= user.try(:show_name) %>：</span><%= user.user_extensions.brief_introduction.blank? ? "这家伙很懒,什么都没有留下" : user.user_extensions.brief_introduction %></pre>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
|
@ -201,7 +202,15 @@
|
|||
);
|
||||
}
|
||||
$(this).siblings(".produce").show();
|
||||
$(this).siblings(".produce").html($("#user_produce_text").val());
|
||||
var value="";
|
||||
if($("#user_produce_text").val()==""){
|
||||
value="<span style='font-weight:900'>"+$(this).siblings(".produce").find("span").eq(0).html()+"</span>"+"这家伙很懒,什么都没有留下";
|
||||
}else{
|
||||
value="<span style='font-weight:900'>"+$(this).siblings(".produce").find("span").eq(0).html()+"</span>"+$("#user_produce_text").val();
|
||||
value+="<span id=\"pre-content\" class=\"undis\">"+$("#user_produce_text").val()+"</span>";
|
||||
}
|
||||
|
||||
$(this).siblings(".produce").html(value);
|
||||
$(this).hide();
|
||||
})
|
||||
});
|
||||
|
|
@ -209,7 +218,7 @@
|
|||
function edit_produce(){
|
||||
$(".produce").hide();
|
||||
$(".produce_text").show();
|
||||
$(".produce_text").val($(".produce").html());
|
||||
$(".produce_text").val($(".produce #pre-content").html());
|
||||
$(".produce_text").focus();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<div class="edu-con-top clearfix bor-bottom-orange">
|
||||
<p class="fl ml15 font-16">参考资料</p>
|
||||
<% if @is_syllabus_admin %>
|
||||
<a href="<%= edit_ref_syllabus_path(@syllabus) %>" id="edit_sy_reference" data-remote="true"><i class="fa fa-edit fr mr15 mt8 color-orange05" aria-hidden="true"></i></a>
|
||||
<a href="<%= edit_ref_syllabus_path(@syllabus) %>" id="edit_sy_reference" data-remote="true"><i class="fa fa-edit fr mr15 mt8 color-orange05" data-tip-down = "编辑" aria-hidden="true"></i></a>
|
||||
<% end %>
|
||||
</div>
|
||||
<% if @reference_materials.count > 0 %>
|
||||
|
|
|
|||
|
|
@ -68,8 +68,8 @@
|
|||
<ul id="edu-tab-nav" class="back-orange-01 bor-radius-upper">
|
||||
<p class="fl ml15 font-16 color_white" style="line-height: 47px;">授课大纲</p>
|
||||
<a href="javascript:void(0);" style="line-height: 47px;" id="edit_sy_des" class="fr font-16 mr15"><i class="fa fa-edit color_white" data-tip-down="编辑"></i></a>
|
||||
<a href="javascript:void(0)" style="line-height: 47px;" id="save_sy_des" class="color_white font-16 fr mr15 undis" data-tip-down="保存"><i class="fa fa-floppy-o"></i></a>
|
||||
<a href="javascript:void(0)" style="line-height: 47px;" id="cancel_edit_sy_des" class="color_white font-16 fr mr15 undis" data-tip-down="取消"><i class="fa fa-undo"></i></a>
|
||||
<a href="javascript:void(0)" style="line-height: 47px;" id="save_sy_des" class="color_white font-16 fr mr15 undis"><i class="fa fa-floppy-o" data-tip-down="保存"></i></a>
|
||||
<a href="javascript:void(0)" style="line-height: 47px;" id="cancel_edit_sy_des" class="color_white font-16 fr mr15 undis"><i class="fa fa-undo" data-tip-down="取消"></i></a>
|
||||
<!--<li id="edu-tab-nav-1" class="new-tab-nav" onclick="HoverLi(1);">
|
||||
<a href="javascript:void(0);" class="tab_type color_white font-16">授课大纲</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@
|
|||
<% syMembers = sy.members.count %>
|
||||
<% syResource = visable_attachemnts_incourse(sy) %>
|
||||
<% syHome = visable_course_homework(sy) %>
|
||||
<span class="" style="margin: 0 10px"><i class="fa fa-users color-light-green pr10" aria-hidden="true" title="成员"></i><em><%= syMembers %></em></span>
|
||||
<span class="" style="margin: 0 10px"><i class="fa fa-users color-light-green pr10" aria-hidden="true" data-tip-down="成员"></i><em><%= syMembers %></em></span>
|
||||
<% if syResource.count > 0 %>
|
||||
<span class="" style="margin: 0 10px"><i class="fa fa-cubes color-light-green pr10" aria-hidden="true" title="资源"></i><em><%= syResource.count %></em></span>
|
||||
<span class="" style="margin: 0 10px"><i class="fa fa-cubes color-light-green pr10" aria-hidden="true" data-tip-down="资源"></i><em><%= syResource.count %></em></span>
|
||||
<% end %>
|
||||
<% if syHome > 0 %>
|
||||
<span class="" style="margin: 0 10px"><i class="fa fa-map color-light-green pr10" aria-hidden="true" title="题库"></i><em><%= syHome %></em></span>
|
||||
<span class="" style="margin: 0 10px"><i class="fa fa-map color-light-green pr10" aria-hidden="true" data-tip-down="题库"></i><em><%= syHome %></em></span>
|
||||
<% end %>
|
||||
</p>
|
||||
</div>
|
||||
|
|
@ -71,9 +71,9 @@
|
|||
<p class="xy_level"><%= shixun.shixun_trainee %></p>
|
||||
</div>
|
||||
<ul class="task-index-list-box-bottom clearfix">
|
||||
<li><i class="fa fa-gamepad mr5 color-light-green" title="实训任务"></i><span><%= shixun.challenges.count %></span></li>
|
||||
<li><i class="fa fa-users mr5 color-light-green" title="已开启实训"></i><span><%= shixun.myshixuns.count %></span></li>
|
||||
<li><i class="fa fa-viacoin mr5 color-light-green" title="实训经验值"></i><span><%= shixun.shixun_score %></span></li>
|
||||
<li><i class="fa fa-gamepad mr5 color-light-green" data-tip-down="实训任务"></i><span><%= shixun.challenges.count %></span></li>
|
||||
<li><i class="fa fa-users mr5 color-light-green" data-tip-down="已开启实训"></i><span><%= shixun.myshixuns.count %></span></li>
|
||||
<li><i class="fa fa-viacoin mr5 color-light-green" data-tip-down="实训经验值"></i><span><%= shixun.shixun_score %></span></li>
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -146,11 +146,11 @@
|
|||
</p>
|
||||
|
||||
<p class="sub clearfix">
|
||||
<a href="<%= feedback_path(@user, :host=> Setting.host_user) %>" class="fr font-14 ml10">给TA留言</a>
|
||||
<a href="<%= feedback_path(@user, :host=> Setting.host_user) %>" class="fr font-14 ml10 link-color-orange">给TA留言</a>
|
||||
<% if(@user.watched_by?(User.current)) %>
|
||||
<%= link_to "已关注",
|
||||
watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
|
||||
:class => "fr font-14 user_watch",
|
||||
:class => "fr font-14 user_watch link-color-orange",
|
||||
:id => "cancel_watch",
|
||||
:method => "delete",
|
||||
:remote => "true",
|
||||
|
|
@ -158,7 +158,7 @@
|
|||
<% else %>
|
||||
<%= link_to "添加关注",
|
||||
watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
|
||||
:class => "fr font-14 user_watch",
|
||||
:class => "fr font-14 user_watch link-color-orange",
|
||||
:method => "post",
|
||||
:remote => "true",
|
||||
:title => "添加关注" %>
|
||||
|
|
@ -188,42 +188,6 @@
|
|||
</div>
|
||||
|
||||
<div class="-task-con-int">
|
||||
<!--<div class="blog">-->
|
||||
<!--<p class="p1 font-16 "><%#= str %>的博客-->
|
||||
<!--<span class="font-12" id="blog"><%#= @blog_count %></span>-->
|
||||
<!--</p>-->
|
||||
<!--<%# if @blog_count == 0 %>-->
|
||||
<!--<p class="p2 font-16">-->
|
||||
<!--<%# if current_user %>-->
|
||||
<!--<span>你一篇博客也没写过，</span>-->
|
||||
<!--<a href="<%#= user_blogs_path(:user_id => @user) %>" target="_blank" class="changecolor">现在写博客</a>-->
|
||||
<!--<%# else %>-->
|
||||
<!--<span><%#= @user.show_name %>很懒，一篇博客也没写过</span>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</p>-->
|
||||
<!--<%# else %>-->
|
||||
<!--<div class="p3 clearfix">-->
|
||||
<!--<div class="check">-->
|
||||
<!--<%# if current_user %>-->
|
||||
<!--<%#= link_to '发布博客', user_blogs_path(:user_id => @user), :target => '_blank', :class => 'mr5 color-grey' %>-->
|
||||
<!--<%# end %>-->
|
||||
<!--<%# if @blog_count > 3 %>-->
|
||||
<!--<%#= link_to '查看更多', user_blogs_path(:user_id => @user), :target => '_blank', :class => 'color-grey' %>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</div>-->
|
||||
<!--<%# @blog_list.each_with_index do |blog, index| %>-->
|
||||
<!--<div class="blognew fl pl10 <%#= index == 0 ? '' : 'hasborder' %>">-->
|
||||
<!--<%#= link_to blog.title.to_s.html_safe, user_blog_blog_comment_path(:user_id => blog.author, :blog_id => blog.blog.id, :id => blog), :class => "font-14 changecolor" %>-->
|
||||
<!--<p>-->
|
||||
<!--<span calss="font-12 pr10"><%#= format_time blog.created_at %> 发布</span>-->
|
||||
<!--<i class="fa fa-eye font-12" style="color:#999;" aria-hidden="true"></i>-->
|
||||
<!--<span class="font-12"><%#= blog.visits %></span>-->
|
||||
<!--</p>-->
|
||||
<!--</div>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</div>-->
|
||||
<!--<%# end %>-->
|
||||
<!--</div>-->
|
||||
|
||||
<div class="passageway mt30">
|
||||
<!-- <div class="hint">
|
||||
|
|
@ -244,7 +208,7 @@
|
|||
<% str = current_user ? '我' : 'TA' %>
|
||||
<ul id="edu-user-tab-nav">
|
||||
<li class="edu-user-tab-hover new-tab-nav">
|
||||
<a href="javascript:void(0);" class="tab_type font-16"><%= str %>的实训<!--<span id="user_shixun_count"> <%#= @shixuns_count %></span>--></a>
|
||||
<a href="javascript:void(0);" class="tab_type font-16" style="cursor:default;"><%= str %>的实训<!--<span id="user_shixun_count"> <%#= @shixuns_count %></span>--></a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
|
@ -269,7 +233,7 @@
|
|||
<div class="hascon">
|
||||
<ul id="edu-user-tab-nav">
|
||||
<li class="edu-user-tab-hover new-tab-nav">
|
||||
<a href="javascript:void(0);" class="font-16 tab_type"><%= str %>的课堂 </a>
|
||||
<a href="javascript:void(0);" class="font-16 tab_type" style="cursor:default;"><%= str %>的课堂 </a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -72,10 +72,10 @@
|
|||
</div>
|
||||
<div class="mb10 task-index-list-box-top" style="height: 26px"><%= shixun.language == "JDBC" ? "Java/SQL" : shixun.language %></div>
|
||||
<ul class="edu-index-list-bottom clearfix">
|
||||
<li><i class="fa fa-tasks color-light-green mr5" title="实训任务"></i><span><%= shixun.challenges.count %></span></li>
|
||||
<li><i class="fa fa-tasks color-light-green mr5" data-tip-down="实训任务"></i><span><%= shixun.challenges.count %></span></li>
|
||||
<!--<li><i class="fa fa-comments-o mr5 "></i><span>1255</span></li>-->
|
||||
<li><i class="fa fa-users color-light-green mr5" title="已开启实训"></i><span><%= shixun.myshixuns.count %></span></li>
|
||||
<li><i class="fa fa-viacoin color-light-green mr5" title="经验值"></i><span><%= shixun.shixun_score %></span></li>
|
||||
<li><i class="fa fa-users color-light-green mr5" data-tip-down="已开启实训"></i><span><%= shixun.myshixuns.count %></span></li>
|
||||
<li><i class="fa fa-viacoin color-light-green mr5" data-tip-down="经验值"></i><span><%= shixun.shixun_score %></span></li>
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
@ -97,9 +97,9 @@
|
|||
</div>
|
||||
</div>
|
||||
<ul class="edu-index-list-bottom clearfix">
|
||||
<li><i class="fa fa-cubes mr5 color-light-green" title="资源"></i><span><%= welcome_course_file_count course %></span></li>
|
||||
<li><i class="fa fa-map mr5 color-light-green" title="题库"></i><span><%= welcome_course_message_count course.id %></span></li>
|
||||
<li><i class="fa fa-users mr5 color-light-green" title="成员"></i><span><%= course.members.count %></span></li>
|
||||
<li><i class="fa fa-cubes mr5 color-light-green" data-tip-down="资源"></i><span><%= welcome_course_file_count course %></span></li>
|
||||
<li><i class="fa fa-map mr5 color-light-green" data-tip-down="题库"></i><span><%= welcome_course_message_count course.id %></span></li>
|
||||
<li><i class="fa fa-users mr5 color-light-green" data-tip-down="成员"></i><span><%= course.members.count %></span></li>
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -222,6 +222,7 @@ RedmineApp::Application.routes.draw do
|
|||
delete 'delete_applied_schools'
|
||||
match 'new_major', :via => [:get, :post]
|
||||
post 'insert_major'
|
||||
get 'shixun_feedback'
|
||||
end
|
||||
end
|
||||
# Enable Grack support
|
||||
|
|
|
|||
|
|
@ -1183,3 +1183,11 @@ function editor_focus(id){
|
|||
window.scrollTo(0,document.body.scrollHeight);
|
||||
$("textarea[nhname='new_message_textarea_"+id+"']").focus();
|
||||
}
|
||||
|
||||
|
||||
|
||||
//for(i=0;i<$("i").length;i++){
|
||||
// var $TipContent = $("i").eq(i).attr("title");
|
||||
// $("i").eq(i).attr("title","").attr("data-tip-down",$TipContent);
|
||||
//}
|
||||
//console.log($("i").length);
|
||||
|
|
@ -180,26 +180,26 @@ $(function(){
|
|||
allowBlank:true,
|
||||
lang:'ch',
|
||||
format:'Y-m-d H:i',
|
||||
validateOnBlur:false,
|
||||
onSelectDate:function() {
|
||||
if($.trim($("input[name='homework_archive_time']").val()) == ""){
|
||||
var date = new Date(Date.parse($("input[name='homework_publish_time']").val().replace(/-/g, "/")));
|
||||
$("input[name='homework_archive_time']").val(formate_time(new Date(date.setMonth(date.getMonth()+1))));
|
||||
}
|
||||
},
|
||||
onSelectTime:function() {
|
||||
if($.trim($("input[name='homework_archive_time']").val()) == ""){
|
||||
var date = new Date(Date.parse($("input[name='homework_publish_time']").val().replace(/-/g, "/")));
|
||||
$("input[name='homework_archive_time']").val(formate_time(new Date(date.setMonth(date.getMonth()+1))));
|
||||
}
|
||||
}
|
||||
validateOnBlur:false
|
||||
});
|
||||
|
||||
$("input[name='homework_end_time']").datetimepicker({
|
||||
allowBlank:true,
|
||||
lang:'ch',
|
||||
format:'Y-m-d H:i',
|
||||
validateOnBlur:false
|
||||
validateOnBlur:false,
|
||||
onSelectDate:function() {
|
||||
if($.trim($("input[name='homework_archive_time']").val()) == ""){
|
||||
var date = new Date(Date.parse($("input[name='homework_end_time']").val().replace(/-/g, "/")));
|
||||
$("input[name='homework_archive_time']").val(formate_time(new Date(date.setMonth(date.getMonth()+1))));
|
||||
}
|
||||
},
|
||||
onSelectTime:function() {
|
||||
if($.trim($("input[name='homework_archive_time']").val()) == ""){
|
||||
var date = new Date(Date.parse($("input[name='homework_end_time']").val().replace(/-/g, "/")));
|
||||
$("input[name='homework_archive_time']").val(formate_time(new Date(date.setMonth(date.getMonth()+1))));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
$("input[name='homework_archive_time']").datetimepicker({
|
||||
|
|
|
|||
|
|
@ -77,24 +77,30 @@ a.link-color-grey03{color:#888!important;}
|
|||
a:hover.link-color-grey03{color:#3498db!important;}
|
||||
.edu-color-grey{ color:#666;}
|
||||
.edu-color-grey:hover{color:#5faee3;}
|
||||
/*通用背景颜色*/
|
||||
.back-color-orange{background-color: #FF7500}
|
||||
|
||||
|
||||
/*通用文字大小样式*/
|
||||
.font-12{ font-size: 12px!important;}
|
||||
.font-14{ font-size: 14px!important;}
|
||||
.font-15{ font-size: 15px!important;}
|
||||
.font-16{ font-size: 16px!important;}
|
||||
.font-18{ font-size: 18px!important;}
|
||||
.font-20{ font-size: 20px!important;}
|
||||
.font-22{ font-size: 22px!important;}
|
||||
.font-24{ font-size: 24px!important;}
|
||||
.font-28{ font-size: 28px!important;}
|
||||
.font-30{ font-size: 30px!important;}
|
||||
/*通用内外边距*/
|
||||
.mt-10{ margin-top:-10px;}.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px;}.mt8{ margin-top:8px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}.mt50{ margin-top:50px;}
|
||||
.mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}.mb50{ margin-bottom: 50px;}
|
||||
.mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}.mb40{ margin-bottom: 40px;}.mb50{ margin-bottom: 50px;}
|
||||
.ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml50{ margin-left: 50px;}.ml75{ margin-left: 75px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml230{ margin-left: 230px;}
|
||||
.mr3{margin-right: 3px}.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr40{margin-right:40px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}
|
||||
.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}
|
||||
.pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}
|
||||
.pl5{ padding-left:5px;}.pl8{ padding-left:8px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}
|
||||
.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px!important;}
|
||||
.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}.pt30{ padding-top:30px;}
|
||||
.pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb30{ padding-bottom:30px;}
|
||||
.pl5{ padding-left:5px;}.pl8{ padding-left:8px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}.pl30{ padding-left:30px;}.pl50{ padding-left:50px;}.pl35{ padding-left:35px;}
|
||||
.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px!important;}.pr30{ padding-right:30px!important;}
|
||||
.padding15{ padding:15px;}
|
||||
.h24{ height: 24px;}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,10 +45,11 @@ li.li-width15{width: 15%;text-align: left}
|
|||
li.li-width7{width: 7%;text-align: left}
|
||||
|
||||
|
||||
.paragraph{background-color:#f3f5f7;height: 30px;}
|
||||
.paragraph:hover{background-color:#a6aaab;}
|
||||
.paragraph:hover .paragraph_status,.paragraph:hover .paragraph_name,.paragraph:hover .status_sx{color: #ffffff!important;}
|
||||
.paragraph{height: 30px;}
|
||||
.paragraph:hover{background-color:#EFF9FD;}
|
||||
/*.paragraph:hover .paragraph_status,.paragraph:hover .paragraph_name,.paragraph:hover .status_sx{color: #ffffff!important;}*/
|
||||
.edu-class-right-box i:hover{color:#29bd8b!important;}
|
||||
.icon-set{display: block;width: 10px;height: 5px;margin-top: 10px;}
|
||||
/*------课程实训首页---------*/
|
||||
|
||||
.course_tip_box{width: 460px;padding: 10px;background-color: #FFFFFF;}
|
||||
|
|
@ -57,7 +58,7 @@ li.li-width7{width: 7%;text-align: left}
|
|||
.tip_acitve{color: #FFFFFF;background-color: #2292e7;}
|
||||
|
||||
/*background: #16D4BE linear-gradient(304.95deg,#1aecd4 0%, #1ad8c2 50%, #009E8A 77%, #16D4BE 100%);background-image: url("../images/services-banner.jpg");*/
|
||||
.subhead{width: 100%;margin-bottom:20px;background-size: 100% 100%;min-height: 180px;background: #16D4BE linear-gradient(304.95deg,#009E8A 0%, #1ad8c2 75%, #16D4BE 80%, #009E8A 100%);}
|
||||
.subhead{width: 100%;margin-bottom:40px;background-size: 100% 100%;min-height: 180px;background: #16D4BE linear-gradient(304.95deg,#0dd8be 0%, #009E8A 75%, #98e8de 100%);}
|
||||
.subhead_content{width: 1200px;margin: 0px auto;padding: 20px 0px;}
|
||||
.publich-half{width: 1200px;margin: 0px auto; min-height:566px}
|
||||
.saved-title{margin-bottom: 10px;}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
/*.-task-con-data .top .top-right .itnew .p2{}*/
|
||||
.-task-con-data .top .top-right .itnew .p2{color:#ccc;}
|
||||
.-task-con-data .top .top-right .itnew .sub a{border:1px solid #e5e5e5;display:inline-block;padding:2px 10px;text-align:center;border-radius:5px;}
|
||||
.-task-con-data .top .top-right .itnew .sub a:hover{background:#f0f0f0;}
|
||||
.-task-con-data .top .top-right .itnew .sub a:hover{background:#FF7500!important;color:#fff;}
|
||||
.-task-con-data .top .top-right .itnew .sub{width:100%;}
|
||||
.-task-con-data .bot input{width:100%;height:40px;line-height:40px;border:none;outline:none;background:#fff;}
|
||||
.-task-con-data .bot p{width: 100%; height: 25px; background: #fff;}
|
||||
|
|
|
|||
|
|
@ -299,7 +299,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
|
|||
/*实训--技能勋章*/
|
||||
.modal-list li{float: left;padding: 0px 15px;background:#ff7500;color: #ffffff;border-radius: 4px;margin-right: 10px}
|
||||
.modal-list li:before{content: '●';color: #FFFFFF;margin-right: 5px;font-size: 14px}
|
||||
.modal-list li span{width: 8px;height: 8px;border-radius: 50%;background: #ffffff;display: block;float: left;margin-right: 5px;margin-top:10px;}
|
||||
.modal-list span{width: 8px;height: 8px;border-radius: 50%;background: #ffffff;display: block;float: left;margin-right: 5px;margin-top:10px;}
|
||||
|
||||
/* 合作者 20170516byLB */
|
||||
.task-partner-list{ padding:15px; border-bottom:1px solid #eee;}
|
||||
|
|
@ -404,5 +404,6 @@ html>body #ajax-indicator-base { position: fixed; }
|
|||
z-index:999;
|
||||
}
|
||||
|
||||
|
||||
.save-tip{display:none;position: fixed;top:0px;left: 0px;width: 100%;height: 100%;}
|
||||
.save-tip-content{position: absolute;top:50%;left: 50%;margin-left: -36px;margin-top:-19px;background: rgba(0,0,0,0.7);color:#fff;padding:5px 15px;border-radius: 4px}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue