Merge branch 'dev_cs' into develop
This commit is contained in:
commit
4ecca2df04
|
|
@ -8,7 +8,7 @@
|
|||
<li><span class="color-orange font-bd" id="all_syllabuses"><%= @syllabuses_num %></span><br/><span >全部</span></li>
|
||||
<li><span class="color-orange font-bd" id="my_syllabuses"><%= @create_syllabuses_count + @join_syllabuses_count %></span><br/><span>我的课堂</span></li>
|
||||
<%= link_to "+ 新建".html_safe, new_course_path, :class => "color-light-green fr font-16" , :style => "line-height:56px"%>
|
||||
<%= link_to "+ 加入课堂".html_safe, join_private_courses_courses_path, :remote => true, :method => "post", :class => "color-light-green fr mr10 font-16" , :style => "line-height:56px" %>
|
||||
<%= link_to "+ 加入课堂".html_safe, join_private_courses_courses_path, :remote => true, :method => "post", :class => "color-light-green fr mr30 font-16" , :style => "line-height:56px" %>
|
||||
<!-- <li><span class="color-orange font-bd"><%#= @create_syllabuses_count %></span><br/><span>你已创建</span></li>-->
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
</div>
|
||||
<script>
|
||||
$(function() {
|
||||
resizeTop();
|
||||
$(".sidebar").hover(function() {
|
||||
$(this).css({
|
||||
width:'50px'
|
||||
|
|
@ -78,12 +79,15 @@
|
|||
|
||||
//页面缩放时调整整个页面和左侧导航栏的距离
|
||||
$(window).resize(function() {
|
||||
resizeTop();
|
||||
});
|
||||
function resizeTop(){
|
||||
if($(window).width()<1300){
|
||||
$(".newContainer").css("padding-left","50px");
|
||||
}else{
|
||||
$(".newContainer").css("padding-left","0px");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 新建实训
|
||||
function shixun_valication(){
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<div id="Container" class="panel-content clearfix">
|
||||
<div id="Container" class="panel-content clearfix user_bg_shadow">
|
||||
<div class="panel-user-left fl">
|
||||
<ul class="panel-user-leftnav">
|
||||
<h3 class="mb15 ml15 mt15">账户管理</h3>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,213 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link href="../../../public/stylesheets/css/taskstyle.css" rel="stylesheet" type="text/css"/>
|
||||
<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/edu-admin.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../public/stylesheets/css/font-awesome.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../public/stylesheets/css/moduel.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../public/stylesheets/bootstrap/bootstrap-theme.min.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../public/stylesheets/css/magic-check.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>
|
||||
<title></title>
|
||||
</head>
|
||||
<body>
|
||||
<div class="edu-class-container">
|
||||
<!--当前位置-->
|
||||
<p class="mb10"><i class="fa fa-map-marker mr5 color-grey"></i>
|
||||
<a href="/users/innov">创新使者</a> >
|
||||
<span class="color-dark-grey">镜像管理 </span>
|
||||
</p>
|
||||
<!--ul导航条-->
|
||||
<!--<ul class="edu-admin-nav clearfix "></ul>-->
|
||||
<!--主要部分/列表-->
|
||||
<div class="edu-con-top clearfix mb20 df">
|
||||
<label class="fl mt5 mb5 ml15">镜像主类别：</label>
|
||||
<div class="fl" style="flex:1">
|
||||
<div class="task-tag tag-grey mr10 fl mt5 mb5" id="add_mirror_sort" style="display: none;">
|
||||
<button data-dismiss="alert" class="close fr mt3 ml5" type="button" onclick="$('#add_mirror_sort').slideToggle();">×</button>
|
||||
<input type="text" class="task-tag-input" onblur="add_tag();" id="mirror_sort_input" placeholder="请输入技能标签">
|
||||
</div>
|
||||
<a href="javascript:void(0);" class="fl color-light-green mt5 mb5" onclick="$('#add_mirror_sort').slideToggle();" id="add_knowledge">+添加</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ex_container" id="management_mirror_list">
|
||||
<table class="edu-pop-table" cellspacing="0" cellpadding="0">
|
||||
<thead>
|
||||
<th width="4%">序号</th>
|
||||
<th width="8%" style="text-align: left;">镜像ID</th>
|
||||
<th width="11%" style="text-align: left;">镜像名称</th>
|
||||
<th width="17%" style="text-align: left;">镜像主类别</th>
|
||||
<th width="17%" style="text-align: left;">镜像小类别</th>
|
||||
<th width="16%" style="text-align: left;">镜像描述</th>
|
||||
<th width="7%">状态</th>
|
||||
<th width="12%">修改时间</th>
|
||||
<th width="7%">操作</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="edu-txt-center">1</td>
|
||||
<td>drfhuko4</td>
|
||||
<td class="break_word">java1.8-jfinal5.0</td>
|
||||
<td class="pl5 pr5">
|
||||
<p class="break_word">java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;</p>
|
||||
|
||||
<input type="text" name="input_con" class="undis with100" value="java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;"/>
|
||||
|
||||
</td>
|
||||
<td class="break_word">
|
||||
<p class="break_word pl5 pr5">docert1.5;centos2.5;</p>
|
||||
<input type="text" name="input_con" class="undis with100" value="docert1.5;centos2.5;"/>
|
||||
</td>
|
||||
<td class="pl5 pr5">镜像是。。。。</td>
|
||||
<td class="edu-txt-center">未发布</td>
|
||||
<td class="edu-txt-center">2017-08-15 10:34</td>
|
||||
<td class="edu-txt-center">
|
||||
<a href="javascript:void(0)" class="color-blue">删除</a>
|
||||
<a href="javascript:void(0)" class="color-blue update_table_date">修改</a>
|
||||
<a href="javascript:void(0)" class="color-blue save_table_date undis">保存</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="edu-txt-center">2</td>
|
||||
<td>edftg3gr</td>
|
||||
<td class="break_word">python3.6-mysql1.5</td>
|
||||
<td class="pl5 pr5">
|
||||
<p class="break_word">java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;</p>
|
||||
|
||||
<input type="text" name="input_con" class="undis with100" value="java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;java1.8;jfinal5.0;"/>
|
||||
|
||||
</td>
|
||||
<td class="break_word">
|
||||
<p class="break_word pl5 pr5">docert1.5;centos2.5;</p>
|
||||
<input type="text" name="input_con" class="undis with100" value="docert1.5;centos2.5;"/>
|
||||
|
||||
</td>
|
||||
<td class="pl5 pr5">镜像是。。。。</td>
|
||||
<td class="edu-txt-center">已发布</td>
|
||||
<td class="edu-txt-center">2017-08-15 10:34</td>
|
||||
<td class="edu-txt-center">
|
||||
<a href="javascript:void(0)" class="color-blue update_table_date">修改</a>
|
||||
<a href="javascript:void(0)" class="color-blue save_table_date undis">保存</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div style="width: 500px" class="bor-grey-e white_bg open_box">
|
||||
<div class="task-popup-title clearfix task-popup-bggrey">
|
||||
<h3 class="fl ">镜像修改</h3>
|
||||
<a href="javascript:void(0)" onclick="hideModal();"><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">
|
||||
<label class="panel-form-label fl"><span class="mr10">镜像ID：</span></label>
|
||||
<label class="fl mt8">sdfdsf</label>
|
||||
</div>
|
||||
<div class="clearfix mb15">
|
||||
<label class="panel-form-label fl"><span class="mr10">主类别：</span></label>
|
||||
<div class="pr fl with80 status_con">
|
||||
<input type="text" name="type_mirror" class="panel-box-sizing task-form-100 task-height-40" placeholder="输入关键字搜索并选择"/>
|
||||
<ul class="lesson_checkbox">
|
||||
<li>
|
||||
<input name="course_id[]" data-val="数据结构" value="1" id="join_course_role_0" class="ml-3 mr5 magic-checkbox" type="checkbox">
|
||||
<label for="join_course_role_0">数据结构</label>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix mb15">
|
||||
<label class="panel-form-label fl"><span class="mr10">小类别：</span></label>
|
||||
<div class="pr fl with80 status_con">
|
||||
<input type="text" name="type_mirror" class="panel-box-sizing task-form-100 task-height-40" placeholder="请输入该镜像的小类别"/>
|
||||
<ul class="lesson_checkbox">
|
||||
<li>
|
||||
<input name="course_id[]" data-val="数据结构" value="1" id="join_course_role_0" class="ml-3 mr5 magic-checkbox" type="checkbox">
|
||||
<label for="join_course_role_0">数据结构</label>
|
||||
</li>
|
||||
<li>
|
||||
<input name="course_id[]" data-val="数据结构" value="1" id="join_course_role_0" class="ml-3 mr5 magic-checkbox" type="checkbox">
|
||||
<label for="join_course_role_0">数据结构</label>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix mb15">
|
||||
<label class="panel-form-label fl"><span class="mr10">描述：</span></label>
|
||||
<textarea type="text" class="panel-box-sizing task-form-80 task-height-100" placeholder="请输入该镜像的描述"></textarea>
|
||||
</div>
|
||||
<div class="clearfix mb15">
|
||||
<label class="panel-form-label fl"><span class="mr10">状态：</span></label>
|
||||
<span class="fl mr20 mt3">
|
||||
<input type="radio" name="status" value="0" id="status_0" class="ml-3 mr5 magic-radio">
|
||||
<label for="status_0">未发布</label>
|
||||
</span>
|
||||
<span class="fl mr20 mt3">
|
||||
<input type="radio" name="status" value="1" id="status_1" class="ml-3 mr5 magic-radio">
|
||||
<label for="status_1">已发布</label>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class=" clearfix mb20 mr15">
|
||||
<a href="javascript:void(0);" onclick="hideModal();" class="task-btn fr">取消</a>
|
||||
<a href="javascript:void(0);" class="task-btn task-btn-blue fr mr10">确定</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
<script>
|
||||
function add_tag(){
|
||||
var num = $(".task-bd-grey").children('div').length;
|
||||
var val = $(".task-tag-input").val().trim();
|
||||
if (val != ""){
|
||||
testLength = $(".task-tag-input").val().trim().length;
|
||||
$("#add_mirror_sort").before("<div class='task-tag tag-grey mr10 mt5 mb5 fl' id='knowledge_" + num + "'>" +
|
||||
"<button data-dismiss='alert' class='close fr mt3 ml5' type='button' onclick='close_tag(this)'>×</button>" +
|
||||
"<input style='width:"+ testLength*12 +"px' class='knowledge_frame' name='knowledge[input][]' value='" + val +"'>" +
|
||||
" </div>");
|
||||
$(".task-tag-input").attr("value","");
|
||||
}
|
||||
$("#mirror_sort_input").val("");
|
||||
$("#add_mirror_sort").hide();
|
||||
}
|
||||
|
||||
function close_tag(thisObj){
|
||||
// 获取父节点的id
|
||||
var obj = thisObj.parentNode.id;
|
||||
$("#"+obj).remove();
|
||||
}
|
||||
|
||||
$(function(){
|
||||
$(".open_box").click(function(event){
|
||||
$(".lesson_checkbox").hide();
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
$("input[name='type_mirror']").on("keydown",function(event){
|
||||
//绑定数据
|
||||
|
||||
//显示下拉多选
|
||||
$(".lesson_checkbox").hide();
|
||||
$(this).siblings(".lesson_checkbox").show();
|
||||
event.stopPropagation();
|
||||
})
|
||||
|
||||
$(".lesson_checkbox").on("click",function(event){
|
||||
event.stopPropagation();
|
||||
})
|
||||
$(".lesson_checkbox").on('click', 'input',function(event) {
|
||||
alert($(this).attr("data-val"));
|
||||
event.stopPropagation();
|
||||
});
|
||||
})
|
||||
|
||||
|
||||
</script>
|
||||
</html>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %>
|
||||
<%= javascript_include_tag '/editormd/editormd.min.js' %>
|
||||
<div class="edu-con-bg01 " style="padding:30px 0;">
|
||||
<div class="edu-con-bg01 user_bg_shadow mb20" style="padding:30px 0;">
|
||||
<div class="ml30 mr30">
|
||||
<div>
|
||||
<ul>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
</div>
|
||||
<ul class="task-index-list-box-bottom clearfix">
|
||||
<li><i class="fa fa-tasks color-light-green mr5 btn" data-tip-down="实训任务"></i><span><%= shixun.challenges.count %></span></li>
|
||||
<li><i class="fa fa-users color-light-green mr5 btn" data-tip-down="已开启实训"></i><span><%= shixun.myshixuns.count %></span></li>
|
||||
<li><i class="fa fa-users color-light-green mr5 btn" data-tip-down="实训人数"></i><span><%= shixun.myshixuns.count %></span></li>
|
||||
<li><i class="fa fa-viacoin color-light-green mr5 btn" data-tip-down="实训经验值"></i><span><%= shixun.shixun_score %></span></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="task-pm-content edu-con-bg01 " style="margin-top:20px;">
|
||||
<div class="task-pm-content white_bg" style="margin-top:20px;">
|
||||
<div class="clearfix task-partner-list">
|
||||
<a class="fl"><%= image_tag(url_to_avatar(@shixun.owner), :width => 60, :height => 60, :class => 'panel-list-img mr15 mt5') %></a>
|
||||
<ul class="fl font-12 color-grey">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<p class="mb10 mt10"><i class="fa fa-map-marker mr5 color-grey" ></i>
|
||||
<a href="<%= user_path(User.current) %>"><%= User.current.show_name %></a> > <a href="<%= shixuns_path %>">全部实训</a> > 新建实训
|
||||
</p>
|
||||
<div class="edu-con-top">
|
||||
<div class="edu-con-top user_bg_shadow">
|
||||
<p class="ml15 color-grey">新建实训</p>
|
||||
</div>
|
||||
<%= render :partial => 'form' %>
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
</div>
|
||||
<% else %>
|
||||
<% @subjects.each do |subject| %>
|
||||
<div class="sub-con fl pr" style="cursor: default;">
|
||||
<% if subject.status < 2 && !User.current.manager_of_subject?(subject) %>
|
||||
<div class="black-half">
|
||||
<div class="black-half-lock"><i class="fa fa-lock" style="font-size: 50px"></i></div>
|
||||
<div class="black-half-info font-16">非试用内容，需要授权</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="sub-con fl pr" style="cursor: default;">
|
||||
<% if subject.status < 2 && !User.current.manager_of_subject?(subject) %>
|
||||
<div class="black-half">
|
||||
<div class="black-half-lock"><i class="fa fa-lock" style="font-size: 50px"></i></div>
|
||||
<div class="black-half-info font-16">非试用内容，需要授权</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="course-list-index-name" onclick="subject_link(<%= subject.id %>)" style="cursor: pointer;">
|
||||
<p class="font-14 course-list-index-title two_lines_show task-text-center">
|
||||
<a href="javascript:void(0);"><%= subject.name %></a>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
</div>
|
||||
<p class="color-grey college task-text-center">
|
||||
<%# if !subject.user.user_extensions.school_id.blank? && subject.user.user_extensions.school %>
|
||||
<%#= subject.user.user_extensions.school.name %>
|
||||
<%#= subject.user.user_extensions.school.name %>
|
||||
<%# end %>
|
||||
</p>
|
||||
<p class="color-grey pl15 pr15 clearfix" style="text-align: center;">
|
||||
|
|
@ -58,11 +58,45 @@
|
|||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<!--实训套件改版-->
|
||||
<!--<div class="pre_sub-con fl pr">
|
||||
<div class="box_bg_shandow with100 white_bg" style="z-index: 3;cursor: default;position:absolute;">
|
||||
<%# if subject.status < 2 && !User.current.manager_of_subject?(subject) %>
|
||||
<div class="black-half">
|
||||
<div class="black-half-lock"><i class="fa fa-lock" style="font-size: 50px"></i></div>
|
||||
<div class="black-half-info font-16">非试用内容，需要授权</div>
|
||||
</div>
|
||||
<%# end %>
|
||||
<div class="subject-box" onclick="subject_link(<%#= subject.id %>)" style="cursor: pointer;padding-bottom: 5px">
|
||||
<p class="font-14 course-list-index-title two_lines_show task-text-center mb5 mt5" style="height: 44px">
|
||||
<a href="javascript:void(0);" style="height: 44px;display: block;line-height: 22px;"><%#= subject.name %></a>
|
||||
</p>
|
||||
<p class="font-14 three_lines_show task-text-center mb20" style="text-align: left;">
|
||||
计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论计算思维导论
|
||||
</p>
|
||||
<p class="color-grey bor-bottom-greyE mb15 clearfix" style="text-align: center;">
|
||||
<span class="pl10 pr10"><i class="fa fa-pause-circle color-light-green transform90" aria-hidden="true" data-tip-down="章节"></i><em class="ml10"><%#= subject.stage_shixuns.count %></em></span>
|
||||
<span class="pl10 pr10"><i class="fa fa-gamepad color-light-green pr10" aria-hidden="true" data-tip-down="实训"></i><em><%#= subject.stage_shixuns.count %></em></span>
|
||||
<span class="pl10 pr10"><i class="fa fa-tasks color-light-green pr10" aria-hidden="true" data-tip-down="实训阶段"></i><em><%#= subject.subject_challenges %></em></span>
|
||||
<span class="pl10 pr10"><i class="fa fa-viacoin color-light-green pr10" aria-hidden="true" data-tip-down="总经验值"></i><em><%#= subject.subject_score %></em></span>
|
||||
</p>
|
||||
<div class="clearfix mb5 df">
|
||||
<a href="javascript:void(0);"><%#= image_tag(url_to_avatar(subject.user), :width =>"40", :height => "40", :class => "bor-radius-all mr10 fl", :alt=>"头像") %></a>
|
||||
<div class="fl" style="flex: 1;text-align: left">
|
||||
<p style="line-height: 20px"><%#= subject.user.try(:show_name) %></p>
|
||||
<p class="font-12 unit-name">国防科学技术大学讲师</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box_bg_shandow white_bg pre-book" style="z-index: 2;width: 98%;left: 1%;bottom: -5px;"></div>
|
||||
<div class="box_bg_shandow white_bg pre-book" style="z-index: 1;width: 96%;left: 2%;bottom: -10px;"></div>
|
||||
</div>-->
|
||||
<% if @subjects_count > 16 %>
|
||||
<div style="text-align:center;" class="new_expand">
|
||||
<div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="course_shixun_list">
|
||||
<div class="task-index-head mt20 mb20">
|
||||
<div class="header-color">
|
||||
<h2 class="fl task-inde-head-title">实训套件</h2>
|
||||
<h2 class="fl task-inde-head-title">实训课程</h2>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<ul class="task-index-head-info clearfix">
|
||||
|
|
|
|||
|
|
@ -11,14 +11,22 @@
|
|||
<%= labelled_form_for @subject do |f| %>
|
||||
<li class="clearfix pt20">
|
||||
<label class="panel-form-label label fl"><span class="color-orange">*</span> 名称</label>
|
||||
<input type="text" name="subject[name]" id="new_subject_name" class="task task-height-40 panel-box-sizing task-form-70 fl color-grey ml20" maxlength="100" placeholder="例如：Python程序设计-从入门到精通">
|
||||
<input type="text" name="subject[name]" id="new_subject_name" class="task task-height-40 panel-box-sizing task-form-80 fl color-grey ml20" maxlength="100" placeholder="例如：Python程序设计-从入门到精通">
|
||||
<div class="cl"></div>
|
||||
<span class="color-orange ml20 fl none" style="margin-left: 12%;" id="new_subject_name_notice"><i class="fa fa-exclamation-circle mr5" ></i>请输入名称</span>
|
||||
</li>
|
||||
<!--<li class="clearfix pt20">
|
||||
<label class="panel-form-label label fl"><span class="color-orange">*</span> 描述</label>
|
||||
<input type="text" name="subject[describe]" id="new_subject_name" class="task task-height-40 panel-box-sizing task-form-80 fl color-grey ml20" maxlength="100" placeholder="一句话描述一下，吸引更多人学习吧（不超过50个字符）">
|
||||
</li>-->
|
||||
<li class="clearfix pt20">
|
||||
<label class="panel-form-label label fl">简介</label>
|
||||
<textarea name="subject[description]" class="task task-height-220 panel-box-sizing task-form-70 fl color-grey ml20"></textarea>
|
||||
<textarea name="subject[description]" class="task task-height-220 panel-box-sizing task-form-80 fl color-grey ml20"></textarea>
|
||||
</li>
|
||||
<!--<li class="clearfix pt20">
|
||||
<label class="panel-form-label label fl"><span class="color-orange">*</span> 学习须知</label>
|
||||
<textarea name="subject[base]" placeholder="例如：了解Python的基础知识" class="task task-height-220 panel-box-sizing task-form-80 fl color-grey ml20"></textarea>
|
||||
</li>-->
|
||||
<li class="clearfix pt20 pb20">
|
||||
<label class="panel-form-label label fl"> </label>
|
||||
<%= link_to "取消", subjects_path(), :class => "task-btn fl mr10 ml20" %>
|
||||
|
|
|
|||
|
|
@ -1,33 +1,33 @@
|
|||
<% @members.each_with_index do |member, index| %>
|
||||
<div class="sy_member_div clearfix mb10 pt10 <%= index > 0 ? 'undis' : '' %>">
|
||||
<div class="sy_member_div clearfix mb10 pt10 <%= index > 9 ? 'undis' : '' %>">
|
||||
<% user = member.user %>
|
||||
<%= link_to image_tag(url_to_avatar(user), :width => "40", :height => "40", :alt => "头像",:class => "bor-radius-all"), user_path(user), :target => '_blank', :class => "fl ml15 mr15" %>
|
||||
<ul class="fl pt5">
|
||||
<li class="fl">
|
||||
<%= link_to user.show_real_name, user_path(user), :class => "font-16 link-name-dark task-hide fl real-name" %>
|
||||
<span class="color-grey fl ml20 mt3"><%= user.user_extensions.user_technical_title %></span>
|
||||
<span class="color-grey fl ml20 mt2"><%= user.user_extensions.user_technical_title %></span>
|
||||
<% if user == @syllabus.user %>
|
||||
<span class="ml20 color-light-green font-14 fl mt3" title="管理员"><i class="fa fa-user"></i></span>
|
||||
<span class="ml20 color-light-green font-14 fl mt2" data-tip-down="管理员"><i class="fa fa-user"></i></span>
|
||||
<% end %>
|
||||
</li>
|
||||
<!--<li class="fl">
|
||||
<span class="color-grey"><%#= user.user_extensions.user_technical_title %></span>
|
||||
</li>-->
|
||||
</ul>
|
||||
<p class="fr mt3 mr15">
|
||||
<p class="fr mt5 mr15">
|
||||
<% if user == @syllabus.user && (User.current == @syllabus.user || User.current.admin?) %>
|
||||
<% if @members.count == 1 %>
|
||||
<a href="javascript:void(0)" onclick="notice_box('无可更换成员，请先添加教师成员')" class="font-12 link-color-grey operation">更换管理员</a>
|
||||
<a href="javascript:void(0)" onclick="notice_box('无可更换成员，请先添加教师成员')" class="font-12 color-grey operation">更换管理员</a>
|
||||
<% else %>
|
||||
<%= link_to '更换管理员', change_manager_alert_syllabus_member_index_path(:syllabus => @syllabus), :class => 'font-12 link-color-grey operation', :remote => true %>
|
||||
<%= link_to '更换管理员', change_manager_alert_syllabus_member_index_path(:syllabus => @syllabus), :class => 'font-12 color-grey operation', :remote => true %>
|
||||
<% end %>
|
||||
<% elsif user != @syllabus.user && @is_syllabus_member %>
|
||||
<a href="javascript:void(0)" onclick="delete_confirm_box_2('<%=syllabus_member_path(member.id) %>', '确定要删除该教师吗？');" class="font-12 link-color-grey operation">删除</a>
|
||||
<a href="javascript:void(0)" onclick="delete_confirm_box_2('<%=syllabus_member_path(member.id) %>', '确定要删除该教师吗？');" class="font-12 color-grey operation">删除</a>
|
||||
<% end %>
|
||||
</p>
|
||||
</div>
|
||||
<% if index == 1 %>
|
||||
<a href="javascript:void(0);" onclick="show_all_members(this)" class="edu-class-right-add color-light-green" style="background:#fff; border-top:1px solid #eee; position: inherit;">
|
||||
<% if index > 9 %>
|
||||
<a href="javascript:void(0);" onclick="show_all_members(this)" class="edu-class-right-add color-orange05" style="background:#fff; border-top:1px solid #eee; position: inherit;">
|
||||
<i class="fa fa-angle-down"></i>
|
||||
<span>查看全部</span>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -77,14 +77,14 @@
|
|||
</li>
|
||||
<li class="clearfix mb20">
|
||||
<label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>课程名称 </label>
|
||||
<input type="text" name="title" maxlength="50" value=" <%= @syllabus.title %>" id="new_syllabus_name" class="task-form-80 task-height-40 panel-box-sizing fl" placeholder=" 例如 计算机基础">
|
||||
<input type="text" name="title" maxlength="50" value=" <%= @syllabus.title %>" id="new_syllabus_name" class="task-form-80 task-height-40 panel-box-sizing fl color-grey3" placeholder=" 例如 计算机基础">
|
||||
<div class="cl"></div>
|
||||
<span class="color-orange fl none" id="new_syllabus_name_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>课程名称不能为空且至少有两个字符</span>
|
||||
<span class="color-orange fl none" id="new_syllabus_name_repeat_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>同一个用户不能创建同名课程</span>
|
||||
</li>
|
||||
<li class="clearfix mb20">
|
||||
<label class="panel-form-label label-w20 fl" >英文名称 </label>
|
||||
<input type="text" name="eng_name" value=" <%= @syllabus.eng_name %>" maxlength="100" id="new_syllabus_eng_name" class="task-form-80 task-height-40 panel-box-sizing fl" placeholder=" 例如 Basis of Computer Engineering">
|
||||
<input type="text" name="eng_name" value=" <%= @syllabus.eng_name %>" maxlength="100" id="new_syllabus_eng_name" class="task-form-80 task-height-40 panel-box-sizing fl color-grey3" placeholder=" 例如 Basis of Computer Engineering">
|
||||
<div class="cl"></div>
|
||||
</li>
|
||||
<li class="clearfix mb20">
|
||||
|
|
|
|||
|
|
@ -18,20 +18,27 @@
|
|||
<!--</div>-->
|
||||
<%# end %>
|
||||
<div class="edu-class-top clearfix mb20 user_bg_shadow">
|
||||
<ul class="fl edu-class-top-info">
|
||||
<li class="mb10 clearfix">
|
||||
<ul class="fl edu-class-top-info" style="width: 100%">
|
||||
<li class="mb10 fl">
|
||||
<span class="font-24 font-bold fl"><%= @syllabus.title %></span>
|
||||
<% if @is_syllabus_admin %>
|
||||
<a href="<%= edit_syllabus_path(@syllabus) %>" title="编辑" class="font-24 font-bold link-color-grey fl">
|
||||
<%# if @is_syllabus_admin %>
|
||||
<!--<a href="<%#= edit_syllabus_path(@syllabus) %>" title="编辑" class="font-24 font-bold link-color-grey fl">
|
||||
<i class="fa fa-edit ml15 " aria-hidden="true"></i>
|
||||
</a>
|
||||
<% end %>
|
||||
<span class="color-grey font-14 ml15 task-hide fl mt10" style="width:300px; display: block;"><%= @syllabus.eng_name %></span>
|
||||
</a>-->
|
||||
<%# end %>
|
||||
<span class="color-grey font-14 ml15 task-hide fl mt10" style="width:300px; display: block;line-height: 35px"><%= @syllabus.eng_name %></span>
|
||||
</li>
|
||||
<li class="color-grey font-12">
|
||||
<span class=""><%= @syllabus.user.user_extensions.school.blank? ? '' : @syllabus.user.user_extensions.school.name %></span>
|
||||
<% if @is_syllabus_admin %>
|
||||
<li class="fr">
|
||||
<a href="<%= edit_syllabus_path(@syllabus) %>" class="font-24 font-bold link-color-grey fl">
|
||||
<i class="fa fa-edit ml15 " aria-hidden="true" data-tip-down="编辑"></i>
|
||||
</a>
|
||||
</li>
|
||||
<% end %>
|
||||
<li class="color-grey font-12 clearfix">
|
||||
<span class="fr"><%= @syllabus.user.user_extensions.school.blank? ? '' : @syllabus.user.user_extensions.school.name %></span>
|
||||
<% if @syllabus.major_level %>
|
||||
<span class="ml15"><%= @syllabus.syllabus_major_level %></span>
|
||||
<span><%= @syllabus.syllabus_major_level %></span>
|
||||
<span class="ml15"><%= @syllabus.syllabus_discipline_category %></span>
|
||||
<span class="ml15"><%= @syllabus.syllabus_first_level_discipline %></span>
|
||||
<% if @syllabus.major %>
|
||||
|
|
@ -59,14 +66,14 @@
|
|||
<div class="with65 fl">
|
||||
<div class="edu-tab clearfix mb20 user_bg_shadow">
|
||||
<ul id="edu-tab-nav" class="back-orange-01 bor-radius-upper">
|
||||
<li id="edu-tab-nav-1" class="new-tab-nav" onclick="HoverLi(1);">
|
||||
<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" data-tip-down="编辑"><i class="fa fa-edit color_white"></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>
|
||||
<!--<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>
|
||||
<a href="javascript:void(0);" style="line-height: 47px;" id="edit_sy_des" class="fr font-16 mr15" title="编辑"><i class="fa fa-edit color_white"></i></a>
|
||||
<a href="javascript:void(0)" style="line-height: 47px;" id="save_sy_des" class="color_white font-16 fr mr15 undis" title="保存"><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" title="取消"><i class="fa fa-undo"></i></a>
|
||||
<!--<li id="edu-tab-nav-2" class="new-tab-nav">-->
|
||||
<li id="edu-tab-nav-2" class="new-tab-nav">-->
|
||||
<!--<%#= link_to '课程资源库', syllabus_resources_syllabus_path(@syllabus), :remote => true, :class => 'tab_type' %>-->
|
||||
<!--</li>-->
|
||||
<!--<li id="edu-tab-nav-3" class="new-tab-nav">-->
|
||||
|
|
@ -99,9 +106,9 @@
|
|||
|
||||
</div>
|
||||
<div class="with35 fr ">
|
||||
<div class="edu-class-right-box ml15 mb20 user_bg_shadow pb10">
|
||||
<div class="edu-con-top clearfix mb20 bor-bottom-orange">
|
||||
<h2 class="fl ml15">教师团队</h2>
|
||||
<div class="edu-class-right-box ml15 mb20 user_bg_shadow">
|
||||
<div class="edu-con-top clearfix bor-bottom-orange">
|
||||
<p class="fl ml15">教师团队</p>
|
||||
<% if @is_syllabus_admin %>
|
||||
<a href="<%= add_sy_member_alert_syllabus_path(@syllabus) %>" data-remote="true" class="fr color-light-green mr15 font-14 mt3">
|
||||
<i class="fa fa-plus"></i>
|
||||
|
|
@ -125,7 +132,7 @@
|
|||
</div>
|
||||
<div class="edu-class-right-box ml15 mb20 user_bg_shadow">
|
||||
<div class="edu-con-top clearfix mb10 bor-bottom-orange">
|
||||
<h2 class="fl ml15 ">课堂列表</h2>
|
||||
<p class="fl ml15 ">课堂列表</p>
|
||||
<% if @is_syllabus_admin %>
|
||||
<a href="<%= new_course_path() %>" class="fr color-light-green mr15 font-14 mt3">
|
||||
<i class="fa fa-plus"></i>
|
||||
|
|
@ -138,9 +145,9 @@
|
|||
<a href="javascript:void(0);" class="user_course_filtrate fl mr30"><span class="user_filtrate_span1 user_filtrate_span1_bg">正在进行</span><span class="user_filtrate_span2 user_filtrate_span2_bg ml10"><%= @courses.count %></span></a>
|
||||
<a href="javascript:void(0);" class="user_course_filtrate fl"><span class="user_filtrate_span1">已结束</span><span class="user_filtrate_span2 ml10"><%= @end_courses.count %></span></a>
|
||||
</div>
|
||||
<ul class="edu-class-list-style edu-h350-auto">
|
||||
<ul class="edu-class-list-style edu-h350-auto mh400">
|
||||
<% if @courses.count == 0 %>
|
||||
<p class="edu-nodata-p mb10">暂无</p>
|
||||
<p class="edu-nodata-p mb10" style="line-height: 390px">暂无</p>
|
||||
<% else %>
|
||||
<% @courses.each_with_index do |course, index| %>
|
||||
<li class="pl15 pr15 pt10 pb10 <%= index > 19 ? 'undis' : '' %>">
|
||||
|
|
@ -148,7 +155,7 @@
|
|||
<%= link_to course.name, course_path(course), :target => '_blank' %>
|
||||
</li>
|
||||
<% if index == 20 %>
|
||||
<a href="javascript:void(0);" onclick="show_all_members(this)" class="edu-class-right-add color-light-green" style="background:#fff; border-top:1px solid #eee; position: inherit;">
|
||||
<a href="javascript:void(0);" onclick="show_all_members(this)" class="edu-class-right-add color-orange05" style="background:#fff; border-top:1px solid #eee; position: inherit;">
|
||||
<i class="fa fa-angle-down"></i>
|
||||
<span>查看全部</span>
|
||||
</a>
|
||||
|
|
@ -156,9 +163,9 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
</ul>
|
||||
<ul class="edu-class-list-style edu-h350-auto undis">
|
||||
<ul class="edu-class-list-style edu-h350-auto undis mh400">
|
||||
<% if @end_courses.count == 0 %>
|
||||
<p class="edu-nodata-p">暂无</p>
|
||||
<p class="edu-nodata-p" style="line-height: 390px">暂无</p>
|
||||
<% else %>
|
||||
<% @end_courses.each_with_index do |course, index| %>
|
||||
<li class="pl15 pr15 pt10 pb10 <%= index > 19 ? 'undis' : '' %>">
|
||||
|
|
@ -208,8 +215,8 @@
|
|||
<script id="t:sy-refer-list" type="text/html">
|
||||
<li class="clearfix">
|
||||
<span class="font-bd fl">参考资料</span>
|
||||
<a href="javascript:void(0);" title="增加" class="color-orange05 add_refer"><i class="fa fa-plus-circle font-16 ml10 fl mt5"></i></a>
|
||||
<a href="javascript:void(0);" title="删除" class="color-orange05 delete_refer"><i class="fa fa-times-circle font-16 ml10 fl mt5"></i></a>
|
||||
<a href="javascript:void(0);" data-tip-down="增加" class="color-orange05 add_refer"><i class="fa fa-plus-circle font-16 ml10 fl mt5"></i></a>
|
||||
<a href="javascript:void(0);" data-tip-down="删除" class="color-orange05 delete_refer"><i class="fa fa-times-circle font-16 ml10 fl mt5"></i></a>
|
||||
<div class="cl"></div>
|
||||
<div class="mb10 edu-form-border clearfix">
|
||||
<label class="edu-form-label fl">书名：</label>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<p class="clearfix mb15">当前经验值：<span><%= @user.experience %></span>，您可以通过<%= link_to '实训挑战', shixuns_path(), :class => "color-orange03" %>的方式获得经验值</p>
|
||||
<div class="mh550" id="user_experience_content">
|
||||
<div id="user_experience_content">
|
||||
<%= render :partial => "users/user_experience_content" %>
|
||||
</div>
|
||||
|
|
@ -1,22 +1,23 @@
|
|||
<% if @user_experiences.blank? %>
|
||||
<div class="edu-tab-con-box" style="text-align: center">
|
||||
<img class="edu-nodata-img" src="/images/edu_user/edu-nodata.png"/>
|
||||
<p class="edu-nodata-p mb30">您还没有获得过经验值哦~</p>
|
||||
</div>
|
||||
<% else %>
|
||||
<table class="edu-pop-table edu-txt-center" cellpadding="0" cellspacing="0">
|
||||
<div class="mh550">
|
||||
<% if @user_experiences.blank? %>
|
||||
<div class="edu-tab-con-box" style="text-align: center">
|
||||
<img class="edu-nodata-img" src="/images/edu_user/edu-nodata.png"/>
|
||||
<p class="edu-nodata-p mb30">您还没有获得过经验值哦~</p>
|
||||
</div>
|
||||
<% else %>
|
||||
<table class="edu-pop-table-all" cellpadding="0" cellspacing="0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>操作</th>
|
||||
<th>变更</th>
|
||||
<th width="45%">详情</th>
|
||||
<th>操作时间</th>
|
||||
<th width="15%">操作</th>
|
||||
<th width="15%">变更</th>
|
||||
<th width="55%">详情</th>
|
||||
<th width="15%">操作时间</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @user_experiences.each do |exp| %>
|
||||
<tr>
|
||||
<td>闯关</td>
|
||||
<td class="pl10">闯关</td>
|
||||
<td>+ <%= exp.score %></td>
|
||||
<% game = Game.where(:id => exp.container_id).first %>
|
||||
<td><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %></td>
|
||||
|
|
@ -25,14 +26,14 @@
|
|||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<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>
|
||||
<%= pagination_links_full @experiences_pages, @experiences_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
|
||||
</ul>
|
||||
<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>
|
||||
<%= pagination_links_full @experiences_pages, @experiences_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
|
||||
</ul>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
@ -5,6 +5,6 @@
|
|||
<p class="clearfix mb15 gold-count">当前金币：<span><%= @user.grade %></span>，您可以通过<%= link_to '完善基本资料', my_account_path(), :class => "color-orange03" %>
|
||||
、<%= link_to '首次绑定邮箱和手机', security_settings_path(), :class => "color-orange03" %>
|
||||
以及<%= link_to '实训挑战', shixuns_path(), :class => "color-orange03" %>的方式获得金币</p>
|
||||
<div class="mh550" id="user_grade_content">
|
||||
<div id="user_grade_content">
|
||||
<%= render :partial => "users/user_grade_content" %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,58 +1,59 @@
|
|||
<div class="mh550">
|
||||
<% if @user_grades.blank? %>
|
||||
<div class="edu-tab-con-box" style="text-align: center">
|
||||
<img class="edu-nodata-img" src="/images/edu_user/edu-nodata.png"/>
|
||||
<p class="edu-nodata-p mb30">您还没有获得过金币哦~</p>
|
||||
</div>
|
||||
<% else %>
|
||||
<table class="edu-pop-table edu-txt-center" cellpadding="0" cellspacing="0">
|
||||
<thead>
|
||||
<table class="edu-pop-table-all" cellpadding="0" cellspacing="0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="15%">操作</th>
|
||||
<th width="15%" class="edu-txt-center">变更</th>
|
||||
<th width="55%">详情</th>
|
||||
<th width="15%" class="edu-txt-center">操作时间</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @user_grades.each do |grade| %>
|
||||
<tr>
|
||||
<th>操作</th>
|
||||
<th>变更</th>
|
||||
<th width="45%">详情</th>
|
||||
<th>操作时间</th>
|
||||
<% case grade.container_type %>
|
||||
<% when 'Phone' %>
|
||||
<td class="pl10">绑定手机</td>
|
||||
<td>+ <%= grade.score %></td>
|
||||
<td>用户首次绑定手机号码获得的奖励</td>
|
||||
<% when 'Mail' %>
|
||||
<td class="pl10">绑定邮箱</td>
|
||||
<td>+ <%= grade.score %></td>
|
||||
<td>用户首次绑定邮箱获得的奖励</td>
|
||||
<% when 'Account' %>
|
||||
<td class="pl10">完善基本资料</td>
|
||||
<td>+ <%= grade.score %></td>
|
||||
<td>新用户首次填写基本资料获得的奖励</td>
|
||||
<% when 'Answer' %>
|
||||
<td class="pl10">查看参考答案</td>
|
||||
<td>- <%= grade.score.abs %></td>
|
||||
<% game = Game.where(:id => grade.container_id).first %>
|
||||
<td><%= game ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的参考答案消耗的金币" : "--" %></td>
|
||||
<% when 'Game' %>
|
||||
<td class="pl10">闯关</td>
|
||||
<td>+ <%= grade.score %></td>
|
||||
<% game = Game.where(:id => grade.container_id).first %>
|
||||
<td><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %></td>
|
||||
<% end %>
|
||||
<td><%= format_time grade.created_at %></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @user_grades.each do |grade| %>
|
||||
<tr>
|
||||
<% case grade.container_type %>
|
||||
<% when 'Phone' %>
|
||||
<td>绑定手机</td>
|
||||
<td>+ <%= grade.score %></td>
|
||||
<td>用户首次绑定手机号码获得的奖励</td>
|
||||
<% when 'Mail' %>
|
||||
<td>绑定邮箱</td>
|
||||
<td>+ <%= grade.score %></td>
|
||||
<td>用户首次绑定邮箱获得的奖励</td>
|
||||
<% when 'Account' %>
|
||||
<td>完善基本资料</td>
|
||||
<td>+ <%= grade.score %></td>
|
||||
<td>新用户首次填写基本资料获得的奖励</td>
|
||||
<% when 'Answer' %>
|
||||
<td>查看参考答案</td>
|
||||
<td>- <%= grade.score.abs %></td>
|
||||
<% game = Game.where(:id => grade.container_id).first %>
|
||||
<td><%= game ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的参考答案消耗的金币" : "--" %></td>
|
||||
<% when 'Game' %>
|
||||
<td>闯关</td>
|
||||
<td>+ <%= grade.score %></td>
|
||||
<% game = Game.where(:id => grade.container_id).first %>
|
||||
<td><%= game ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : "--" %></td>
|
||||
<% end %>
|
||||
<td><%= format_time grade.created_at %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<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>
|
||||
<%= pagination_links_full @grades_pages, @grades_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
|
||||
</ul>
|
||||
<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>
|
||||
<%= pagination_links_full @grades_pages, @grades_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
|
||||
</ul>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<p class="clearfix mb15">当前技能标签：<span><%= @user.challenge_tags.count %></span>，您可以通过<%= link_to '实训挑战', shixuns_path(), :class => "color-orange03" %>的方式获得技能标签</p>
|
||||
<div class="mh550" id="user_tag_content">
|
||||
<div id="user_tag_content">
|
||||
<%= render :partial => "users/user_tag_content" %>
|
||||
</div>
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
<% if @user_tags.blank? || @user.challenge_tags.count == 0 %>
|
||||
<div class="edu-tab-con-box" style="text-align: center">
|
||||
<img class="edu-nodata-img" src="/images/edu_user/edu-nodata.png"/>
|
||||
<p class="edu-nodata-p mb30">您还没有获得过技能标签哦~</p>
|
||||
</div>
|
||||
<% else %>
|
||||
<table class="edu-pop-table edu-txt-center" cellpadding="0" cellspacing="0">
|
||||
<div class="mh550">
|
||||
<% if @user_tags.blank? || @user.challenge_tags.count == 0 %>
|
||||
<div class="edu-tab-con-box" style="text-align: center">
|
||||
<img class="edu-nodata-img" src="/images/edu_user/edu-nodata.png"/>
|
||||
<p class="edu-nodata-p mb30">您还没有获得过技能标签哦~</p>
|
||||
</div>
|
||||
<% else %>
|
||||
<table class="edu-pop-table-all" cellpadding="0" cellspacing="0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>操作</th>
|
||||
<th>变更</th>
|
||||
<th width="45%">详情</th>
|
||||
<th>操作时间</th>
|
||||
<th width="15%">操作</th>
|
||||
<th width="15%">变更</th>
|
||||
<th width="55%">详情</th>
|
||||
<th width="15%">操作时间</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -18,7 +19,7 @@
|
|||
<% game = Game.where(:id => tag.container_id).first %>
|
||||
<% if game && game.challenge.challenge_tags.count > 0 %>
|
||||
<tr>
|
||||
<td>闯关</td>
|
||||
<td class="pl10">闯关</td>
|
||||
<% game = Game.where(:id => tag.container_id).first %>
|
||||
<td>+ 标签：<%= game ? game.challenge.challenge_tags.map(&:name).join("、") : "" %></td>
|
||||
<td><%= "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的标签" %></td>
|
||||
|
|
@ -28,7 +29,7 @@
|
|||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<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;">
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@
|
|||
<% end %>
|
||||
</p>
|
||||
<% else %>
|
||||
<div class="mh650">
|
||||
<% users.each do |user| %>
|
||||
<%= render :partial => "users/user_fans_or_watch", :locals => {:user => user, :action => (params[:action] == "watch" || params[:action] == "unwatch") ? action : params[:action] }%>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="cl"></div>
|
||||
<% if user_count > 20 %>
|
||||
|
|
|
|||
|
|
@ -404,7 +404,13 @@ function notice_box_redirect_remote(url, str){
|
|||
pop_box_new(htmlvalue, 480, 140);
|
||||
}
|
||||
|
||||
|
||||
//重新登录
|
||||
function re_entry(url){
|
||||
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="'+ url +'" 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 mt10 mb10"><i class="fa fa-exclamation-circle color-orange04 mr10"></i>您的会话已退出，请重新登录^_^</p></div><div class="task-popup-right-sure clearfix">'+
|
||||
'<a href="'+ url +'" class="task-btn task-btn-blue" data-remote="true">重新登录</a></div></div>';
|
||||
pop_box_new(htmlvalue, 480, 140);
|
||||
}
|
||||
|
||||
// 警告/提示弹框点击“x”关闭
|
||||
$(function(){
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498
|
|||
.edu-filter-btn-green{background:#e4f3ec; color:#6fbb9d;}
|
||||
.edu-filter-btn-yellow{background:#fdefde; color:#ef9324;}
|
||||
.edu-filter-btn-danger{background:#d72e36; color:#fff;}
|
||||
|
||||
.edu-pop-table{ width: 100%; border:1px solid #eee; border-bottom:none; background:#fff; color:#888;}
|
||||
.edu-pop-table tr.edu-bg-grey{ background:#f5f5f5;}
|
||||
.edu-txt-center{ text-align: center;}
|
||||
|
|
@ -54,6 +55,7 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498
|
|||
.edu-pop-table tr td{border-bottom:1px solid #eee;}
|
||||
.edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;}
|
||||
.edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;}
|
||||
|
||||
.edu-line{ border-bottom:1px solid #eee;}
|
||||
table.table-th-grey th{ background:#f5f5f5;}
|
||||
table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
|
||||
|
|
|
|||
|
|
@ -51,13 +51,14 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498
|
|||
|
||||
.edu-pop-table{ width: 100%; border:1px solid #eee; border-bottom:none; background:#fff; color:#888;}
|
||||
.edu-pop-table tr{ height:40px; }
|
||||
.edu-pop-table tr:hover{ background: #dbdbdb; }
|
||||
/*.edu-pop-table tr:hover{ background: #dbdbdb; }*/
|
||||
.edu-pop-table tr.edu-bg-grey{ background:#f5f5f5;}
|
||||
.edu-txt-center{ text-align: center;}
|
||||
.edu-pop-table tr th{ color:#333;border-bottom:1px solid #eee; }
|
||||
.edu-pop-table tr td{border-bottom:1px solid #eee;}
|
||||
.edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;}
|
||||
.edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;}
|
||||
|
||||
.edu-line{ border-bottom:1px solid #eee;}
|
||||
table.table-th-grey th{ background:#f5f5f5;}
|
||||
table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
|
||||
|
|
@ -106,9 +107,10 @@ a:hover.edu-class-right-add{ background-color: rgba(0, 0, 0, 0.4);}
|
|||
.edu-weixin-p{ line-height: 1.5; color:#666; font-size:12px;}
|
||||
.edu-weixin-share:hover .edu-weixin-hide{ display: none;}
|
||||
|
||||
.edu-class-list-style li:nth-child(odd){background:#fafbfb;}
|
||||
.edu-class-list-style li:hover{background:#EFF2F7;cursor: pointer}
|
||||
.edu-class-list-style li:hover i{color: #FF7500!important;}
|
||||
.edu-class-list-style li{ line-height: 1.5;}
|
||||
.edu-class-list-style li:hover a{color: #FF7500!important;}
|
||||
.edu-class-list-style li{ line-height: 2;}
|
||||
.sy_tab_con_p{ font-size: 16px;text-align: center; margin-bottom:100px; color:#888;}
|
||||
.sy_classlist{padding: 20px 20px;border-bottom: 1px dashed #e6e6e6;}
|
||||
.resource_btns_bottom a{ height: 28px; line-height: 28px; padding:0px 15px; border:1px solid #d5d5d5; border-radius:3px; color: #666;}
|
||||
|
|
@ -395,4 +397,4 @@ a.uploadIcon {width:100px; height:33px;color:#ffffff;}
|
|||
|
||||
/*课堂改版*/
|
||||
.sy_member_div:hover{background:#EFF2F7;}
|
||||
.sy_member_div:hover .real-name,.sy_member_div:hover .operation{color: #FF9e6a!important;}
|
||||
.real-name:hover,.operation:hover{color: #FF9e6a!important;}
|
||||
|
|
@ -243,7 +243,7 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498
|
|||
.edu-filter-btn-no-late{background: rgba(186, 205, 215, 0.35); color: #8c8c8c;}
|
||||
.eud-pointer{ cursor:pointer;}
|
||||
.edu-bg-grey{ background:#f6f6f6; width:90%; min-width:700px; color:#666;}
|
||||
/* table */
|
||||
/* table-1底部边框 */
|
||||
.edu-pop-table{ width: 100%; border:1px solid #eee; border-bottom:none; background:#fff; color:#888;}
|
||||
.edu-pop-table tr{ height:40px; }
|
||||
.edu-pop-table tr.edu-bg-grey{ background:#f5f5f5;}
|
||||
|
|
@ -252,6 +252,14 @@ a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498
|
|||
.edu-pop-table tr td{border-bottom:1px solid #eee;}
|
||||
.edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;}
|
||||
.edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;}
|
||||
/* table-2全边框 */
|
||||
.edu-pop-table-all{ width: 100%; border:1px solid #eee; background:#fff; color:#888;border-collapse: collapse}
|
||||
.edu-pop-table-all tr{ height:30px; }
|
||||
.edu-pop-table-all tr.edu-bg-grey{ background:#f5f5f5;}
|
||||
.edu-pop-table-all tr th{ color:#333;border:1px solid #eee; }
|
||||
.edu-pop-table-all tr td{border:1px solid #eee;padding: 5px}
|
||||
|
||||
|
||||
.edu-line{ border-bottom:1px solid #eee;}
|
||||
table.table-th-grey th{ background:#f5f5f5;}
|
||||
table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
|
||||
|
|
@ -275,6 +283,7 @@ table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
|
|||
html>body #ajax-indicator { position: fixed; }
|
||||
|
||||
#ajax-indicator span {
|
||||
color: #333333;
|
||||
background-position: 0% 40%;
|
||||
background-repeat: no-repeat;
|
||||
background-image: url(/images/loading.gif);
|
||||
|
|
@ -378,6 +387,7 @@ input::-ms-clear{display:none;}
|
|||
/*---------------tab公用下边框-----------------*/
|
||||
.border-bottom-orange{border-bottom: 2px solid #FC7033!important;}
|
||||
.bor-bottom-orange{border-bottom: 1px solid #FF9e6a!important;}
|
||||
.bor-bottom-greyE{border-bottom: 1px solid #EEEEEE!important;}
|
||||
/*---------------边框-----------------*/
|
||||
.bor-gray-c{border:1px solid #ccc;}
|
||||
.bor-grey-e{border:1px solid #eee;}
|
||||
|
|
@ -410,4 +420,7 @@ input::-ms-clear{display:none;}
|
|||
|
||||
/*-------------------------圆角-------------------------*/
|
||||
.bor-radius-upper{border-radius: 4px 4px 0px 0px;}
|
||||
.bor-radius-all{border-radius: 50%;}
|
||||
.bor-radius-all{border-radius: 50%;}
|
||||
|
||||
/*-------------------------旋转-------------------------*/
|
||||
.transform90{transform: rotate(90deg);}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
.task-popup-content{ padding:15px;}
|
||||
.task-popup-submit{ margin:0px auto 15px; width: 120px;}
|
||||
.task-popup-sure{ margin:0px auto 15px; width: 54px;}
|
||||
.task-popup-right-sure{margin:0px auto 15px;text-align: center}
|
||||
.task-popup-OK{ margin:15px auto; width: 70px;}
|
||||
.task-popup-bggrey{ background:#fff; color:#333;}
|
||||
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ input.task-form-100,textarea.task-form-100,select.task-form-100,.task-form-100{p
|
|||
input.task-height-40,textarea.task-height-40,.task-height-40,select.task-height-40{height:40px;}
|
||||
input.task-height-220,textarea.task-height-220,.task-height-220{height:220px;}
|
||||
input.task-height-150,textarea.task-height-150,.task-height-150{height:150px;}
|
||||
input.task-height-150,textarea.task-height-150,.task-height-100{height:100px;}
|
||||
input.task-height-100,textarea.task-height-100,.task-height-100{height:100px;}
|
||||
|
||||
/*头像下拉弹框*/
|
||||
.my_account_info{ width:160px; background-color:#fff; border-radius: 3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; font-size: 14px; top:46px; left:-97px;display: none; z-index:999;}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
/*------课程实训首页---------*/
|
||||
/*background: linear-gradient(to right, rgb(68, 190, 164) 0%, rgb(62, 158, 207) 100%);*/
|
||||
.header-color{padding: 30px;background-image: url("../images/subject.jpg");background-size: 100%;}
|
||||
|
||||
.box_bg_shandow{box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);}
|
||||
.active-class .content .pre_sub-con{width:23.69%;margin: 0 1.5% 2% 0px;height: 264px;box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);}
|
||||
.active-class .content .pre_sub-con:nth-child(4n+0){margin:0 0 2% 0;}
|
||||
.active-class .content .pre_sub-con:hover{cursor: pointer;-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1;}
|
||||
.pre-book{height: 100%;position:absolute;}
|
||||
.subject-box{padding: 20px;background: #fff;text-align: center;position: relative;}
|
||||
.unit-name{line-height: 15px;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;height: 30px; word-wrap: break-word;}
|
||||
|
||||
.active-class .content .sub-con{width:23.69%;border:1px solid #eee;background:#fff;margin: 0 1.5% 1.5% 0px;box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);}
|
||||
.active-class .content .sub-con:nth-child(4n+0){margin:0 0 1.5% 0;}
|
||||
.active-class .content .sub-con:hover{box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);cursor: pointer;-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1;}
|
||||
|
|
|
|||
|
|
@ -289,6 +289,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
|
|||
.g_frame{border: 1px solid #21b524;color: #21b524;padding: 5px;border-radius: 3px;}
|
||||
.loading-center{text-align: center; align-items: center;justify-content: center;}
|
||||
.two_lines_show{ overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;height: 60px; word-wrap: break-word;}
|
||||
.three_lines_show{ overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 3;-webkit-box-orient: vertical;height: 66px;line-height: 22px; word-wrap: break-word;}
|
||||
.center{vertical-align: middle;text-align: center; }
|
||||
.itoblock_w150{ display: block; float:left; width:150px }
|
||||
|
||||
|
|
@ -301,10 +302,10 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
|
|||
.task-form-28{width: 28%;padding:0px 10px}
|
||||
.lesson{border:1px solid #EEEEEE;line-height:40px;}
|
||||
.lesson_img{position: absolute;right: 10px;top:10px;}
|
||||
.lesson_checkbox{display: none;position: absolute;top:40px;left: -1px;width: 100%;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px;height: 150px;}
|
||||
.lesson_checkbox{display: none;position: absolute;top:40px;left: -1px;width: 100%;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px;height: 150px;z-index: 10}
|
||||
.lesson_checkbox li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0;}
|
||||
.lesson_checkbox li input{float: left;margin: 3px 5px 0px 0px;}
|
||||
.lesson_content{height: 98%;border:none !important;width:100%;outline: none;padding-left: 0;}
|
||||
.lesson_content{height: 39px;border:none !important;width:100%;outline: none;padding-left: 0;}
|
||||
|
||||
/* 实训首页的搜索 */
|
||||
.xy_box{padding:16px;height:180px}
|
||||
|
|
@ -366,7 +367,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_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:-50px;position: relative;}
|
||||
.load{width: auto;top:50%;margin-top:-100px;position: relative;}
|
||||
.loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue