Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
This commit is contained in:
commit
75d3b92bac
|
|
@ -5,14 +5,15 @@ class StagesController < ApplicationController
|
|||
include ApplicationHelper
|
||||
|
||||
def create
|
||||
if params[:stage_name] && params[:shixun_id]
|
||||
if params[:stage_name]
|
||||
stage = Stage.new
|
||||
stage.name = params[:stage_name]
|
||||
stage.description = params[:stage_des]
|
||||
stage.subject_id = @subject.id
|
||||
stage.user_id = User.current.id
|
||||
stage.position = @subject.stages.count + 1
|
||||
ActiveRecord::Base.transaction do
|
||||
if stage.save
|
||||
if stage.save && params[:shixun_id]
|
||||
begin
|
||||
params[:shixun_id].each do |shixun_id|
|
||||
shixun = Shixun.find shixun_id
|
||||
|
|
@ -34,10 +35,11 @@ class StagesController < ApplicationController
|
|||
end
|
||||
|
||||
def update
|
||||
if params[:stage_name] && params[:shixun_id]
|
||||
if params[:stage_name]
|
||||
@stage.name = params[:stage_name]
|
||||
@stage.description = params[:stage_des]
|
||||
ActiveRecord::Base.transaction do
|
||||
if @stage.save
|
||||
if @stage.save && params[:shixun_id]
|
||||
begin
|
||||
@stage.stage_shixuns.destroy_all
|
||||
params[:shixun_id].each do |shixun_id|
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ class SubjectsController < ApplicationController
|
|||
layout 'base_subject'
|
||||
before_filter :require_login
|
||||
before_filter :check_authentication
|
||||
before_filter :find_subject, :except => [:index, :create_subject, :new_subject, :append_to_stage]
|
||||
before_filter :find_subject, :except => [:index, :new, :create, :create_subject, :new_subject, :append_to_stage]
|
||||
|
||||
include ApplicationHelper
|
||||
|
||||
|
|
@ -30,6 +30,26 @@ class SubjectsController < ApplicationController
|
|||
@stages = @subject.stages
|
||||
end
|
||||
|
||||
def new
|
||||
@subject = Subject.new
|
||||
render :layout => "base_edu"
|
||||
end
|
||||
|
||||
def create
|
||||
if params[:subject]
|
||||
subject = Subject.create(:name => params[:subject][:name], :description => params[:subject][:description], :user_id => User.current.id, :visits => 0, :status => 0)
|
||||
end
|
||||
redirect_to subject_path(subject)
|
||||
end
|
||||
|
||||
def update_attr
|
||||
if params[:name]
|
||||
@subject.update_attributes(:name => params[:name])
|
||||
elsif params[:description]
|
||||
@subject.update_attributes(:description => params[:description])
|
||||
end
|
||||
end
|
||||
|
||||
def new_subject
|
||||
if Course.where(:tea_id => User.current.id).count > 0
|
||||
@status = 1
|
||||
|
|
@ -53,8 +73,9 @@ class SubjectsController < ApplicationController
|
|||
end
|
||||
|
||||
def choose_subject_shixun
|
||||
course_list = @subject.course_list
|
||||
@shixuns = Shixun.where(:user_id => User.current.id, :status => [0, 1, 2], :id => course_list.shixun_major_courses.map(&:shixun_id))
|
||||
#course_list = @subject.course_list
|
||||
@shixuns = User.current.shixuns.where(:status => [0, 1, 2]).reorder("created_at desc")
|
||||
#@shixuns = Shixun.where(:user_id => User.current.id, :status => [0, 1, 2], :id => course_list.shixun_major_courses.map(&:shixun_id))
|
||||
@shixuns_count = @shixuns.count
|
||||
@limit = 8
|
||||
@shixuns_pages = Paginator.new @shixuns_count, @limit, params['page'] || 1
|
||||
|
|
@ -67,15 +88,19 @@ class SubjectsController < ApplicationController
|
|||
end
|
||||
|
||||
def publish
|
||||
@subject.update_attributes(:status => 1)
|
||||
apply = ApplyAction.where(:container_type => "ApplySubject", :container_id => @subject.id).order("created_at desc").first
|
||||
if apply && apply.status == 0
|
||||
@status = 0
|
||||
else
|
||||
ApplyAction.create(:container_type => "ApplySubject", :container_id => @subject.id, :user_id => User.current.id, :status => 0)
|
||||
notes = User.current.show_name.to_s + " 申请发布课程实训：<a href='#{subject_path(@subject)}'>#{@subject.name}</a>"
|
||||
JournalsForMessage.create(:jour_id => 1, :jour_type => 'Principal', :user_id => User.current.id, :notes => notes, :private => 1, :reply_id => 0)
|
||||
@status = 1
|
||||
if Shixun.where(:id => @subject.stage_shixuns.map(&:shixun_id), :status => [0, 1]).count > 0
|
||||
@status = 2
|
||||
else
|
||||
@subject.update_attributes(:status => 1)
|
||||
ApplyAction.create(:container_type => "ApplySubject", :container_id => @subject.id, :user_id => User.current.id, :status => 0)
|
||||
notes = User.current.show_name.to_s + " 申请发布课程实训：<a href='#{subject_path(@subject)}'>#{@subject.name}</a>"
|
||||
JournalsForMessage.create(:jour_id => 1, :jour_type => 'Principal', :user_id => User.current.id, :notes => notes, :private => 1, :reply_id => 0)
|
||||
@status = 1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -83,8 +108,8 @@ class SubjectsController < ApplicationController
|
|||
apply = ApplyAction.where(:container_type => "ApplySubject", :container_id => @subject.id).order("created_at desc").first
|
||||
if apply && apply.status == 0
|
||||
apply.update_attributes(:status => 3)
|
||||
@subject.update_column('status', 0)
|
||||
end
|
||||
@subject.update_attributes(:status => 0)
|
||||
redirect_to subject_path(@subject)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -230,6 +230,18 @@ module ApplicationHelper
|
|||
end
|
||||
end
|
||||
|
||||
# TPI状态 ：已通关、未通关、未开启
|
||||
def my_shixun_status shixun, user
|
||||
status = ""
|
||||
myshixun = Myshixun.where(:shixun_id => shixun.id, :user_id => user.id).first
|
||||
if myshixun.nil?
|
||||
status = "未开启"
|
||||
else
|
||||
status = myshixun.status == 1 ? "已通关" : "未通关"
|
||||
end
|
||||
status
|
||||
end
|
||||
|
||||
# 定义实训相关方法
|
||||
def sum_final_score
|
||||
Game.find_by_sql("SELECT sum(final_score) as total_score FROM `games` where user_id=#{User.current.id}").first.try(:total_score)
|
||||
|
|
@ -1918,23 +1930,23 @@ module ApplicationHelper
|
|||
elsif @welcome
|
||||
title << "创新源于实践"
|
||||
elsif @course
|
||||
title << (@course.name.nil? ? "实训课堂" : @course.name)
|
||||
title << (@course.name.nil? ? "在线课堂" : @course.name)
|
||||
elsif params[:controller] == "homework_bank"
|
||||
title << ("题库")
|
||||
elsif params[:controller] == "courses" && params[:action] == "index"
|
||||
title << ("实训课堂")
|
||||
title << ("在线课堂")
|
||||
elsif @contest
|
||||
title << (@contest.name.nil? ? "创新源于实践" : @contest.name)
|
||||
elsif @shixun
|
||||
title << (@shixun.name.nil? ? "实训分类" : @shixun.name)
|
||||
title << (@shixun.name.nil? ? "全部实训" : @shixun.name)
|
||||
elsif @my_shixun
|
||||
title << ("我的实训")
|
||||
elsif params[:controller] == "shixuns" && params[:action] == "index"
|
||||
title << ("实训分类")
|
||||
title << ("全部实训")
|
||||
elsif @subject
|
||||
title << (@subject.name.nil? ? "课程实训" : @subject.name)
|
||||
title << (@subject.name.nil? ? "实训套件" : @subject.name)
|
||||
elsif params[:controller] == "subjects" && params[:action] == "index"
|
||||
title << ("课程实训")
|
||||
title << ("实训套件")
|
||||
elsif @organization
|
||||
title << (@organization.name.nil? ? "创新源于实践" : @organization.name)
|
||||
elsif @forum || params[:controller] == "forums"
|
||||
|
|
@ -1945,7 +1957,7 @@ module ApplicationHelper
|
|||
if !@project_community.blank? || !@user_projectlist.blank?
|
||||
title << "项目"
|
||||
elsif !@course_community.blank? || !@user_courselist.blank?
|
||||
title << "实训课堂"
|
||||
title << "在线课堂"
|
||||
elsif !@contest_community.blank?
|
||||
title << @contest_community
|
||||
elsif !@manage_issues.blank?
|
||||
|
|
@ -1960,7 +1972,7 @@ module ApplicationHelper
|
|||
title << @user.show_name
|
||||
end
|
||||
elsif @syllabus
|
||||
title << (@syllabus.title.nil? ? "实训课堂" : @syllabus.title)
|
||||
title << (@syllabus.title.nil? ? "在线课堂" : @syllabus.title)
|
||||
else
|
||||
title << (User.current.id == 2 ? "未登录" : User.current.try(:realname))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
<span class="btn-cir btn-cir-grey ml10 mt12 fl"><%= @challenges.count %></span>
|
||||
<% end %>
|
||||
<% if User.current.manager_of_shixun?(@shixun) && @shixun.status == 0 %>
|
||||
<!--<a href="<%#= new_shixun_challenge_path(@shixun, :st => 2) %>" class="shixun-task-btn task-btn-green fr mr5" style="margin: 5px 0;">单选任务</a>-->
|
||||
<!--<a href="<%#= new_shixun_challenge_path(@shixun, :st => 1) %>" class="shixun-task-btn task-btn-green fr mr5" style="margin: 5px 0;">多选任务</a>-->
|
||||
<!--<a href="<%#= new_shixun_challenge_path(@shixun, :st => 0) %>" class="shixun-task-btn task-btn-green fr mr5" style="margin: 5px 0;">编程任务</a>-->
|
||||
<a href="<%= new_shixun_challenge_path(@shixun, :st => 0) %>" class="shixun-task-btn task-btn-green fr mr5" style="margin: 5px 0;">新建阶段</a>
|
||||
<a href="<%#= new_shixun_challenge_path(@shixun, :st => 2) %>" class="shixun-task-btn task-btn-green fr mt5">+单选任务</a>
|
||||
<a href="<%#= new_shixun_challenge_path(@shixun, :st => 1) %>" class="shixun-task-btn task-btn-green fr mr10 mt5">+多选任务</a>
|
||||
<a href="<%#= new_shixun_challenge_path(@shixun, :st => 0) %>" class="shixun-task-btn task-btn-green fr mr10 mt5">+编程任务</a>
|
||||
<!--<a href="<%= new_shixun_challenge_path(@shixun, :st => 0) %>" class="shixun-task-btn task-btn-green fr mr5" style="margin: 5px 0;">新建阶段</a>-->
|
||||
<% end %> </div>
|
||||
<div class="panel-list shixun-panel-list">
|
||||
<% @challenges.each_with_index do |challenge, index| -%>
|
||||
|
|
|
|||
|
|
@ -31,11 +31,41 @@
|
|||
<% end %>
|
||||
</ul>
|
||||
<% end %>
|
||||
<ul id="select_more">
|
||||
<li class="clearfix mb10">
|
||||
<label class="panel-form-label fl"><span class="mr10">A.</span></label>
|
||||
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690">
|
||||
<input type="checkbox" name="select_more[]" value="" id="select_more_0" class="ml-3 mr5 magic-checkbox">
|
||||
<label for="select_more_0" style="top:0px">网络层</label>
|
||||
</div>
|
||||
</li>
|
||||
<li class="clearfix mb10">
|
||||
<label class="panel-form-label fl"><span class="mr10">B.</span></label>
|
||||
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690">
|
||||
<input type="checkbox" name="select_more[]" value="" id="select_more_1" class="ml-3 mr5 magic-checkbox">
|
||||
<label for="select_more_1" style="top:0px">网络层</label>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<ul id="select_single">
|
||||
<li class="clearfix mb10">
|
||||
<label class="panel-form-label fl"><span class="mr10">A.</span></label>
|
||||
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690">
|
||||
<input name="select_single[]" value="" type="radio" id="select_single_0" class="ml-3 mr5 magic-radio">
|
||||
<label for="select_single_0" style="top:0px">网络层</label>
|
||||
</div>
|
||||
</li>
|
||||
<li class="clearfix mb10">
|
||||
<label class="panel-form-label fl"><span class="mr10">B.</span></label>
|
||||
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690">
|
||||
<input name="select_single[]" value="" type="radio" id="select_single_1" class="ml-3 mr5 magic-radio">
|
||||
<label for="select_single_1" style="top:0px">网络层</label>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<%# if @challenge.st == 1 %>
|
||||
|
||||
<!--需要添加新代码的地方-->
|
||||
|
||||
<%# end %>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,13 @@
|
|||
position: relative;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script id="t:set-option-list" type="text/html">
|
||||
<li class="clearfix pr">
|
||||
<label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice" onclick="selectchoice(this);" name="option_span">A</span></label>
|
||||
<textarea class="panel-form-width2-690 fl panel-box-sizing" name="option_inputs_label" placeholder="请输入选项内容"></textarea>
|
||||
<a title="移除" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
|
||||
</li>
|
||||
</script>
|
||||
<div id="shixun_form">
|
||||
<li class="clearfix">
|
||||
<label class="panel-form-label fl"><span class="c_red mr5">*</span>名称：</label>
|
||||
|
|
@ -25,11 +31,14 @@
|
|||
</div>
|
||||
<span style="display: none" class="c_red ml95" id="new_shixun_pass">过关任务不能为空</span>
|
||||
</li>
|
||||
<!--<li>-->
|
||||
<!--/*****-->
|
||||
<!--需要写选项的地方-->
|
||||
<!--*****/-->
|
||||
<!--</li>-->
|
||||
|
||||
<ul>
|
||||
<li class="clearfix mb10" >
|
||||
<label class="panel-form-label fl"><span class="add-option-item fr mr10 color-grey" name="option_span">A</span></label>
|
||||
<div class="fl panel-box-sizing add-option-input"><a title="新增" class="option_icon_add">新增选项</a></div>
|
||||
</li>
|
||||
<li class="clearfix" ><label class="fl" style="margin-left: 46px">温馨提示：点击选项，可以直接设置答案</label><label class="fr">标准答案：<span id="current-option" class="color-orange">请点击正确选项</span></label></li>
|
||||
</ul>
|
||||
<li class="clearfix">
|
||||
<a href="javascript:void(0);" class="task-btn task-btn-green fr" onclick="challenge_update()">保存</a>
|
||||
<% if params[:action] == "new" %>
|
||||
|
|
@ -68,7 +77,62 @@
|
|||
imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
|
||||
imageUploadURL : "<%= upload_with_markdown_path(:container_id => @shixun.id, :container_type => @shixun.class) %>"//url
|
||||
});
|
||||
|
||||
var bt = baidu.template;
|
||||
bt.LEFT_DELIMITER = '<!';
|
||||
bt.RIGHT_DELIMITER = '!>';
|
||||
|
||||
$("#shixun_form").on('click', 'a.option_icon_add', function () {
|
||||
var html = bt('t:set-option-list', null);
|
||||
$(this).parent().parent('.clearfix').before(html);
|
||||
var inputs = document.getElementsByName("option_inputs_label");
|
||||
var inputs_spans = document.getElementsByName("option_span");
|
||||
for (var j = 0; j < inputs_spans.length; j++) {
|
||||
if(j >= 0 && j <= 26){
|
||||
$(inputs_spans[j]).html(String.fromCharCode(65 + j));
|
||||
}
|
||||
}
|
||||
for (var i = 0; i < inputs.length; i++) {
|
||||
autoTextarea(inputs[i], 0, 140);
|
||||
}
|
||||
$(inputs[inputs.length - 1]).focus();
|
||||
});
|
||||
$("#shixun_form").on('click', 'a.option_icon_remove', function () {
|
||||
$(this).parent('.clearfix').remove();
|
||||
var inputs_spans = document.getElementsByName("option_span");
|
||||
for (var j = 0; j < inputs_spans.length; j++) {
|
||||
if(j >= 0 && j <= 26){
|
||||
if(j >= 0 && j <= 26){
|
||||
$(inputs_spans[j]).html(String.fromCharCode(65 + j));
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
//设置选项答案
|
||||
function selectchoice(item){
|
||||
//判断是否选中，如果选中，再次点击的时候取消选中
|
||||
if($(item).hasClass('check-option-bg')){
|
||||
$(item).removeClass('check-option-bg');
|
||||
}else{
|
||||
if(true){
|
||||
//单选
|
||||
$(".select-choice").removeClass('check-option-bg');
|
||||
$(item).addClass('check-option-bg');
|
||||
}else{
|
||||
//多选
|
||||
$(item).addClass('check-option-bg');
|
||||
}
|
||||
}
|
||||
$("#current-option").html("");
|
||||
if($(".check-option-bg").length>0){
|
||||
for(var i=0;i<$(".check-option-bg").length;i++){
|
||||
$("#current-option").html($("#current-option").html()+$(".check-option-bg").eq(i).html());
|
||||
}
|
||||
}else{
|
||||
$("#current-option").html("请点击正确选项");
|
||||
}
|
||||
}
|
||||
window.onload = function(){
|
||||
$("#challenge_task_pass [type=\"latex\"]").bind("click", function(){
|
||||
taskpass_editormd.cm.replaceSelection("```latex");
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="right fl">
|
||||
<div class="right fl user_bg_shadow bc-white">
|
||||
<div class="banner clearfix mb20 font-16 user_bg_shadow">
|
||||
<span class="span1 fl ">成员列表</span>
|
||||
<span class="span2 fr">
|
||||
<%= link_to '返回', course_path(@course), :class => 'font-14 color-grey' %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="person user_bg_shadow pb5">
|
||||
<div class="person pb5">
|
||||
<!--------------学生--------------->
|
||||
<div class="student">
|
||||
<p class="clearfix pl20 pr20 color-grey">
|
||||
|
|
@ -44,39 +44,44 @@
|
|||
<span class="fr right mt10" style=" height: 36px; line-height:36px;width:205px; margin-top:11px;"><input class="mr15 pl5 color-grey" style="width:160px;" type="text" value="<%= @search %>" id="all_student_list_search" placeholder="输入姓名、学号进行搜索"/><i class="fa fa-search font-16 mt8 mr10 color-grey" onclick="submit_member_all_student_list_search('<%= @course.id %>');"></i></span>
|
||||
</p>
|
||||
<!--------------全部学生-------------------->
|
||||
<ul class="all pl20 pr20 color-grey">
|
||||
<li class="clearfix">
|
||||
<span class="span1">序号</span>
|
||||
<span class="span2">姓名</span>
|
||||
<span>用户ID</span>
|
||||
<span>学号</span>
|
||||
<span>分班</span>
|
||||
<span class="span6">操作</span>
|
||||
</li>
|
||||
|
||||
<table class="edu-pop-table color-grey edu-txt-center table-pa5 " style="border:none;" cellspacing="0" cellpadding="0" >
|
||||
<thead>
|
||||
<tr>
|
||||
<th>序号</th>
|
||||
<th>姓名</th>
|
||||
<th>用户ID</th>
|
||||
<th>学号</th>
|
||||
<th>分班</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% unless @members.blank? %>
|
||||
<% @members.each_with_index do |member, index| %>
|
||||
<% user = member.user %>
|
||||
<li class="clearfix" id="setting_member_<%= member.id %>">
|
||||
<span class="span1"><%= index + 1 + (@page - 1) * 20 %></span>
|
||||
<span class="span2"><%= link_to user.show_real_name, user_path(user), :target => '_blank' %></span>
|
||||
<span><%= user.login %></span>
|
||||
<span><%= user.user_extensions ? user.user_extensions.student_id : '' %></span>
|
||||
<span><%= member.course_group_id == 0 ? '未分班' : member.course_group.name %></span>
|
||||
<span class="span6">
|
||||
<tr id="setting_member_<%= member.id %>">
|
||||
<td><%= index + 1 + (@page - 1) * 20 %></td>
|
||||
<td><%= link_to user.show_real_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5', :target => '_blank' %></td>
|
||||
<td><span class="edu-txt-w140 task-hide mt5"><%= user.login %></span></td>
|
||||
<td><span class="edu-txt-w140 task-hide mt5"><%= user.user_extensions ? user.user_extensions.student_id : '' %></span></td>
|
||||
<td><%= member.course_group_id == 0 ? '未分班' : member.course_group.name %></td>
|
||||
<td>
|
||||
<% if user == User.current %>
|
||||
<a href="javascript:void(0);" class="delete" onclick="delete_confirm_box_3('<%=join_path(:object_id => @course.id) %>', '确定退出班级吗？')">删除</a>
|
||||
<a href="javascript:void(0);" class="span5 delete" onclick="delete_confirm_box_3('<%=join_path(:object_id => @course.id) %>', '确定退出班级吗？')">删除</a>
|
||||
<% else %>
|
||||
--
|
||||
<% end %>
|
||||
</span>
|
||||
</li>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</ul>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
|
||||
<div class="fr pages_right_min mt10">
|
||||
<div class="fr pages_right_min mt10 mb10">
|
||||
<ul>
|
||||
<%= pagination_links_full @member_pages, @member_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -31,14 +31,14 @@
|
|||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="right fl">
|
||||
<div class="banner clearfix mb20 font-16 user_bg_shadow">
|
||||
<div class="right fl user_bg_shadow bc-white">
|
||||
<div class="banner clearfix mb20 font-16">
|
||||
<span class="span1 fl ">成员列表</span>
|
||||
<span class="span2 fr">
|
||||
<%= link_to '返回', course_path(@course), :class => 'font-14 color-grey' %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="person user_bg_shadow pb5">
|
||||
<div class="person pb5">
|
||||
<!--------------学生--------------->
|
||||
<div class="student">
|
||||
<p class="clearfix pl20 pr20 color-grey">
|
||||
|
|
@ -48,41 +48,41 @@
|
|||
<span class="fr right mt10"><input class="pr15 pl5 color-grey" type="text" value="<%= @search %>" id="has_group_student_list_search" placeholder="输入姓名、学号进行搜索"/><i class="fa fa-search font-16 mt8 mr10" onclick="submit_member_has_group_student_search('<%= @course.id %>', '<%= @group.id %>');"></i></span>
|
||||
</p>
|
||||
<!------------------已分班学生--------------------->
|
||||
<ul class="oldstudent pl20 pr20 color-grey">
|
||||
<li class="clearfix">
|
||||
<span class="span1">序号</span>
|
||||
<span class="span2">姓名</span>
|
||||
<span>用户ID</span>
|
||||
<span>学号</span>
|
||||
<span class="span6">操作</span>
|
||||
</li>
|
||||
|
||||
<table class="edu-pop-table color-grey edu-txt-center table-pa5 " style="border:none;" cellspacing="0" cellpadding="0" >
|
||||
<thead>
|
||||
<tr>
|
||||
<th>序号</th>
|
||||
<th>姓名</th>
|
||||
<th>用户ID</th>
|
||||
<th>学号</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% unless @members.blank? %>
|
||||
<% @members.each_with_index do |member, index| %>
|
||||
<% user = member.user %>
|
||||
<li class="clearfix" id="setting_member_<%= member.id %>">
|
||||
<span class="span1 open-select">
|
||||
<%= index + 1 + (@page -1) * 20 %>
|
||||
</span>
|
||||
<span class="span2"><%= link_to user.show_real_name, user_path(user), :target => '_blank' %></span>
|
||||
<span><%= user.login %></span>
|
||||
<span><%= user.user_extensions ? user.user_extensions.student_id : '' %></span>
|
||||
|
||||
<span class="span6">
|
||||
<tr id="setting_member_<%= member.id %>">
|
||||
<td><%= index + 1 + (@page -1) * 20 %></td>
|
||||
<td><%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %></td>
|
||||
<td><span class="edu-txt-w140 task-hide mt5"><%= user.login %></span></td>
|
||||
<td><span class="edu-txt-w140 task-hide mt5"><%= user.user_extensions ? user.user_extensions.student_id : '' %></span></td>
|
||||
<td>
|
||||
<% if user == User.current %>
|
||||
<a href="javascript:void(0);" class="delete" onclick="delete_confirm_box('<%=unjoin_group_courses_path(:member => member.id, :group_id => @group.id) %>', '确定要移除吗？<br/>移除后，需要重新选分班。')">移除</a>
|
||||
<a href="javascript:void(0);" class="span5 delete" onclick="delete_confirm_box('<%=unjoin_group_courses_path(:member => member.id, :group_id => @group.id) %>', '确定要移除吗？<br/>移除后，需要重新选分班。')">移除</a>
|
||||
<% else %>
|
||||
--
|
||||
<% end %>
|
||||
</span>
|
||||
</li>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</ul>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
|
||||
<div class="fr pages_right_min mt10">
|
||||
<div class="fr pages_right_min mt10 mb10">
|
||||
<ul>
|
||||
<%= pagination_links_full @member_pages, @member_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="right fl">
|
||||
<div class="right fl user_bg_shadow bc-white">
|
||||
<div class="banner clearfix mb20 font-16 user_bg_shadow">
|
||||
<span class="span1 fl ">成员列表</span>
|
||||
<span class="span2 fr">
|
||||
<%= link_to '返回', course_path(@course), :class => 'font-14 color-grey' %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="person user_bg_shadow pb5">
|
||||
<div class="person pb5">
|
||||
<!--------------学生--------------->
|
||||
<div class="student">
|
||||
<p class="clearfix pl20 pr20 color-grey">
|
||||
|
|
@ -44,41 +44,44 @@
|
|||
<span class="fr right mt10"><input class="pr15 pl5 color-grey" type="text" value="<%= @search %>" id="no_group_student_list_search" placeholder="输入姓名、学号进行搜索"/><i class="fa fa-search font-16 mt8 mr10" onclick="submit_member_no_group_student_search('<%= @course.id %>');" style="color:#666;cursor: pointer"></i></span>
|
||||
</p>
|
||||
<!--------------学生-------------------->
|
||||
<ul class="newstudent pl20 pr20 color-grey">
|
||||
<li class="clearfix">
|
||||
<span class="span1">序号</span>
|
||||
<span class="span2">姓名</span>
|
||||
<span>用户ID</span>
|
||||
<span>学号</span>
|
||||
<span class="span6">操作</span>
|
||||
</li>
|
||||
|
||||
<table class="edu-pop-table color-grey edu-txt-center table-pa5 " style="border:none;" cellspacing="0" cellpadding="0" >
|
||||
<thead>
|
||||
<tr>
|
||||
<th>序号</th>
|
||||
<th>姓名</th>
|
||||
<th>用户ID</th>
|
||||
<th>学号</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% unless @members.blank? %>
|
||||
<% @members.each_with_index do |member, index| %>
|
||||
<% user = member.user %>
|
||||
<li class="clearfix" id="setting_member_<%= member.id %>">
|
||||
<span class="span1"><%= index + 1 + (@page - 1) * 20 %></span>
|
||||
<span class="span2"><%= link_to user.show_real_name, user_path(user), :target => '_blank' %></span>
|
||||
<span><%= user.login %></span>
|
||||
<span><%= user.user_extensions ? user.user_extensions.student_id : '' %></span>
|
||||
<span class="span6">
|
||||
<tr id="setting_member_<%= member.id %>">
|
||||
<td><%= index + 1 + (@page -1) * 20 %></td>
|
||||
<td><%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %></td>
|
||||
<td><span class="edu-txt-w140 task-hide mt5"><%= user.login %></span></td>
|
||||
<td><span class="edu-txt-w140 task-hide mt5"><%= user.user_extensions ? user.user_extensions.student_id : '' %></span></td>
|
||||
<td>
|
||||
<% if user == User.current %>
|
||||
<a href="javascript:void(0);" class="delete" onclick="delete_confirm_box_3('<%= join_path(:object_id => @course.id) %>', '确定退出班级吗？')">删除</a>
|
||||
<a href="javascript:void(0);" class="span5 delete" onclick="delete_confirm_box_3('<%= join_path(:object_id => @course.id) %>', '确定退出班级吗？')">删除</a>
|
||||
<% if @course.choose_group_allow %>
|
||||
<a href="javascript:void(0);" class="delete" onclick="student_choose_group('<%= @course.id %>', '<%= member.id %>')">加入分班</a>
|
||||
<a href="javascript:void(0);" class="span5 delete" onclick="student_choose_group('<%= @course.id %>', '<%= member.id %>')">加入分班</a>
|
||||
<% end %>
|
||||
<% else %>
|
||||
--
|
||||
<% end %>
|
||||
</span>
|
||||
</li>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</ul>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
|
||||
<div class="fr pages_right_min mt10">
|
||||
<div class="fr pages_right_min mt10 mb10">
|
||||
<ul>
|
||||
<%= pagination_links_full @member_pages, @member_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -35,27 +35,33 @@
|
|||
<div class="person">
|
||||
<!-------------教师----------------->
|
||||
<div class="teacher">
|
||||
<p>
|
||||
<span class="span1" style="text-indent:10px;">序号</span>
|
||||
<span class="pl20">姓名</span>
|
||||
<span>用户ID</span>
|
||||
<span class="span5 mr20">角色</span>
|
||||
</p>
|
||||
<ul class="pl20 pr20 color-grey">
|
||||
<% @members.each_with_index do |member, index| %>
|
||||
<% user = member.user %>
|
||||
<li class="clearfix" id="setting_member_<%= member.id %>">
|
||||
<span class="span1"><%= index + 1 + (@page-1) * 20 %></span>
|
||||
<%= link_to user.show_real_name, user_path(user), :class => '', :target => '_blank' %>
|
||||
<span><%= user.login %></span>
|
||||
<span><%= zh_course_role(h member.roles.where("name != 'Student'").first.name) %></span>
|
||||
</li>
|
||||
<table class="edu-pop-table color-grey edu-txt-center table-pa5" style="border:none;" cellspacing="0" cellpadding="0" >
|
||||
<thead>
|
||||
<tr>
|
||||
<th>序号</th>
|
||||
<th>姓名</th>
|
||||
<th>用户ID</th>
|
||||
<th>角色</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @members.each_with_index do |teacher, index| %>
|
||||
<% user = teacher.user %>
|
||||
<tr id="setting_member_<%= teacher.id %>">
|
||||
<td><%= index + 1 + (@page-1) * 20 %></td>
|
||||
<td>
|
||||
<%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %>
|
||||
</td>
|
||||
<td><span class="edu-txt-w140 task-hide mt5"><%= user.try(:login) %></span></td>
|
||||
<td><%= zh_course_role(h teacher.roles.where("name != 'Student'").first.name) %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</ul>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
|
||||
<div class="fr pages_right_min mt10">
|
||||
<div class="fr pages_right_min mt10 mb10">
|
||||
<ul>
|
||||
<%= pagination_links_full @member_pages, @member_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<div class="input-holder">
|
||||
<input type="hidden" name="select" id="input_select_val" value="<%= @select %>">
|
||||
<input type="hidden" name="is_end" id="input_select_text" value="<%= @is_end %>">
|
||||
<input type="text" class="search-input" name="search" placeholder="输入课程关键字进行搜索" />
|
||||
<input type="text" class="search-input" name="search" placeholder="输入课堂名称的关键字进行搜索" />
|
||||
<button class="search-icon" onclick="searchToggle(this, event);"><i class="fa fa-search font-16 mt5"></i></button>
|
||||
</div>
|
||||
<span class="close" onclick="searchToggle(this, event);"><i class="fa fa-times font-16 mt5"></i></span>
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="fr pages_right_min mt10">
|
||||
<div class="fr pages_right_min mt10 mb10">
|
||||
<ul>
|
||||
<%= pagination_links_full @member_pages, @member_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
</li>
|
||||
<% end %>
|
||||
<div class="fr mt5 -horizontal">
|
||||
<% if @path == @game.challenge.path.strip %>
|
||||
<% if @path == @game.challenge.path.try(:strip) %>
|
||||
<a href="javascript:void(0);" onclick="delete_confirm_box('<%= reset_original_code_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => @path) %>', '你在本文件中修改的内容将丢失<br />是否确定重新加载初始代码');" title="恢复初始代码"><i class="fa fa-rotate-left font-18 mr5"></i></a>
|
||||
<% end %>
|
||||
<a href="javascript:void(0);" onclick="repository_extend_and_zoom();" id="extend_and_zoom"><i class="fa fa-arrows-alt font-16"></i></a>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
</head>
|
||||
<!--add by huang-->
|
||||
<body onload="prettyPrint();">
|
||||
<div class="newContainer"> <!-- 页面全部内容 -->
|
||||
<div class="newContainer edu-bg"> <!-- 页面全部内容 -->
|
||||
<div class="newHeader"> <!-- 头部 -->
|
||||
<%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,10 +8,16 @@
|
|||
</li>
|
||||
</div>
|
||||
<div class="stage-entry clearfix">
|
||||
<li class="fl mr10"><label class="stage-name-label"><span class="color-orange mr5">*</span>名称:</label></li>
|
||||
<li class="fl" style="width: 90%;">
|
||||
<input class="panel-form-width-100 panel-form-height-30 panel-box-sizing box-border stage-name" value="<%= @stage.name %>" name="stage_name" style="background: none;" maxlength="100" placeholder="请输入阶段名称,最多100个字符,如基础知识、第1章等" size="100" type="text">
|
||||
<p class="color-red" style="height: 25px;"><span id="stage_name_notice" style="display: none;"><i class="fa fa-exclamation-circle color-red mr5"></i>阶段名称不能为空</span></p>
|
||||
<li class="clearfix ml10 mr10">
|
||||
<label class="fl"><span class="color-orange mr5">*</span>名称:</label>
|
||||
<input class="stage-name fl" value="<%= @stage.name %>" name="stage_name" style="background: none;" maxlength="100" placeholder="请输入阶段名称,最多100个字符,如基础知识、第1章等" size="100" type="text">
|
||||
<p class="color-red clearfix" style="height: 20px;width: 90%;margin-left: 55px"><span id="stage_name_notice" style="display: none;"><i class="fa fa-exclamation-circle color-red mr5"></i>阶段名称不能为空</span></p>
|
||||
</li>
|
||||
<li class="clearfix ml10 mb15">
|
||||
<label class="fl"> 描述:</label>
|
||||
<textarea name="stage_des" placeholder="请输入阶段描述，最多200个字符" class="bewrite task-height-100"><%= @stage.description %></textarea>
|
||||
</li>
|
||||
<li class="clearfix" style="width: 90%;padding-left: 65px">
|
||||
<%= link_to '+选择实训', choose_subject_shixun_subject_path(@subject), :remote => true, :class => 'add-sx' %>
|
||||
<p class="color-orange" style="height: 25px;">
|
||||
<span id="sx_none_notice" class="fl none">至少选择一个实训</span>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@
|
|||
<p class="task-popup-text-center font-16">
|
||||
<% if @status == 0 %>
|
||||
已发布过申请，请等待管理员审核
|
||||
<% else %>
|
||||
<% elsif @status == 1 %>
|
||||
发布申请已提交，请等待管理员的审核<br/>
|
||||
<span class="font-12 color-grey"> • 我们将在1-2个工作日内完成审核</span>
|
||||
<% elsif @status == 2 %>
|
||||
项目实训全部发布后，才能申请发布
|
||||
<% end %>
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link href="../../../public/stylesheets/css/edu-common.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../public/stylesheets/css/edu-public.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../public/stylesheets/css/edu-class.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../public/stylesheets/css/ketang.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../../../public/stylesheets/css/font-awesome.css" rel="stylesheet" type="text/css"/>
|
||||
<title></title>
|
||||
<style>
|
||||
.createmain{min-height: 480px;}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="newContainer">
|
||||
<div class="newMain clearfix">
|
||||
<div class="active-class">
|
||||
<p style="line-height: 42px;">
|
||||
<i class="fa fa-map-marker mr5 color-grey"></i>
|
||||
<a href="/users/kosasa">kosasa</a> > <a href="/courses">实训套件</a>
|
||||
><span>新建</span>
|
||||
</p>
|
||||
<div class="edu-con-top ">
|
||||
<span class="ml15 color-grey font-16">新建实训套件</span>
|
||||
</div>
|
||||
<div class="edu-bg createmain mb20 pt30">
|
||||
<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_course_name" class="task task-height-40 panel-box-sizing task-form-70 fl color-grey ml20" maxlength="100" placeholder="例如：Python程序设计-从入门到精通">
|
||||
</li>
|
||||
<li class="clearfix pt20">
|
||||
<label class="panel-form-label label fl">简介</label>
|
||||
<textarea class="task task-height-220 panel-box-sizing task-form-70 fl color-grey ml20"></textarea>
|
||||
</li>
|
||||
<li class="clearfix pt20">
|
||||
<label class="panel-form-label label fl"> </label>
|
||||
<a href="javascript:void(0);" class="task-btn task-btn-blue fl mr10 ml20">保存</a>
|
||||
<a href="" class="task-btn fl">取消</a>
|
||||
</li>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -7,12 +7,15 @@
|
|||
<%= @subject.user.show_name %>
|
||||
</p>
|
||||
<div class="clearfix">
|
||||
<p class="fl font-24 color_white"><%= @subject.name %></p>
|
||||
<% if @subject.status > 1 %>
|
||||
<ul class="last-all-count fr" style="display: none;">
|
||||
<li><i class="fa fa-tasks mr5 color_white" title="实训"></i><span class="color-orange"><%= @subject.stage_shixuns.count %></span></li>
|
||||
<li><i class="fa fa-users mr5 color_white" title="实训阶段"></i><span class="color-orange"><%= @subject.subject_challenges %></span></li>
|
||||
<li><i class="fa fa-viacoin mr5 color_white" title="实训总积分"></i><span class="color-orange"><%= @subject.subject_score %></span></li>
|
||||
<p class="fl font-24 color_white subject-main-name"><%= @subject.name %></p>
|
||||
<% if User.current.manager_of_subject?(@subject) && @subject.status == 0 %>
|
||||
<i class="fa fa-pencil mt15 ml10 color_white edit_subject_name fl font-18"></i>
|
||||
<% end %>
|
||||
<% if !User.current.manager_of_subject?(@subject) || @subject.status > 1 %>
|
||||
<ul class="last-all-count fr">
|
||||
<li class="fl mr30"><i class="fa fa-tasks color_white" title="实训"></i><span class="ml5 color_white"><%= @subject.stage_shixuns.count %></span></li>
|
||||
<li class="fl mr30"><i class="fa fa-users color_white" title="实训阶段"></i><span class="ml5 color_white"><%= @subject.subject_challenges %></span></li>
|
||||
<li class="fl mr30"><i class="fa fa-viacoin color_white" title="实训总积分"></i><span class="ml5 color_white"><%= @subject.subject_score %></span></li>
|
||||
</ul>
|
||||
<% elsif @subject.status == 0 && @subject.stages.count > 0 && User.current.manager_of_subject?(@subject) %>
|
||||
<%= link_to '申请发布', publish_subject_path(@subject), :class => "course-btn fr", :remote => true %>
|
||||
|
|
@ -21,4 +24,38 @@
|
|||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
//编辑套件名称
|
||||
$(".edit_subject_name").on("click",function(){
|
||||
$(".subject-main-name").attr("contenteditable","true");
|
||||
$(".subject-main-name").focus();
|
||||
getC($(".subject-main-name"));
|
||||
});
|
||||
$(".subject-main-name").on("keydown",function(ev){
|
||||
if(ev.keyCode==13 || ev.keyCode==108){
|
||||
$(".subject-main-name").attr("contenteditable","false");
|
||||
}
|
||||
});
|
||||
$(".subject-main-name").on("blur",function(){
|
||||
$(".subject-main-name").attr("contenteditable","false");
|
||||
$.post(
|
||||
'<%= update_attr_subject_path(@subject) %>',
|
||||
{ name: $(".subject-main-name").html().trim() },
|
||||
function (data) {
|
||||
}
|
||||
);
|
||||
})
|
||||
|
||||
function getC(that){
|
||||
if(document.all){
|
||||
that.range=document.selection.createRange();
|
||||
that.range.select();
|
||||
that.range.moveStart("character",-1);
|
||||
}else{
|
||||
that.range=window.getSelection().getRangeAt(0);
|
||||
that.range.setStart(that.range.startContainer,that.html().length);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<div class="task-index-head mt20 mb20">
|
||||
<div class="header-color">
|
||||
<h2 class="fl task-inde-head-title">实训套件</h2>
|
||||
<%= link_to "<span class='font-22'>+</span> 创建套件".html_safe, new_subject_subjects_path, :remote => true, :class => "fr color_white font-20" %>
|
||||
<%= link_to "<span class='font-22'>+</span> 创建套件".html_safe, new_subject_path(), :class => "fr color_white font-20" %>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
<ul class="task-index-head-info clearfix">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
<div class="active-class ">
|
||||
<p style="line-height: 42px;">
|
||||
<i class="fa fa-map-marker mr5 color-grey"></i>
|
||||
<%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to "实训套件", subjects_path() %>
|
||||
> <span>新建</span>
|
||||
</p>
|
||||
<div class="edu-con-top user_bg_shadow">
|
||||
<span class="ml15 color-grey font-16">新建实训套件</span>
|
||||
</div>
|
||||
<div class="edu-bg createmain mb20 pt30 user_bg_shadow">
|
||||
<%= 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程序设计-从入门到精通">
|
||||
<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">简介</label>
|
||||
<textarea name="subject[description]" class="task task-height-220 panel-box-sizing task-form-70 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" %>
|
||||
<a href="javascript:void(0);" onclick="submit_new_subject();" class="task-btn task-btn-blue fl">保存</a>
|
||||
</li>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,2 +1,7 @@
|
|||
var htmlvalue = "<%= escape_javascript(render :partial => 'subjects/publish_notice')%>";
|
||||
pop_box_new(htmlvalue,563,406);
|
||||
pop_box_new(htmlvalue,563,406);
|
||||
<% if @status == 2 %>
|
||||
<% Shixun.where(:id => @subject.stage_shixuns.map(&:shixun_id), :status => [0, 1]).each do |shixun| %>
|
||||
$("#stage_shixun_<%= shixun.id %>").find(".fa-exclamation-circle").parent().show();
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
|
@ -1,43 +1,102 @@
|
|||
<div class="lesson-saved-list">
|
||||
<!--简介-->
|
||||
<% if !@subject.description.blank? || (User.current.manager_of_subject?(@subject) && @subject.status == 0) %>
|
||||
<div class="mb20 produce-content">
|
||||
<p class="clearfix">
|
||||
<span class="fl font-bd font-18">简介</span>
|
||||
<% if User.current.manager_of_subject?(@subject) && @subject.status == 0 %>
|
||||
<i class="fa fa-pencil fr mt10 mr5 color-grey edit-produce"></i>
|
||||
<% end %>
|
||||
</p>
|
||||
<p style="line-height: 1.5;" class="subject-produce <%= @subject.description.blank? ? 'color-light-grey' : '' %>" id="subject-produce"><%= @subject.description.blank? ? "暂未填写" : @subject.description %></p>
|
||||
</div>
|
||||
<% end %>
|
||||
<script>
|
||||
//编辑套件简介
|
||||
$(".edit-produce").on("click",function(){
|
||||
$(".subject-produce").attr("contenteditable","true");
|
||||
if($(".subject-produce").hasClass("color-light-grey")){
|
||||
$(".subject-produce").html("");
|
||||
};
|
||||
$("#subject-produce").focus();
|
||||
getC($("#subject-produce"));
|
||||
});
|
||||
$(".subject-produce").on("keydown",function(ev){
|
||||
if(ev.keyCode==13 || ev.keyCode==108){
|
||||
$(".subject-preduce").attr("contenteditable","false");
|
||||
}
|
||||
});
|
||||
$(".subject-produce").on("blur",function(){
|
||||
$(".subject-produce").attr("contenteditable","false");
|
||||
$.post(
|
||||
'<%= update_attr_subject_path(@subject) %>',
|
||||
{ description: $("#subject-produce").html().trim() },
|
||||
function (data) {
|
||||
}
|
||||
);
|
||||
if($("#subject-produce").html().trim() == ""){
|
||||
$("#subject-produce").html("暂未填写").addClass("color-light-grey");
|
||||
} else{
|
||||
$("#subject-produce").removeClass("color-light-grey");
|
||||
}
|
||||
})
|
||||
function getC(that){
|
||||
if(document.all){
|
||||
that.range=document.selection.createRange();
|
||||
that.range.select();
|
||||
that.range.moveStart("character",-1);
|
||||
}else{
|
||||
that.range=window.getSelection().getRangeAt(0);
|
||||
that.range.setStart(that.range.startContainer,that.html().length);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<!--新版阶段列表-->
|
||||
<div class="lesson-saved-list mb20">
|
||||
<% @stages.each do |stage| %>
|
||||
<div class="lesson-saved-list-stage" id="stage_div_<%= stage.id %>">
|
||||
<div class="saved-title clearfix">
|
||||
<li class="fl"><i class="fa fa-dot-circle-o color-orange mr5 font-16"></i><span class="font-16 font-bd"><%= stage.name %></span></li>
|
||||
<% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %>
|
||||
<li class="fr">
|
||||
<a class="task-btn color_white bc-grey del-editstage" onclick="delete_confirm_box_2('<%= stage_path(stage) %>', '确定要删除该阶段吗？');">删除</a>
|
||||
<a class="course-bth-blue color_white" onclick="edit_stage(<%= stage.id %>)">编辑</a>
|
||||
</li>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="task-index-list clearfix mb20">
|
||||
<% stage.stage_shixuns.each_with_index do |stage_shixun, index| %>
|
||||
<% shixun = stage_shixun.shixun %>
|
||||
<div class="task-index-list-box-all fl pr">
|
||||
<div class="task-array"><%= index + 1 %></div>
|
||||
<div class="task-index-list-box-top xy_box" style="cursor: pointer;" onclick="shixun_link('<%= shixun.identifier %>')">
|
||||
<p class="task-index-list-title two_lines_show">
|
||||
<a href="javascript:void(0);"><%= shixun.name %></a>
|
||||
</p>
|
||||
<div class=" clearfix task-index-list-user task_yx_bo">
|
||||
<a href="javascript:void(0);"><%= image_tag(url_to_avatar(shixun.owner), :width =>"60", :height => "60", :class => "panel-warp-img mr10 fl", :alt=>"头像") %></a>
|
||||
<span class="task-index-name task-hide fl"><%= shixun.owner.try(:show_name) %></span>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
<span class="mt10 mb10"><%= shixun.language %></span>
|
||||
<p class="xy_level"><%= shixun.shixun_trainee %></p>
|
||||
<div class="lesson-saved-list-item user_bg_shadow pt10 pb10 mb20" id="stage_div_<%= stage.id %>">
|
||||
<p class="clearfix">
|
||||
<i class="font-20 fa fa-dot-circle-o ml15 mr15 color-orange"></i>
|
||||
<span class="font-16 font-bd"><%= stage.name %></span>
|
||||
<% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %>
|
||||
<a href="javascript:void(0);" onclick="edit_stage(<%= stage.id %>)"><i class="fa fa-pencil fr mt10 mr10 color-grey delete"></i></a>
|
||||
<a href="javascript:void(0);" onclick="delete_confirm_box_2('<%= stage_path(stage) %>', '确定要删除该阶段吗？');"><i class="fa fa-trash fr mt10 mr10 color-grey edit"></i></a>
|
||||
<% end %>
|
||||
</p>
|
||||
<p class="ml50 color-grey pr20"><%= stage.description %></p>
|
||||
<% stage.stage_shixuns.each_with_index do |stage_shixun, index| %>
|
||||
<% shixun = stage_shixun.shixun %>
|
||||
<div class="clearfix pt5 pb5 stage-info-line" id="stage_shixun_<%= shixun.id %>" style="cursor: pointer;" onclick="shixun_link('<%= shixun.identifier %>')">
|
||||
<li class="fl li-width50">
|
||||
<i class="fa fa-gamepad color-light-green mr20 font-20"></i>
|
||||
<span class="font-bd color-dark-grey"><%= shixun.name %></span>
|
||||
</li>
|
||||
<li class="fl li-width10">
|
||||
<i class="fa fa-tasks color-light-green font-16 mr5"></i>
|
||||
<span class="color-dark-grey"><%= shixun.challenges.count %></span>
|
||||
</li>
|
||||
<li class="fl li-width20 color-light-green">
|
||||
<span class="mr5"><%= shixun.shixun_score %></span>经验值</li>
|
||||
<li class="fl li-width20">
|
||||
<% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %>
|
||||
<span class="fl <%= shixun.shixun_status == '编辑中' ? 'color-grey' : (shixun.shixun_status == '审核中' ? 'color-orange' : (shixun.shixun_status == '已发布' ? 'color-light-green' : 'color-light-grey')) %>"><%= shixun.shixun_status %></span>
|
||||
<span class="fl none ml10"><i class="fa fa-exclamation-circle color-red ml5 mr5"></i></span>
|
||||
<% else %>
|
||||
<% case my_shixun_status(shixun, User.current) %>
|
||||
<% when '已通关' %>
|
||||
<i class="fa fa-check-circle color-light-green font-18 mr5" title="已通关"></i>
|
||||
<% when '未通关' %>
|
||||
<i class="fa fa-pause-circle color-orange font-18 mr5" title="未通关"></i>
|
||||
<% when '未开启' %>
|
||||
<i class="fa fa-play-circle color-grey font-18 mr5" title="未开启"></i>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</li>
|
||||
</div>
|
||||
<ul class="task-index-list-box-bottom clearfix">
|
||||
<li><i class="fa fa-tasks 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>
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %>
|
||||
<div class="lesson-edit-content mb20">
|
||||
<% if @stages.count == 0 %>
|
||||
|
|
@ -51,10 +110,16 @@
|
|||
</li>
|
||||
</div>
|
||||
<div class="stage-entry clearfix">
|
||||
<li class="fl mr10"><label class="stage-name-label"><span class="color-orange mr5">*</span>名称:</label></li>
|
||||
<li class="fl" style="width: 90%;">
|
||||
<input class="panel-form-width-100 panel-form-height-30 panel-box-sizing box-border stage-name" name="stage_name" style="background: none;" maxlength="100" placeholder="请输入阶段名称,最多100个字符,如基础知识、第1章等" size="100" type="text">
|
||||
<p class="color-red" style="height: 25px;"><span id="stage_name_notice" style="display: none;"><i class="fa fa-exclamation-circle color-red mr5"></i>阶段名称不能为空</span></p>
|
||||
<li class="clearfix ml10 mr10">
|
||||
<label class="fl"><span class="color-orange mr5">*</span>名称:</label>
|
||||
<input class="stage-name fl" name="stage_name" style="background: none;" maxlength="100" placeholder="请输入阶段名称,最多100个字符,如基础知识、第1章等" size="100" type="text">
|
||||
<p class="color-red clearfix" style="height: 20px;width: 90%;margin-left: 55px"><span id="stage_name_notice" style="display: none;"><i class="fa fa-exclamation-circle color-red mr5"></i>阶段名称不能为空</span></p>
|
||||
</li>
|
||||
<li class="clearfix ml10 mb15">
|
||||
<label class="fl"> 描述:</label>
|
||||
<textarea name="stage_des" placeholder="请输入阶段描述，最多200个字符" class="bewrite task-height-100"></textarea>
|
||||
</li>
|
||||
<li class="clearfix" style="width: 90%;padding-left: 65px">
|
||||
<%= link_to '+选择实训', choose_subject_shixun_subject_path(@subject), :remote => true, :class => 'add-sx' %>
|
||||
<p class="color-orange" style="height: 25px;">
|
||||
<span id="sx_none_notice" class="fl none">至少选择一个实训</span>
|
||||
|
|
@ -122,13 +187,21 @@
|
|||
edithtml+="<a class=\"course-bth-blue\" onclick=\"saveeidtsatge();\">保存</a>";
|
||||
edithtml+="</li></div>";
|
||||
edithtml+="<div class=\"stage-entry clearfix\">";
|
||||
edithtml+="<li class=\"fl mr10\"><label class=\"stage-name-label\"><span class=\"color-orange mr5\">*</span>名称:</label></li>";
|
||||
edithtml+="<li class=\"fl\" style=\"width: 90%;\">";
|
||||
edithtml+="<input class=\"panel-form-width-100 panel-form-height-30 panel-box-sizing box-border stage-name\" name=\"stage_name\" style=\"background: none;\" maxlength=\"100\" placeholder=\"请输入阶段名称,最多100个字符,如基础知识、第1章等\" size=\"100\" type=\"text\">";
|
||||
edithtml+="<p class=\"color-red\" style=\"height: 25px;\"><span id=\"stage_name_notice\" class=\"stage_name_notice\" style=\"display: none;\"><i class=\"fa fa-exclamation-circle color-red mr5\"></i>阶段名称不能为空</span></p>";
|
||||
edithtml+="<li class=\"clearfix ml10 mr10\">";
|
||||
edithtml+="<label class=\"fl\"><span class=\"color-orange mr5\">*</span>名称:</label>";
|
||||
edithtml+="<input class=\"stage-name fl\" name=\"stage_name\" style=\"background: none;\" maxlength=\"100\" placeholder=\"请输入阶段名称,最多100个字符,如基础知识、第1章等\" size=\"100\" type=\"text\">";
|
||||
edithtml+="<p class=\"color-red clearfix\" style=\"height: 20px;width: 90%;margin-left: 55px\"><span id=\"stage_name_notice\" style=\"display: none;\"><i class=\"fa fa-exclamation-circle color-red mr5\"></i>阶段名称不能为空</span></p>";
|
||||
edithtml+="</li>";
|
||||
edithtml+="<li class=\"clearfix ml10 mb15\">";
|
||||
edithtml+="<label class=\"fl\"> 描述:</label>";
|
||||
edithtml+="<textarea placeholder=\"请输入阶段描述，最多200个字符\" name=\"stage_des\" class=\"bewrite task-height-100\"></textarea></li>";
|
||||
edithtml+="<li class=\"clearfix\" style=\"width: 90%;padding-left: 65px\">";
|
||||
edithtml+='<%= link_to '+选择实训', choose_subject_shixun_subject_path(@subject), :remote => true, :class => 'add-sx' %>';
|
||||
edithtml+="<p class=\"color-orange\" style=\"height: 25px;\"><span id=\"sx_none_notice\" class=\"fl none\">至少选择一个实训</span><span id=\"sx_notice\" class=\"fr\">选择实训后，在页面上通过拖拽进行排序调整</span></p>";
|
||||
edithtml+="<p class=\"color-orange\" style=\"height: 25px;\">";
|
||||
edithtml+="<span id=\"sx_none_notice\" class=\"fl none\">至少选择一个实训</span>";
|
||||
edithtml+="<span id=\"sx_notice\" class=\"fr\">选择实训后，在页面上通过拖拽进行排序调整</span></p>";
|
||||
edithtml+="</li></div>";
|
||||
|
||||
edithtml+="<div class=\"adding-stage-item clearfix\" id=\"sortable\">";
|
||||
edithtml+="</div></div>";
|
||||
edithtml+="<% end %>";
|
||||
|
|
@ -160,12 +233,12 @@
|
|||
} else{
|
||||
$("#stage_name_notice").hide();
|
||||
}
|
||||
if($("input[name='shixun_id[]']").length == 0){
|
||||
status = false;
|
||||
$("#sx_none_notice").show();
|
||||
} else{
|
||||
$("#sx_none_notice").hide();
|
||||
}
|
||||
// if($("input[name='shixun_id[]']").length == 0){
|
||||
// status = false;
|
||||
// $("#sx_none_notice").show();
|
||||
// } else{
|
||||
// $("#sx_none_notice").hide();
|
||||
// }
|
||||
if(status && flag){
|
||||
flag = false;
|
||||
$("#new_stage_form").submit();
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ RedmineApp::Application.routes.draw do
|
|||
get 'choose_subject_shixun'
|
||||
get 'publish'
|
||||
get 'cancel_publish'
|
||||
post 'update_attr'
|
||||
end
|
||||
|
||||
collection do
|
||||
|
|
|
|||
|
|
@ -991,4 +991,13 @@ function destroy_all_hb(url){
|
|||
}else{
|
||||
$("#choose_homework_bank_to_send_notice_h").html("请先选择题目").show();
|
||||
}
|
||||
}
|
||||
|
||||
function submit_new_subject(){
|
||||
if($("#new_subject_name").val().trim() == ""){
|
||||
$("#new_subject_name_notice").show();
|
||||
} else{
|
||||
$("#new_subject_name_notice").hide();
|
||||
$("#new_subject").submit();
|
||||
}
|
||||
}
|
||||
|
|
@ -279,8 +279,6 @@ em{font-style:normal;}
|
|||
.stud-class-set .people .right .person {background:#fff;min-height:600px;}
|
||||
.stud-class-set .people .right .person .teacher ul li{width:100%;height:50px;line-height:50px;border-bottom:1px dashed #ddd;}
|
||||
.stud-class-set .people .right .person .teacher p{width:100%;height:50px;line-height:50px;border-bottom:1px dashed #ddd;}
|
||||
.stud-class-set .people .right .person .teacher span{width:120px;display:inline-block;text-align:center;padding-right:91px;}
|
||||
.stud-class-set .people .right .person .teacher a{width:120px;display:inline-block;text-align:center;padding-right:91px;}
|
||||
.stud-class-set .people .right .person .teacher .span1{text-align:left;padding:0;}
|
||||
.stud-class-set .people .right .person .teacher .span5{padding:0;}
|
||||
.stud-class-set .people .right .person .student{min-height:600px;}
|
||||
|
|
|
|||
|
|
@ -219,6 +219,7 @@ input.task-form-80,textarea.task-form-80,select.task-form-80,.task-form-80{paddi
|
|||
input.task-form-90,textarea.task-form-90,select.task-form-90,.task-form-90{padding:5px;width:90%;}
|
||||
input.task-form-100,textarea.task-form-100,select.task-form-100,.task-form-100{padding:5px;width:100%;}
|
||||
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;}
|
||||
|
||||
|
|
@ -285,10 +286,10 @@ a:hover.task-btn-line{ border:1px solid #3498db;background:#3498db;color: #fff;}
|
|||
/*input框移出后没有内容将边框阴影变为红色*/
|
||||
.notinput_bg_shadow{border: none;box-shadow: 0px 0px 4px rgba(227,53,37,1);}
|
||||
/*设置input框的placehoder的字体颜色*/
|
||||
input::-webkit-input-placeholder{color: #c4c4c4}
|
||||
input::-moz-placeholder { color:#c4c4c4;}
|
||||
input::-moz-placeholder { color:#c4c4c4;}
|
||||
input::-ms-input-placeholder {color:#c4c4c4;}
|
||||
input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color: #c4c4c4}
|
||||
input::-moz-placeholder,textarea::-moz-placeholder { color:#c4c4c4;}
|
||||
input::-moz-placeholder,textarea::-moz-placeholder { color:#c4c4c4;}
|
||||
input::-ms-input-placeholder,textarea::-ms-input-placeholder {color:#c4c4c4;}
|
||||
/*班级讨论区置顶的样式*/
|
||||
.btn-cir-red {background: red; color: #fff; font-weight: normal;}
|
||||
.btn-cir {display: inline-block;padding: 0px 5px;border-radius: 25px;border-radius: 15px;line-height: 20px;font-size: 12px;}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,20 @@
|
|||
.bot_li{text-align: center;}
|
||||
.bot_li li{float: left;margin:9px 4px 0px 4px;}
|
||||
.bot_li li span{display: inline-block;float: left; border: 2px solid #e8e8e8;color: #888;border-radius: 50%;text-align: center;line-height:28px;width: 28px;height: 28px;font-size: 13px}
|
||||
|
||||
|
||||
/*-----------新版新建实训------------*/
|
||||
.produce-content:hover i{color:#29bd8b!important;}
|
||||
.subject-main-name{outline: none}
|
||||
.subject-produce{outline: none;}
|
||||
.stage-info-line{padding-left: 50px}
|
||||
.stage-info-line:hover{background-color:rgba(142,212,254,0.3)}
|
||||
.lesson-saved-list-item:hover{box-shadow: 0 0 8px 0 rgba(0,0,0,.2);}
|
||||
.lesson-saved-list-item:hover .edit{color:#29bd8b!important;}
|
||||
.lesson-saved-list-item:hover .delete{color:#29bd8b!important;}
|
||||
li.li-width50{width: 50%;text-align: left}
|
||||
li.li-width20{width: 20%;text-align: left}
|
||||
li.li-width10{width: 10%;text-align: left}
|
||||
/*------课程实训首页---------*/
|
||||
|
||||
.course_tip_box{width: 460px;padding: 10px;background-color: #FFFFFF;}
|
||||
|
|
@ -37,9 +51,10 @@
|
|||
.stage-item{border:1px solid #d1d5da;}
|
||||
.stage{padding: 7px 10px;border-bottom:1px solid #d1d5da;}
|
||||
.stage-entry{padding: 10px 10px;}
|
||||
.stage-name{width: 100%;}
|
||||
.stage-name{width: 91%;padding: 5px;margin-left: 10px;border-color:#eeeeee}
|
||||
.stage-name-label{width: 10%;text-align: center;line-height: 40px;}
|
||||
.add-sx{padding:0px 5px;width: 99%;height: 40px;line-height: 40px;border: 1px dashed #ffbfaa;display: inline-block;color: #cccccc;}
|
||||
.bewrite{width: 90%;margin-left: 10px;border-color: #eeeeee;padding: 5px;}
|
||||
|
||||
.box-border{border:1px solid #e1e1e1}
|
||||
.boxborder-dashed-orange{border: 1px dashed #ffbfaa;}
|
||||
|
|
@ -55,8 +70,7 @@
|
|||
|
||||
|
||||
.allback{background-color:#FFFFFF}
|
||||
.last-all-count{width: 20%;text-align: right;}
|
||||
.last-all-count li{float: left;width: 33.3%;}
|
||||
.last-all-count{text-align: right;}
|
||||
|
||||
.course-option{width: 570px;padding: 10px;background-color: #FFFFFF;}
|
||||
.magic-radio + label:before, .magic-checkbox + label:before{top: 11px;left: 5px;}
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
.-task-con-int .passageway .hascon .expand{display:block;;height:70px;line-height:70px;text-align:center;color:#5faee3;}
|
||||
.-task-con-int .passageway .hascon .expand:hover{ color:#5faee3;}
|
||||
.bg_shadow{-webkit-box-shadow: 0 0 10px #ccc;-moz-box-shadow: 0 0 10px #ccc;box-shadow: 0 0 10px #ccc;}
|
||||
.new_expand{display:block;;height:70px;line-height:70px;text-align:center;color:#5faee3; background: #fafbfb}
|
||||
.new_expand{display:block;;height:70px;line-height:70px;text-align:center;color:#5faee3; background: #FFFFFF}
|
||||
.new_expand:hover{ color:#5faee3;}
|
||||
/*--------------------------------------箭头动画效果-----------------------------------*/
|
||||
.-task-con-int .passageway .hint .zhuan{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ html,body{ font-size:14px; line-height:2.0; height:100%;}
|
|||
a.user-info-img{ display: block; width: 50px; height: 50px; margin:0 auto; }
|
||||
a.user-info-img img{border-radius:100px;border:2px solid #666;}
|
||||
a.user-info-img img:hover{border:2px solid #888;}
|
||||
a.user-info-name{ display: block; font-size: 16px; color: #fff; max-width:100px; margin: 10px auto; text-align: center;}
|
||||
a.user-info-name{ display: block; font-size: 16px; color: #fff; max-width:100px; margin: 10px auto; text-align: center; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
|
||||
.leftnav-box{ width: 80px; height: 60px; background:#292b3a; padding:10px 0; margin-bottom:2px;}
|
||||
a.leftnav-box-inner{ display: block; width:77px; border-left:3px solid #292b3a; background:#292b3a; text-align: center; padding:10px 0; color:#575f6c;}
|
||||
a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #3498db;color: #fff!important;}
|
||||
|
|
@ -98,6 +98,7 @@ input.panel-form-width-100{ padding:5px;width:100%; height:40px; min-width:700px
|
|||
textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; min-width:700px;}
|
||||
textarea.panel-form-width-40{ padding:5px;width:100%; height: 40px; min-width:700px;}
|
||||
textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; min-width:700px;}
|
||||
textarea.panel-form-width2-690{ padding:5px;width:90%; height:40px; min-width:700px;}
|
||||
.panel-form-width-670{ width: 670px; padding:5px;}
|
||||
.panel-form-height-150{ height: 150px;}
|
||||
.panel-form-height-30{height: 30px;}
|
||||
|
|
@ -333,3 +334,12 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
|
|||
.comment-input{width: 90%;padding: 0px 10px;}
|
||||
.comment-input textarea{border: none !important;width:86%; outline: none;height: 30px;border-radius: 4px;margin-right: 10px;padding-left: 5px;float:left}
|
||||
.comment_position{ position: absolute;bottom: 8px;}
|
||||
|
||||
/*-------新建阶段添加选项部分----------*/
|
||||
.option-item{border:1px solid #e2e2e2;}
|
||||
.add-option-item{border:1px dashed #e2e2e2;}
|
||||
.option-item,.add-option-item{display: block;width: 38px;height: 38px;text-align: center;line-height: 38px;border-radius: 4px}
|
||||
.check-option-bg{background: #ee4a1f;color: #ffffff!important;border: 1px solid #ee4a1f}
|
||||
.add-option-input{padding: 5px;width: 90%;height: 40px;min-width: 700px;border: 1px dashed #e2e2e2;}
|
||||
.add-option-input a{display: block;width: 100%;height: 100%;cursor: pointer}
|
||||
.position-delete{position: absolute;right: -17px;top: 12px;cursor: pointer}
|
||||
|
|
|
|||
Loading…
Reference in New Issue