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

Merge branch 'develop' into dev_cs

This commit is contained in:
caishi 2017-09-22 21:02:00 +08:00
parent 85071cb1ae 23de636623
commit ee237d08eb
94 changed files with 2175 additions and 1193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/account_controller.rb
View File

@ -455,7 +455,7 @@ class AccountController < ApplicationController
end
def avatar
@user = User.current
@user = params[:user_id].nil? ? User.current : User.find(params[:user_id])
@setting_type = 2
render :layout => 'base_edu_account'
end

5
app/controllers/courses_controller.rb
View File

@ -36,7 +36,7 @@ class CoursesController < ApplicationController
before_filter :require_login, :only => [:join, :unjoin]
#before_filter :allow_join, :only => [:join]
require 'bundler/setup'
#require 'simple_xlsx_reader'
require 'simple_xlsx_reader'
# params[:search] 搜索课程的名称
# params[:select] "join" "create" "all" 参与的 创建的 所有的课程
@ -1682,10 +1682,9 @@ class CoursesController < ApplicationController
@course_id = @course.id
syllabus = @course.syllabus
@course.delete!
@course = nil
respond_to do |format|
format.js
format.html{redirect_to syllabuses_path()}
format.html{redirect_to courses_path()}
end
# redirect_to :back

1
app/controllers/discusses_controller.rb
View File

@ -22,6 +22,7 @@ class DiscussesController < ApplicationController
@shixun = @discuss.dis
end
@discuss.destroy
@game_challenge = Challenge.find(params[:challenge_id])
end
end

2
app/controllers/homework_common_controller.rb
View File

@ -251,7 +251,7 @@ class HomeworkCommonController < ApplicationController
@homework_detail_programing.ta_proportion = 0 if @homework_detail_programing
end
if @homework_detail_manual.comment_status < 4
if params[:homework_anonymous_comment] && params[:homework_anonymous_appeal]
if @homework.anonymous_comment == 0 && params[:homework_anonymous_appeal]
@homework.anonymous_appeal = 1
@homework_detail_manual.appeal_time = params[:homework_appeal_time] if params[:homework_appeal_time]
@homework_detail_manual.appeal_penalty = params[:homework_appeal_penalty] if params[:homework_appeal_penalty]

217
app/controllers/managements_controller.rb
View File

@ -151,11 +151,41 @@ class ManagementsController < ApplicationController
def update_user
@menu_type = 7
@sub_type = 1
respond_to do |format|
format.js
format.html
# @next_type = 1
if params[:flag]
applied_message = AppliedMessage.where(:id => params[:applied_message_id]).first
applied_message.update_attribute(:viewed, true)
end
@user = User.find(params[:user])
# 创建实训
@create_num = (@user == User.current ? Shixun.where(:user_id => @user).count : Shixun.where(:user_id => @user).visible.count)
# 创建课堂
@create_courses_count = @user.courses.not_deleted_not_end.select{ |course| @user.has_teacher_role(course)}.count
# 我的所有课程数
@all_courses_count = @user.courses.not_deleted_not_end.count
# 参与课堂
@join_courses_count = @all_courses_count - @create_courses_count
# 我合作的实训数
coop_id = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id} and role = 2").map(&:shixun_id) # 合作者的实训id
@cooperative_num = Shixun.where(:id => coop_id).count
# 我挑战的实训数
ch_id = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})")
@challenge_num = Shixun.where(:id => ch_id).count
#参与实训
@join_shixuns = @cooperative_num + @challenge_num
# 我的关注
watch_query = User.watched_by(@user.id)
@user_watchlist_count = watch_query.count()
# 我的粉丝
fan_query = @user.watcher_users
@user_fanlist_count = fan_query.count()
end
#用户信息修改
def update_user_message
end
# 实训留言
def shixun_feedback
@menu_type = 9
@ -174,6 +204,58 @@ class ManagementsController < ApplicationController
end
end
# 实训反馈
def shixun_feedback_message
@menu_type = 8
@sub_type = 2
@discusses = Discuss.where(:dis_type => "Shixun").reorder("created_at desc")
@discusses_count = @discusses.count
@limit = 20
@is_remote = true
@page = (params['page'] || 1).to_i
@discusses_pages = Paginator.new @discusses_count, @limit, @page
@offset ||= @discusses_pages.offset
@discusses = paginateHelper @discusses, @limit
respond_to do |format|
format.js
format.html
end
end
# 作业回复
def leave_message
@menu_type = 8
@sub_type = 1
@jour = JournalsForMessage.where(:jour_type => 'HomeworkCommon').order("created_on desc")
@jour_count = @jour.count
limit = 20
@is_remote = true
@jour_pages = Paginator.new @jour_count, limit, params['page'] || 1
@offset ||= @jour_pages.offset
@jour = paginateHelper @jour, limit
respond_to do |format|
format.html
format.js
end
end
# 课堂讨论区
def messages_list
@menu_type = 8
@sub_type = 3
@memo = Memo.where("0=0").order("created_at desc")
@memo_count = @memo.count
limit = 20
@is_remote = true
@memo_pages = Paginator.new @memo_count, limit, params['page'] || 1
@offset ||= @memo_pages.offset
@memo = paginateHelper @memo, limit
respond_to do |format|
format.html
format.js
end
end
# 专业列表
def profession
@major=Major.where("0=0")
@ -301,6 +383,10 @@ end
# 新增
def create_departments
dep = Department.order("created_at desc").first
@latest_school = School.find(dep.try(:school_id)).try(:name)
@school_id = dep.try(:school_id)
respond_to do |format|
format.js
end
@ -678,34 +764,36 @@ end
def classroom_classment
@menu_type = 2
@sub_type = 2
@sx_order = params[:sx_order].blank? ? "desc" : params[:sx_order]
@sx_order = params[:sx_order].blank? ? "desc" : params[:sx_order]
@courses = Course.where(:is_delete => 0)
@timing=Course.where(:is_end=>false).count
@end=Course.where(:is_end=>true).count
@timing = Course.where(:is_end=>false).count
@end = Course.where(:is_end=>true).count
@course_lists = CourseList.where(:id => Course.where(:is_delete => 0 ).map(&:course_list_id) )
unless params[:school_id] || params[:search] || params[:keyword] || params[:status]
user_exs=UserExtensions.where(:school_id=> @courses.map(&:school_id))
@schools = School.where(:id =>user_exs.map(&:school_id))
end
@search = params[:search] # 搜索字
@keyword = params[:keyword].blank? ? "u_name" : params[:keyword] # 根据姓名/课程名搜索
@status = params[:status]
@courselist = params[:course_list]
@school_id = params[:school_id]
status = params[:status].to_i
courselist = params[:course_list]
if params[:school_id] && params[:school_id] != ''
@courses = Course.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("ue.school_id = #{params[:school_id]}")
@school_id = params[:school_id]
@courses = @courses.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("ue.school_id = #{params[:school_id]}")
end
if params[:homepage_show]
@courses = @courses.where(:homepage_show => params[:homepage_show].to_i)
end
if params[:course_list] && params[:course_list] != ''
@courses = @courses.where(:course_list_id => @courselist)
if courselist && courselist != ''
@courses = @courses.where(:course_list_id => courselist)
end
if params[:status] && params[:status]!=''
@courses =@courses.where(:is_end => @status.to_i)
@status = params[:status]
@courses =@courses.where(:is_end =>status)
end
if "u_name" == @keyword
if @search.blank?
@ -718,7 +806,6 @@ end
@courses= @courses.where("name like '%#{@search}%'")
end
@courses = @courses.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").reorder("updatetime #{@sx_order}")
@export_courses = @courses
@courses_count = @courses.count
limit = 20
@is_remote = true
@ -728,11 +815,6 @@ end
respond_to do |format|
format.js
format.html
format.xls{
@export_courses = @export_courses.all
filename = "#{l(:label_course_list_xls)}.xls"
send_data(course_list_xls(@export_courses), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
}
end
end
@ -853,23 +935,25 @@ end
condition = (params[:research_condition].nil? || params[:research_condition] == "name") ? "concat(lastname, firstname)" : params[:research_condition]
if 0 == status
if params[:research_condition] == "phone" && params[:research_contents].blank?
@users = User.order("#{@order_key} #{@us_order}").all
@users = User.order("#{@order_key} #{@us_order}")
else
@users = User.where("#{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all
@users = User.where("#{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}")
end
else
if params[:research_condition] == "phone" && params[:research_contents].blank?
@users = User.where(:status => status).order("#{@order_key} #{@us_order}").all
@users = User.where(:status => status).order("#{@order_key} #{@us_order}")
else
@users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all
@users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}")
end
end
school_name = params[:school]
school = School.where("name like '%#{school_name}%'")
school_id = school.map(&:id)
user_id = UserExtensions.where(:school_id => school_id).map(&:user_id)
@users = User.where(:id => user_id)
if params[:school] && params[:school] != ''
school_name = params[:school]
school = School.where("name like '%#{school_name}%'")
school_id = school.map(&:id)
user_id = UserExtensions.where(:school_id => school_id).map(&:user_id)
@users = @users.where(:id => user_id).order("#{@order_key} #{@us_order}")
end
@users_count = @users.count
@limit = 20
@ -890,6 +974,7 @@ end
keyword = params[:keyword].blank? ? "u_name" : params[:keyword] # 根据姓名/实训名搜索
search = params[:search] # 搜索的字
@sx_order = params[:sx_order].blank? ? "desc" : params[:sx_order] # 排序
if "u_name" == keyword
# 如果用户搜索为空，不用遍历user表，直接查找所有实训, 有搜索时才查找user
if search.blank?
@ -899,7 +984,13 @@ end
@shixuns = Shixun.where(:user_id => user_id, :status => sx_status).order("created_at #{@sx_order}")
end
else
@shixuns = Shixun.where("name like '%#{search}%'").where(:status => sx_status).order("created_at #{@sx_order}")
if params[:keyword] == "sx_name"
@shixuns = Shixun.where("name like '%#{search}%'").where(:status => sx_status).order("created_at #{@sx_order}")
else
school_id = School.where("name like '%#{search}%'").map(&:id)
user_id = UserExtensions.where(:school_id => school_id).map(&:user_id)
@shixuns = Shixun.where(:user_id => user_id).where(:status => sx_status).order("created_at #{@sx_order}")
end
end
@edit_sx_num = Shixun.where(:status => 0).count
@audit_sx_num = Shixun.where(:status => 1).count
@ -1010,6 +1101,23 @@ end
@users = paginateHelper @users, @limit
end
# 自动授权列表
def auto_users_trial
@menu_type = 7
@sub_type = 3
@schools = School.where("0=0")
@schools_count = @schools.count
limit = 20
@is_remote = true
@schools_pages = Paginator.new @schools_count, limit, params['page'] || 1
@offset ||= @schools_pages.offset
@schools = paginateHelper @schools, limit
respond_to do |format|
format.html
format.js
end
end
def search_user
=begin
@ -1201,6 +1309,7 @@ end
# @unapproved_user = ApplyUserAuthentication.where(:status => @type, :user_id => user_id, :auth_type => 1).find_by_sql("SELECT s.*, TIMESTAMPDIFF(SECOND, s.updated_at, now()) diff FROM `apply_user_authentications` s order by diff asc")
@unapproved_user = ApplyUserAuthentication.where(:status => @type, :user_id => user_id, :auth_type => 1).order("updated_at desc")
@unapproved_user_count = @unapproved_user.count
@limit = 15
@is_remote = true
@ -1221,6 +1330,13 @@ end
user_id = User.find_by_sql("select id from users where concat(lastname,firstname) like '%#{params[:name]}%'")
# @unapproved_user = ApplyUserAuthentication.where(:status => @type, :user_id => user_id, :auth_type => 2).find_by_sql("SELECT s.*, TIMESTAMPDIFF(SECOND, s.updated_at, now()) diff FROM `apply_user_authentications` s order by diff asc")
@unapproved_user = ApplyUserAuthentication.where(:status => @type, :user_id => user_id, :auth_type => 2).order("updated_at desc")
@unapproved_user_count = @unapproved_user.count
@limit = 15
@is_remote = true
@unapproved_user_pages = Paginator.new @unapproved_user_count, @limit, params['page'] || 1
@offset ||= @unapproved_user_pages.offset
@unapproved_user = paginateHelper @unapproved_user, @limit
respond_to do |format|
format.html
format.js
@ -1350,6 +1466,15 @@ end
shixun.update_column('status', 2)
apply_action.update_attributes(:status => 1, :dealer_id => User.current.id)
shixun_modify_status_without_publish shixun, 1
# 实训发布后则不允许修改代码
g = Gitlab.client
shixun.shixun_members.each do |member|
gid = User.find(member.user_id).try(:gid)
g.edit_team_member(shixun.gpid, gid, 10) # 3代表角色master
end
# 加入超级管理员
admin_gid = User.where(:admin => 1).first.try(:gid)
g.add_team_member(shixun.gpid, admin_gid, 40) # 30代表角色master
end
@authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => 0)
@authorizations_count = @authorizations.count
@ -1384,33 +1509,31 @@ end
render_404
end
def course_list_xls courses
def course_list_xls course
xls_report = StringIO.new
book = Spreadsheet::Workbook.new
sheet1 = book.create_worksheet :name => "course"
blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
sheet1.row(0).default_format = blue
sheet1.row(0).concat(["ID","课堂名称","成员","资源","普通作业"," 实训作业","试卷","私有","状态","创建者单位","创建者","动态时间"])
sheet1.row(0).concat([l(:issue_xls_id),l(:issue_xls_tracker_id),l(:issue_xls_title),l(:issue_xls_description),l(:issue_xls_status),l(:issue_xls_assign),l(:issue_xls_priority),l(:issue_xls_author),l(:issue_xls_created_at),l(:milestone),l(:issue_xls_start),l(:issue_xls_due),l(:issue_xls_ratio)])
count_row = 1
courses.each do |course|
school = course.teacher.try(:user_extensions).try(:school).try(:name).blank? ? "--" : course.teacher.school_name
teacher_name = course.teacher ? course.teacher.show_real_name : ""
sheet1[count_row,0] = course.id
sheet1[count_row,1] = course.name
sheet1[count_row,2] = course.members.count
sheet1[count_row,3] = course.attachments.count
sheet1[count_row,4] = course.homework_commons.where(:homework_type => 1).count
sheet1[count_row,5] = course.homework_commons.where(:homework_type => 4).count
sheet1[count_row,6] = course.exercises.count
sheet1[count_row,7] = course.is_public.to_i == 1 ? '否' : '是'
sheet1[count_row,8] = course.is_end ? "已结束" : "正在进行"
sheet1[count_row,9] = school
sheet1[count_row,10] = teacher_name
sheet1[count_row,11] = format_time(course.updatetime)
issues.each do |issue|
sheet1[count_row,0] = issue.id
sheet1[count_row,1] = issue_tracker_change(issue.tracker_id)
sheet1[count_row,2] = issue.subject
sheet1[count_row,3] = (issue.description.gsub(/<\/?.*?>/,"")).html_safe
sheet1[count_row,4] = issue_status_change(issue.status_id)
sheet1[count_row,5] = issue.assigned_to.try(:show_name)
sheet1[count_row,6] = issue_priority_change(issue.priority_id)
sheet1[count_row,7] = issue.author.show_name
sheet1[count_row,8] = issue.created_on.nil? ? issue.created_on : issue.created_on.strftime('%Y-%m-%d %H:%M:%S')
sheet1[count_row,9] = issue.fixed_version.try(:name)
sheet1[count_row,10] = issue.start_date.nil? ? issue.start_date : issue.start_date.strftime('%Y-%m-%d')
sheet1[count_row,11] = issue.due_date.nil? ? issue.due_date : issue.due_date.strftime('%Y-%m-%d')
sheet1[count_row,12] = issue_ratio_change(issue.done_ratio, issue.status_id)
count_row += 1
end
book.write xls_report
xls_report.string
end
end

7
app/controllers/my_controller.rb
View File

@ -145,8 +145,8 @@ class MyController < ApplicationController
applied_message = AppliedMessage.where(:id => params[:applied_message_id]).first
applied_message.update_attribute(:viewed, true)
end
@user = User.current
@user = params[:user_id].nil? ? User.current : User.find(params[:user_id])
# @user = User.current
# 认证
ue = @user.user_extensions
@trail_authentication = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization").order("created_at desc").first
@ -293,6 +293,7 @@ class MyController < ApplicationController
def password
begin
@act='password'
# @user = params[:user_id].nil? ? User.current : User.find(params[:user_id])
@user = User.current
unless @user.change_password_allowed?
flash.now[:error] = l(:notice_can_t_change_password)
@ -411,7 +412,7 @@ class MyController < ApplicationController
}
layout[group] = group_items
@user.pref[:my_page_layout] = layout
@user.pref.save
@user.pref.saveaccount
end
end
render :nothing => true

15
app/controllers/shixuns_controller.rb
View File

@ -16,6 +16,13 @@ class ShixunsController < ApplicationController
def statistics_students
@statistics = @shixun.myshixuns
@statistics_count = @statistics.count
@limit = 10
@is_remote = true
@statistic_pages = Paginator.new @statistics_count, @limit, params['page'] || 1
@offset ||= @statistic_pages.offset
@statistics = paginateHelper @statistics, @limit
end
@ -131,6 +138,8 @@ class ShixunsController < ApplicationController
@latest_myshixuns = myshixuns.order("created_at desc").limit(4)
end
def autocompletion
end
@ -544,6 +553,12 @@ class ShixunsController < ApplicationController
new_shixun.status = 0
new_shixun.fork_from = @shixun.id
new_shixun.save!
shixun_major_courses = ShixunMajorCourse.where(:shixun_id => @shixun.id)
if shixun_major_courses.present?
shixun_major_courses.each do |smc|
ShixunMajorCourse.create!(:shixun_id => new_shixun.id, :major_id => smc.major_id, :course_list_id => smc.course_list_id)
end
end
# 同步复制版本库，先fork再修改版本库名
# eduforge用户作为版本库的创建者
repository = Repository.new

8
app/helpers/challenges_helper.rb
View File

@ -16,13 +16,13 @@ module ChallengesHelper
game = Game.where(:challenge_id => challenge_id, :user_id => User.current.id).first
case game.try(:status)
when 0
"待完成&nbsp;&nbsp;<a><i data-tip-down='待完成' class='fa fa-play-circle color-light-green fr font-18 mt5 -text-danger w20_center'></i></a>".html_safe
"待完成&nbsp;&nbsp;<a href='javascript:void(0);'><i data-tip-down='点击开始' class='fa fa-play-circle color-light-green fr font-24 -text-danger w20_center'></i></a>".html_safe
when 1
"<a><i data-tip-down='评测中' class='fa fa-unlock-alt fr font-18 mt5 -text-danger w20_center'></i></a>".html_safe
"<i data-tip-down='评测中' class='fa fa-unlock-alt fr font-20 mt5 -text-danger w20_center'></i></a>".html_safe
when 2
"已完成&nbsp;&nbsp;<a><i data-tip-down='已解决' class='fa fa-check-circle fr font-18 mt5 color-light-green w20_center' ></i></a>".html_safe
"已完成&nbsp;&nbsp;<a href='javascript:void(0);'><i data-tip-down='已解决' class='fa fa-check-circle fr font-24 color-light-green w20_center' ></i></a>".html_safe
when 3,nil
"未解锁&nbsp;&nbsp;<a><i data-tip-down='未解锁' class='fa fa-play-circle fr font-18 mt5 color-grey w20_center' ></i></a>".html_safe
"未开始&nbsp;&nbsp;<a><i data-tip-down='请先完成前序关卡。无法点击' class='fa fa-play-circle fr font-24 color-grey w20_center' ></i></a>".html_safe
end
end
end

2
app/models/challenge.rb
View File

@ -44,7 +44,7 @@ class Challenge < ActiveRecord::Base
def choose_score
score = 0
self.challenge_chooses.each do |choose|
score += choose.score
score += choose.score.to_i
end
return score
end

15
app/models/myshixun.rb
View File

@ -16,6 +16,12 @@ class Myshixun < ActiveRecord::Base
def current_stage
game = self.games.where(:status => 0).first
position = game.blank? ? games.count : game.challenge.try(:position)
return position
end
def current_stages
game = self.games.where(:status => 1).first
position = game.blank? ? 1 : game.challenge.try(:position)
return position
end
@ -72,4 +78,13 @@ class Myshixun < ActiveRecord::Base
rescue ActiveRecord::RecordNotFound
render_404
end
def score
game = self.games.where(:status => [0, 1]).first
unless game.blank?
score = game.challenge.try(:score)
end
return score
end
end

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

@ -2,7 +2,7 @@
<a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" class="color-black">本关任务</a>
</li>
<% @challenge.challenge_chooses.each_with_index do |choose, index| %>
<li class="fl <%= @index == index ? "check_nav" : "" %>" style="<%= @index == index ? "width:110px" : "flex:1" %>">
<li class="fl <%= @index == index ? "check_nav" : "" %>" style="<%= @challenge.challenge_chooses.count > 7 ? (@index == index ? "width:110px" : "flex:1") : "" %>">
<a href="<%= choose_type_show_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => choose.id, :index => index) %>" class="color-black" data-remote="true">
<%= (index + 1).to_s + (choose.category == 1 ? ".单选题" : ".多选题") %>
</a>

9
app/views/challenges/_choose_type.html.erb
View File

@ -73,11 +73,14 @@
var html="<li class=\"fl check_nav\"><a href=\"javascript:void(0)\" class=\"color-black\">"+li_con+"</a></li>";
$(".stage-part-2").find(".nav_option li").removeClass("check_nav");
$(".stage-part-2").find(".nav_option li").removeAttr("style");
for(var i=1;i<$(".stage-part-2").find(".nav_option li").length;i++){
$(".stage-part-2").find(".nav_option li").eq(i).attr("style","flex:1");
if($(".stage-part-2").find(".nav_option li").length>7){
for(var i=1;i<$(".stage-part-2").find(".nav_option li").length;i++){
$(".stage-part-2").find(".nav_option li").eq(i).attr("style","flex:1");
}
}
$(".stage-part-2").find(".nav_option li").eq(length-1).after(html);
$.ajax({
@ -116,8 +119,6 @@
if($(".nav_option li").length>1){
$(".nav_option li").removeClass("check_nav");
$(this).parent().addClass("check_nav");
$(this).parent().removeAttr("style")
$(this).parent().attr("style","flex:1");
}
})

14
app/views/challenges/_content_list.html.erb
View File

@ -61,7 +61,19 @@
<span class="mr100 w150 g_frame"><%= challenge.score %>经验值</span>
<% end %>
<% if @shixun.status == 2 %>
<span class="mr390 fr"><%= find_game_status challenge.id %></span>
<% game = Game.where(:challenge_id => challenge.id, :user_id => User.current.id).first %>
<span class="mr390 fr">
<% case game.try(:status) %>
<% when 0 %>
待完成&nbsp;&nbsp;<a href='<%= operation_shixun_path(@shixun, :myshixun_id => challenge.current_user_game.try(:myshixun)) %>' data-remote="true"><i data-tip-down='点击开始' class='fa fa-play-circle color-light-green fr font-24 -text-danger w20_center'></i></a>
<% when 1 %>
<a><i data-tip-down='评测中' class='fa fa-unlock-alt fr font-20 mt5 -text-danger w20_center'></i></a>
<% when 2 %>
已完成&nbsp;&nbsp;<a href='<%= operation_shixun_path(@shixun, :myshixun_id => challenge.current_user_game.try(:myshixun)) %>' data-remote="true"><i data-tip-down='已解决' class='fa fa-check-circle fr font-24 color-light-green w20_center' ></i></a>
<% when 3,nil %>
未开始&nbsp;&nbsp;<a><i data-tip-down='请先完成前序关卡。无法点击' class='fa fa-play-circle fr font-24 color-grey w20_center' ></i></a>
<% end %>
</span>
<% end %>
</p>
</div>

13
app/views/courses/_courseList.html.erb
View File

@ -10,15 +10,9 @@
<% sy_author = User.find(sy.tea_id) %>
<div class="task-index-list-box-top">
<a href="<%= course_path(sy) %>" target="_blank">
<% if sy.name.length > 32 %>
<p class="font-14 task-index-list-title two_lines_show" data-tip-down = "<%= sy.name %>">
<p class="font-14 task-index-list-title two_lines_show pPPP" data-tip-down = "<%= sy.name.length >28?sy.name : '' %>">
<%= sy.name %>
</p>
<% else %>
<p class="font-14 task-index-list-title two_lines_show">
<%= sy.name %>
</p>
<% end %>
</a>
<div class="clearfix task-index-list-user">
<%= link_to image_tag(url_to_avatar(sy_author), :width => "60", :height => "60", :class => "panel-warp-img mr10 fl", :alt => "用户"), user_path(sy_author), :target => '_blank' %>
@ -71,11 +65,6 @@
<% end %>
<script>
//var Line = "<%#= sy.name %>";
// $(".task-index-list-title").mouseenter(function(){
// console.log(Line);
// })
var timer="";
$(".sub-con").hover(function(ev){
this.fn = function(){

2
app/views/courses/destroy.js.erb
View File

@ -1 +1 @@
$("#management_course_" + <%= @course_id %>).remove()
$("#management_course_<%= @course_id %>").remove();

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

@ -12,7 +12,7 @@
<% unless @course.course_groups.empty? %>
<% @course.course_groups.each do |group| %>
<li data-option="hasclass" data-group-id="<%= group.id %>" data-course-id="<%= @course.id %>" class="setting_group_<%= group.id %>">
<p class="p1" data-tip-left="<%= group.name %>">
<p class="p1" data-tip-left="<%= group.name.length > 6 ? group.name : ''%>">
<span><%= group.name %></span>
<em><%= group.members.count %></em>
<!--<i class="fa fa-bars" aria-hidden="true"></i>-->

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

@ -13,12 +13,12 @@
<li><%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %>
<% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %>
<% if apply_count > 0 %>
<span class="ml10"><span class="edu-cir-orange" data-tip-down="有<%= apply_count %>名助教或教师申请加入课堂，请审批"><%= apply_count %></span></span>
<span class="ml10" style="cursor: pointer"><a href="<%= members_course_path(@course) %>" class="edu-cir-orange" data-tip-down="有<%= apply_count %>名助教或教师申请加入课堂，请审批"><%= apply_count %></a></span>
<% end %>
</li>
<li><%= link_to '+&nbsp;发布普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-orange03" %></li>
<li><%= link_to '+&nbsp;发布实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-orange03", :remote => true %></li>
<li><a class="color-orange03" onclick="course_files_upload();">+&nbsp;发布资源</a></li>
<li><a class="color-orange03" onclick="course_files_upload();" style="cursor: pointer">+&nbsp;发布资源</a></li>
<% course_board = @course.boards.where("parent_id is NULL").first %>
<li><%= link_to '+&nbsp;发布帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-orange03" %></li>
</ul>

8
app/views/courses/sync_students.js.erb
View File

@ -1,6 +1,6 @@
$("#setting_teacher_list").hide();
$("#setting_student_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show();
<% if @had_import_count > 0 %>
var htmlvalue = '<%= escape_javascript(render :partial => 'courses/settings/import_students_result', :locals => {:course => @course}) %>';
pop_box_new(htmlvalue, 440, 490);
<% end %>
<%# if @had_import_count > 0 %>
//var htmlvalue = '<%#= escape_javascript(render :partial => 'courses/settings/import_students_result', :locals => {:course => @course}) %>';
//pop_box_new(htmlvalue, 440, 490);
<%# end %>

2
app/views/discusses/destroy.js.erb
View File

@ -1,3 +1,3 @@
<% if @shixun %>
$.get('<%= shixun_discuss_shixun_path(@shixun) %>');
$.get('<%= shixun_discuss_shixun_path(@shixun, :challenge_id => @game_challenge.try(:id)) %>');
<% end %>

5
app/views/games/_game_show.html.erb
View File

@ -46,7 +46,7 @@
</ul>
<div class="cl"></div>
<div class="-flex -relative greytab-inner" >
<div class="-flex -relative greytab-inner">
<div id="tab_con_1" class="tab-info" >
<div class="fit -scroll">
<div class="-layout-v -fit">
@ -79,7 +79,7 @@
</div>
</div>
</div>
<div class="-layout-h -padding-h-16 -horizontal -footer-left">
<div class="-layout-h -padding-h-16 -horizontal -footer-left" id="bottom_points" style = "position:relative;">
<ul class="-task-ml80 -layout" style="overflow:hidden;align-items:flex-end;flex-wrap:wrap;">
<%= render :partial => "games/shixun_comment_block" %>
<li class="fl mt10 ml20 " style="width:54px;margin-bottom:10px;"><a href="javascript:void(0);" onclick="send_dis_to_shixun()" class="course-bth-blue color_white">发送</a></li>
@ -169,4 +169,5 @@
// 点赞/取消点赞功能
var praiseStatus = <%= @praise.nil? ? false : true %>; // 是否点赞
var treadStatus = <%= @tread.nil? ? false : true %>; // 是否踩
</script>

20
app/views/games/_shixun_comment_list.html.erb
View File

@ -20,10 +20,10 @@
</span>
<span class="fr none mt5 mr10" id="discuss_opr_<%= dis.id %>">
<% if User.current.manager_of_shixun?(@shixun) && dis.children.count == 0 %>
<a href="javascript:void(0);" onclick="reply_to_dis('<%= dis.id %>', '<%= dis.user.show_name %>')" class="fr ml10 font-12 link-color-green">回复</a>
<a href="javascript:void(0);" onclick="reply_to_dis('<%= dis.id %>', '<%= dis.user.show_name %>')" class="fr ml10 font-12 link-color-green" id = "reversion">回复</a>
<% end %>
<% if (User.current.manager_of_shixun?(@shixun) || User.current == dis.user) && dis.children.count == 0 %>
<a href="javascript:void(0);" onclick="delete_confirm_box_2('<%= discuss_path(dis) %>', '确定要删除该条回复吗？')" class="fr font-12 link-color-green">删除</a>
<a href="javascript:void(0);" onclick="delete_confirm_box_2('<%= discuss_path(dis, :challenge_id => @game_challenge) %>', '确定要删除该条回复吗？')" class="fr font-12 link-color-green">删除</a>
<% end %>
</span>
@ -74,4 +74,18 @@
<!--评论区域的分页-->
</div>
</div>
</div>
</div>
<script>
//二次回复的提示结构
var $points = $("<div class = \"points-data-tip-top\">"+
"<div class = \"data-tip-top\">请在此输入回复</div>"+
"</div>").appendTo("#bottom_points");
$("#reversion").click(function(){
$points.show();
});
$("#comment_news").blur(function(){
$points.hide();
});
</script>

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

@ -74,7 +74,7 @@
<% end %>
</div>
</div>
<ul class="sy_classlist clearfix" style="border: none">
<ul class="sy_classlist clearfix" style="border: none;height:64px;">
<input class="magic-checkbox" type="checkbox" name="layout" id="homework_bank_all_select" class="fl">
<label for="homework_bank_all_select" class="fl mr15 mt10">全选</label>
<div class="fl resource_btns_bottom pt15">

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

@ -2,7 +2,7 @@
<p class="ml15 color-grey"><%= edit_mode ? '编辑' : '新建' %>普通作业</p>
</div>
<div class="alert alert-red mt15 none" id="new_homework_notice">
<button class="task-close fr" type="button">×</button>
<button class="task-close fr" type="button" id="close_button">×</button>
有<span id="new_homework_notice_count">3</span> 处问题导致无法保存
<ul>
</ul>
@ -71,4 +71,6 @@
</ul>
</div>
</div>
</div>
</div>

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

@ -4,7 +4,7 @@
<p class="ml15 color-grey"><%= edit_mode ? '编辑' : '新建' %>分组作业</p>
</div>
<div class="alert alert-red mt15 none" id="new_homework_notice">
<button class="task-close fr" type="button">×</button>
<button class="task-close fr" type="button" id="close_button">×</button>
有<span id="new_homework_notice_count">3</span> 处问题导致无法保存
<ul>
</ul>
@ -87,4 +87,6 @@
</ul>
</div>
</div>
</div>
</div>
<

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

@ -2,7 +2,7 @@
<p class="ml15 color-grey"><%= edit_mode ? '编辑' : '新建' %>编程作业</p>
</div>
<div class="alert alert-red mt15 none" id="new_homework_notice">
<button class="task-close fr" type="button">×</button>
<button class="task-close fr" type="button" id="close_button">×</button>
有<span id="new_homework_notice_count">3</span> 处问题导致无法保存
<ul>
@ -164,4 +164,6 @@
<textarea class="task-form-100 task-height-40 mb10 panel-box-sizing" placeholder="样例输入" name="sample[input][]"></textarea>
<textarea class="task-form-100 task-height-40 mb10 panel-box-sizing" placeholder="样例输出" name="sample[output][]"></textarea>
</li>
</script>
</script>

6
app/views/homework_bank/new.html.erb
View File

@ -1,3 +1,6 @@
<style>
.edu-con-bg01 .course_list_ul p{max-width:200px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
</style>
<% content_for :header_tags do %>
<%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
<% end %>
@ -39,4 +42,7 @@
$(".course_list_ul").hide();
event.stopPropagation();
});
$("#close_button").click(function(){
$(this).parent().hide();
})
</script>

65
app/views/homework_bank/show.html.erb
View File

@ -40,43 +40,44 @@
<a href="javascript:void(0);" class="tab_type">参考答案</a>
</li>
<% end %>
<div class="fr edu-position edu-position-hidebox" style="margin:10px 5px 0 0;">
<a href="javascript:void(0);" class="font-16"><i class="fa fa-bars"></i></a>
<ul class="edu-position-hide undis" style="left:-85px;">
<% if @is_admin %>
<% if @homework.homework_type != 4 %>
<li>
<%= link_to l(:button_edit), edit_homework_bank_path(@homework) %>
</li>
<% else %>
<li>
<%= link_to '进入实训', shixun_path(@homework.homework_bank_shixun.shixun), :target => "_blank" %>
</li>
<% end %>
<li>
<%= link_to '发送', choose_user_course_homework_bank_index_path(:check_homework_bank => ["#{@homework.id}"]), :remote => true %>
</li>
<% unless @homework.is_public %>
<li>
<a href="javascript:void(0);" onclick="s_op_confirm_box('<%= set_public_homework_bank_path(@homework) %>', '您确定要公开吗？<br/>公开后不能重设为私有')">设为公开</a>
</li>
<% end %>
<li>
<a href="javascript:void(0)" onclick="delete_confirm_box_3('<%= homework_bank_path(@homework) %>', '您确定要删除吗？')">删除</a>
</li>
<% elsif @homework.is_public %>
<li>
<%= link_to '发送', choose_user_course_homework_bank_index_path(:check_homework_bank => ["#{@homework.id}"]), :remote => true %>
</li>
<% end %>
</ul>
</div>
</ul>
<div class="cl"></div>
<div id="edu-tab-con-1" class="box_bg_shandow">
<div class="" style="padding:0 15px;">
<div class="fr edu-position edu-position-hidebox">
<a href="javascript:void(0);" class="font-16"><i class="fa fa-bars"></i></a>
<ul class="edu-position-hide undis" style="left:-85px;">
<% if @is_admin %>
<% if @homework.homework_type != 4 %>
<li>
<%= link_to l(:button_edit), edit_homework_bank_path(@homework) %>
</li>
<% else %>
<li>
<%= link_to '进入实训', shixun_path(@homework.homework_bank_shixun.shixun), :target => "_blank" %>
</li>
<% end %>
<li>
<%= link_to '发送', choose_user_course_homework_bank_index_path(:check_homework_bank => ["#{@homework.id}"]), :remote => true %>
</li>
<% unless @homework.is_public %>
<li>
<a href="javascript:void(0);" onclick="s_op_confirm_box('<%= set_public_homework_bank_path(@homework) %>', '您确定要公开吗？<br/>公开后不能重设为私有')">设为公开</a>
</li>
<% end %>
<li>
<a href="javascript:void(0)" onclick="delete_confirm_box_3('<%= homework_bank_path(@homework) %>', '您确定要删除吗？')">删除</a>
</li>
<% elsif @homework.is_public %>
<li>
<%= link_to '发送', choose_user_course_homework_bank_index_path(:check_homework_bank => ["#{@homework.id}"]), :remote => true %>
</li>
<% end %>
</ul>
</div>
<div class="cl"></div>
<div class="upload_img list_style">
<div class="upload_img list_style mt20">
<%= @homework.description.html_safe %>
</div>
</div>

1
app/views/homework_common/_edit_anon_setting.html.erb
View File

@ -5,6 +5,7 @@
<div class="clearfix">
<ul class="pl30">
<li class="clearfix edu-position pl20 mb15">
<label class=" panel-form-label fl mr10">&nbsp;</label>
<input id="homework_anonymous_comment" class="magic-checkbox fl mt5 <%= @homework.homework_detail_manual.comment_status >= 3 ? 'disabled-bg' : '' %>" <%= @homework.homework_detail_manual.comment_status >= 3 ? 'disabled' : '' %> type="checkbox" value="1" name="homework_anonymous_comment" <%= @homework.anonymous_comment == 1 ? '' : 'checked' %>>
<label for="homework_anonymous_comment" class="fl">启用匿评</label>
<div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">

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

@ -5,6 +5,7 @@
<div class="clearfix">
<ul class="pl30">
<li class="clearfix edu-position pl20 mb15">
<label class=" panel-form-label fl mr10">&nbsp;</label>
<input class="magic-checkbox fl mt5 magic-checkbox_show" disabled type="checkbox" <%= @homework.anonymous_comment == 1 ? '' : 'checked' %>>
<label class="fl">启用匿评</label>
<div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
@ -33,6 +34,7 @@
</ul>
<ul class="mt50 pl30 mb50 <%= @homework.anonymous_appeal == 1 ? '' : 'none' %>">
<li class="clearfix edu-position pl20 mb15">
<label class=" panel-form-label fl mr10">&nbsp;</label>
<input class="magic-checkbox fl mt5" disabled type="checkbox" <%= @homework.anonymous_appeal == 0 ? '' : 'checked' %>>
<label class="fl">启用匿评申诉</label>
<div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">

18
app/views/layouts/base_management.html.erb
View File

@ -36,13 +36,13 @@
<% when 6 %>
<%= @sub_type == 1 ? "单位列表" :"单位部门列表" %>
<% when 7 %>
<%= @sub_type == 1 ? "用户列表" :"试用授权列表" %>
<%= @sub_type == 1 ? "用户列表" :(@sub_type == 2? "试用授权列表" : "自动授权列表") %>
<!--<%# case @next_type %>-->
<!--<%# when 1 %>-->
<!--&gt;用户列表-->
<!--<%#= 111 %>-->
<!--<%# end %>-->
<% when 8 %>
消息
<%= @sub_type == 1 ? "作业回复":(@sub_type == 2? "实训反馈" : "课堂讨论区") %>
<% when 9 %>
<%= @sub_type == 1 ? "实训留言列表" : "" %>
<% when 10 %>
@ -80,16 +80,24 @@
<li class="fl edu-admin-nav-li edu-position"><a href="javascript:void(0);" class="edu-admin-nav-a">单位</a>
<ul class="edu-admin-nav-inner edu-absolute">
<li><%= link_to "单位列表", departments_part_managements_path, :class => "edu-admin-nav-a" %></li>
<li><%= link_to "单位部门列表", departments_managements_path%></li>
<li><%= link_to "单位部门列表", departments_managements_path %></li>
</ul>
</li>
<li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 7 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">用户</a>
<ul class="edu-admin-nav-inner edu-absolute">
<li><%= link_to "用户列表", users_managements_path %></li>
<li><%= link_to "试用授权列表", users_trial_managements_path %></li>
<li><%= link_to "自动授权列表", auto_users_trial_managements_path %></li>
</ul>
</li>
<li class="fl edu-admin-nav-li"><a href="javascript:void(0);" class="edu-admin-nav-a">消息</a></li>
<li class="fl edu-admin-nav-li edu-position"><a href="javascript:void(0);" class="edu-admin-nav-a">消息</a>
<ul class="edu-admin-nav-inner edu-absolute">
<li><%= link_to "作业回复",leave_message_managements_path %></li>
<li><%= link_to "实训反馈", shixun_feedback_message_managements_path %></li>
<li><%= link_to "课堂讨论区",messages_list_managements_path %></li>
</ul>
</li>
<li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 9 %>">
<a href="javascript:void(0);" class="edu-admin-nav-a">留言</a>
<ul class="edu-admin-nav-inner edu-absolute">

2
app/views/layouts/base_shixun.html.erb
View File

@ -39,7 +39,7 @@
</li>
<% end %>
<li><a href="<%= collaborators_shixun_path(@shixun) %>" class="<%= params[:action] == "collaborators" ? "active" : "" %>">合作者</a></li>
<!--<li><a href="<%#= statistics_students_shixun_path(@shixun) %>"class="<%#= params[:action] == "statistics_students" ? "active" : "" %>">学员统计</a></li>-->
<li><a href="<%= statistics_students_shixun_path(@shixun) %>"class="<%= params[:action] == "statistics_students" ? "active" : "" %>">学员统计</a></li>
<% if User.current.manager_of_shixun?(@shixun) %>
<li><a href="<%= settings_shixun_path(@shixun) %>" class="<%= params[:action] == "settings" ? "active" : "" %>">配置</a></li>
<% end %>

10
app/views/managements/_audit_pro_authentication_list.html.erb
View File

@ -18,6 +18,7 @@
<% if user.user_extensions && user.user_extensions.identity %>
<!--<span class="ml30"><%#= user.identity %></span>-->
<% if user.user_extensions.identity == 1 && user.user_extensions.try(:student_id) %>
<span class="ml30"><%= "学生" %></span>
<span class="ml30"><%= user.user_extensions.try(:student_id) %></span>
<% else %>
<span class="ml30"><%= user.user_extensions.try(:technical_title) %></span>
@ -34,7 +35,14 @@
</div>
</div>
<% end %>
<div style="text-align:center;">
<div class="pages_right_min" style="width:auto; display:inline-block;">
<ul id="trial_authorization_list_pages">
<%= pagination_links_full @unapproved_user_pages, @unapproved_user_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
</ul>
<div class="cl"></div>
</div>
</div>
<script>
$(function(){
var all_images = $(".edu-renzheng-img");

36
app/views/managements/_auto_users_authorization_list.html.erb Normal file
View File

@ -0,0 +1,36 @@
<table class="edu-pop-table edu-txt-center font-12 table-pa5" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th>序号</th>
<th>单位</th>
<th>学生</th>
<th>已授权学生</th>
<th>授权时间<i class="fa fa-long-arrow-down color-light-green ml5"></i></th>
<th>操作</th>
</tr>
</thead>
<tbody>
<% @schools.each_with_index do |school,index| %>
<tr>
<td><%= index + 1 %></td>
<td><%= school.name %></td>
<td><%= UserExtensions.where(:school_id =>school.id).count %></td>
<td><%= User.where(:status => 1) && UserExtensions.where(:school_id =>school.id).count %></td>
<td></td>
<td>
<a href="script:void(0)">删除</a>
</td>
</tr>
<% end %>
</tbody>
</table>
<div style="text-align:center;" class="new_expand">
<div class="pages_user_show" style="width:auto; display:inline-block;margin:18px 0;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @schools_pages, @schools_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
</ul>
<div class="cl"></div>
</div>
</div>

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

@ -32,9 +32,7 @@
<td> <%= course.teacher ? link_to(course.teacher.try(:lastname)+course.teacher.try(:firstname), user_path(course.teacher)) : "" %></td>
<td> <%= format_time(course.updatetime) %></td>
<td>
<a href="javascript:void(0);" onclick="delete_confirm_box_2('<%= course_path(course) %>', '确定要删除该课堂吗？')">删除&nbsp;</a>
<input type="checkbox" name="homepage_show" value="<%= course.id %>" <%= course.homepage_show ? "checked" : "" %> class="ml-3 mr5 magic-checkbox" id="join_course_role_<%= course.id %>">
<label style="top:0px;padding-left: 25px;float:right; margin-right: 10px" for="join_course_role_<%= course.id %>">首页显示</label>
</td>

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

@ -23,7 +23,7 @@
<!--<td><%#= syllabus.syllabus_first_level_discipline == "" ? "--" : syllabus.syllabus_first_level_discipline %></td>-->
<!--<td><%#= syllabus.syllabus_major == "" ? "--" : syllabus.syllabus_major %></td>-->
<td class="edu-txt-left">
<%= link_to courselist.name,course_path(courselist.id) %>
<%= courselist.name %>
</td>
<td>
<%= courselist.courses.count %>

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

@ -4,8 +4,9 @@
<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
</div>
<div class="mt10 ml30">
<span class="fl font-16 color-grey mr10 mt3 ">单位全称:</span><input nhname="tag" name="school" class="task-height-40 panel-box-sizing fl" type="text" placeholder="请选择单位" style="width: 260px" />
<input nhname="tag" nh_tag_5="true" class="fl" id="school_id" name="school_id" style="display:none;" type="text"/> <!-- 单位名称的test框选中下拉列表框的id -->
<span class="fl font-16 color-grey mr10 mt3 ">单位全称:</span>
<input nhname="tag" name="school" class="task-height-40 panel-box-sizing fl" type="text" placeholder="请选择单位" style="width: 260px" value="<%= @latest_school %>" />
<input nhname="tag" nh_tag_5="true" class="fl" id="school_id" name="school_id" style="display:none;" type="text" value="<%= @school_id %>"/> <!-- 单位名称的test框选中下拉列表框的id -->
<div class="cl"></div>
<span class="color-orange fl none" id="school_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择单位</span>
</div>

43
app/views/managements/_leave_message_list.html.erb Normal file
View File

@ -0,0 +1,43 @@
<table class="edu-pop-table edu-txt-center" cellpadding="0" cellspacing="0" style="table-layout: fixed">
<thead>
<tr>
<th width="9%">序号</th>
<th width="12%">来源(课程或用户ID)</th>
<th width="15%">留言人</th>
<th width="18%">留言时间<i class="fa fa-long-arrow-down color-light-green ml5" ></i></th>
<th width="30%" class="edu-txt-left" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">留言内容</th>
<th>回复数</th>
</tr>
</thead>
<tbody>
<% @jour.each_with_index do |jour,index| %>
<tr>
<td><%= index + 1 %></td>
<td> <%= jour.jour_id %> </td>
<td>
<% if jour.try(:user).try(:show_real_name) == ' '%>
<%= link_to(jour.try(:user), user_path(jour.user)) %>
<% else %>
<%= link_to(jour.try(:user).try(:show_real_name), user_path(jour.user)) %>
<% end %>
</td>
<td><%= format_time(jour.created_on) %></td>
<td class="edu-txt-left" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">
<%= jour.m_parent_id.nil? ? strip_html(jour.notes) : 'RE: ' + strip_html(jour.notes) %>
</td>
<td>
<% replys = JournalsForMessage.where(:m_parent_id => jour.id) %>
<%= replys.nil? ? 0 : replys.count %>
</td>
</tr>
<% end %>
</tbody>
</table>
<div style="text-align:center;" class="new_expand">
<div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @jour_pages, @jour_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
</ul>
<div class="cl"></div>
</div>
</div>

46
app/views/managements/_message_list.html.erb Normal file
View File

@ -0,0 +1,46 @@
<table class="edu-pop-table edu-txt-center" cellpadding="0" cellspacing="0" style="table-layout: fixed">
<thead>
<tr>
<th width="9%">序号</th>
<th width="12%">来源(贴吧ID)</th>
<th width="15%">作者</th>
<th width="18%">时间<i class="fa fa-long-arrow-down %> color-light-green ml5" ></i></th>
<th width="30%" class="edu-txt-left" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">标题</th>
<th>回复数</th>
</tr>
</thead>
<tbody>
<% @memo.each_with_index do |memo,index| %>
<tr>
<td><%= index + 1 %></td>
<td> <%= memo.forum_id %> </td>
<td>
<% if memo.try(:author).try(:realname) == ' '%>
<%= link_to(memo.try(:author), user_path(memo.author)) %>
<% else %>
<%= link_to(memo.try(:author).try(:realname), user_path(memo.author)) %>
<% end %>
</td>
<td><%= format_time(memo.created_at) %></td>
<td class="edu-txt-left" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">
<% if memo.parent_id.nil? || memo.subject.starts_with?('RE:')%>
<%= link_to(memo.subject, forum_memo_path(memo.forum, memo)) %>
<% else %>
<%= link_to("RE:"+memo.subject, forum_memo_path(memo.forum, memo), :target => "_blank") %>
<% end %>
</td>
<td>
<%= link_to(memo.replies_count, forum_memo_path(memo.forum, memo)) %>
</td>
</tr>
<% end %>
</tbody>
</table>
<div style="text-align:center;" class="new_expand">
<div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @memo_pages, @memo_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
</ul>
<div class="cl"></div>
</div>
</div>

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

@ -19,6 +19,7 @@
<% end %>
<% if user.user_extensions && user.user_extensions.identity %>
<% if user.user_extensions.identity == 1 && user.user_extensions.try(:student_id) %>
<span class="ml30"><%= "学生" %></span>
<span class="ml30"><%= user.user_extensions.try(:student_id) %></span>
<% else %>
<span class="ml30"><%= user.user_extensions.try(:technical_title) %></span>
@ -45,7 +46,14 @@
<% else %>
<%= render :partial => "welcome/no_data" %>
<% end %>
<div style="text-align:center;">
<div class="pages_right_min" style="width:auto; display:inline-block;">
<ul id="trial_authorization_list_pages">
<%= pagination_links_full @unapproved_user_pages, @unapproved_user_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
</ul>
<div class="cl"></div>
</div>
</div>
<script>
$(function(){
var all_images = $(".edu-renzheng-img");

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

@ -4,7 +4,7 @@
<th width="25%" style="text-align: left">实训名称</th>
<th width="40%" style="text-align: left">评论内容</th>
<th width="10%">评论者</th>
<th width="10%">评论时间</th>
<th width="10%">评论时间<i class="fa fa-long-arrow-down color-light-green ml5" ></i></th>
<th width="10%"></th>
<!--<i class="fa <%#= @sx_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up" %> color-light-green ml5" title="功能完善中，敬请期待"></i>-->
</thead>

5
app/views/managements/_user_list.html.erb
View File

@ -16,7 +16,8 @@
<tr>
<td><%= user.login %></td>
<td>
<%= link_to user.try(:show_real_name),user_path(user) %>
<%#= link_to user.try(:show_real_name),user_path(user) %>
<%= link_to user.try(:show_real_name), update_user_managements_path(:user => user), target: '_blank' %>
</td>
<td><span class="edu-txt-w140 task-hide" title="<%= user.mail.blank? ? "--" : user.mail %>"><%= user.mail.blank? ? "--" : user.mail %></span></td>
<td title="<%= user.phone.blank? ? "--" : user.phone %>"><%= user.phone.blank? ? "--" : user.phone %></td>
@ -28,7 +29,7 @@
<td><%= format_time user.created_on %></td>
<td title="<%= user.last_login_on.blank? ? "--" : (format_time user.last_login_on) %>"><%= user.last_login_on.blank? ? "--" : (format_time user.last_login_on) %></td>
<td>
<!-- <a href="<%#= update_user_status_managements_path(:status => user.status, :page => params[:page]) %>" class="mr10 link-color-blue" id="lock_user"><%#= user.status == 3 ? "解锁" : "锁定" %></a>-->
<!--<a href="<%#= update_user_status_managements_path(:status => user.status, :page => params[:page]) %>" class="mr10 link-color-blue" id="lock_user"><%#= user.status == 3 ? "解锁" : "锁定" %></a>-->
<%= update_status_link(user) %>
<!-- <a href="javascript:void(0);" methods="delete" class="link-color-blue" id="delete_user">删除</a>-->
<%= link_to "删除", user_path(user, :back_url => users_managements_path), :method => "delete", :class => "link-color-blue", :confirm => l(:text_are_you_sure) %>

11
app/views/managements/auto_users_trial.html.erb Normal file
View File

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

1
app/views/managements/auto_users_trial.js.erb Normal file
View File

@ -0,0 +1 @@
$(".edu-con-bg01").html('<%= escape_javascript( render :partial => 'managements/auto_users_authorization_list') %>');

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

@ -1 +1,3 @@
<%= render :partial => "welcome/no_data" %>
<div class="mt20 edu-con-bg01" style="height: 320px;padding-top: 50px">
<%= render :partial => "welcome/management_no_data" %>
</div>

5
app/views/managements/leave_message.html.erb Normal file
View File

@ -0,0 +1,5 @@
<div class="edu-class-container">
<div class="ex_container" id="leave_message">
<%= render :partial => "leave_message_list" %>
</div>
</div>

1
app/views/managements/leave_message.js.erb Normal file
View File

@ -0,0 +1 @@
$("#leave_message").html('<%= escape_javascript( render :partial => 'managements/leave_message_list') %>');

5
app/views/managements/messages_list.html.erb Normal file
View File

@ -0,0 +1,5 @@
<div class="edu-class-container">
<div class="ex_container" id="leave_message">
<%= render :partial => "message_list" %>
</div>
</div>

1
app/views/managements/messages_list.js.erb Normal file
View File

@ -0,0 +1 @@
$("#leave_message").html('<%= escape_javascript( render :partial => 'managements/message_list') %>');

14
app/views/managements/shixun_feedback_message.html.erb Normal file
View File

@ -0,0 +1,14 @@
<div class="edu-class-container">
<%#= form_tag(url_for(shixuns_managements_path), :id => "managements_shixuns_search", :method => "post", :remote => true ) do %>
<!--<div class="edu-con-top clearfix mb20">-->
<!--<input class="fl task-form-20 task-height-30 ml25" id="shixun_Look_name" name="search" maxlength="" placeholder="输入实训名称关键字进行搜索" type="text" style="height: 21px;">-->
<!--<li class="fl ml10">-->
<!--<a href="javascript:void(0)" class="task-btn task-btn-blue" onclick="$('#managements_shixuns_search').submit();">搜索</a>-->
<!--<a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>-->
<!--</li>-->
<!--</div>-->
<%# end %>
<div class="ex_container" id="management_shixun_feedback_list">
<%= render :partial => "shixun_feedback_list" %>
</div>
</div>

1
app/views/managements/shixun_feedback_message.js.erb Normal file
View File

@ -0,0 +1 @@
$("#management_shixun_feedback_list").html("<%= j(render :partial => 'shixun_feedback_list') %>");

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

@ -11,6 +11,7 @@
<select class="fl task-form-15 task-height-30" id="sx_condition_status" style="width: auto;margin-right: 10px;" form="managements_shixuns_search" name="keyword">
<option value="u_name">创建者姓名搜索</option>
<option value="sx_name">实训名称搜索</option>
<option value="user_depart">学校名称搜索</option>
</select>
<input class="fl task-form-20 task-height-30" id="shixun_Look_name" name="search" maxlength="" placeholder="输入关键字进行搜索" type="text" style="height: 21px;">
<li class="fl ml10">

668
app/views/managements/update_user.html.erb Normal file
View File

@ -0,0 +1,668 @@
<%= stylesheet_link_tag 'css/edu-user' %>
<div class="edu-con-bg01 mt15">
<div class="-task-con-per cl">
<div class="photo fl" onclick="">
<%= image_tag(url_to_avatar(@user), :class => "person", :width => 100, :height => 100, :alt => "头像") %>
<div class="changephoto font-14">
<a href="<%= avatar_account_path(:user_id => @user.id) %>" class="subchange" style="display: block" target="_blank">更换头像</a>
</div>
</div>
<div class="-task-con-data fl">
<div class="top cl">
<div class="top-left fl mt20 mb10">
<p class="p1 font-16" style="overflow: hidden">
<a href="<%= %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">留言</span>
<span class="user_filtrate_span2 ml10"><%= %></span>
</a>
<a href="<%= user_watchlist_user_path(@user) %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">关注</span>
<span class="user_filtrate_span2 ml10"><%= @user_watchlist_count %></span>
</a>
<a href="<%= user_fanslist_user_path(@user) %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">粉丝</span>
<span class="user_filtrate_span2 ml10"><%= @user_fanlist_count %></span>
</a>
<a href="<%= growth_record_user_path(@user, :tab => 3) %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">金币</span>
<span class="user_filtrate_span2 ml10"><%= @user.grade %></span>
</a>
<a href="<%= growth_record_user_path(@user, :tab => 2) %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">经验值</span>
<span class="user_filtrate_span2 ml10"><%= @user.experience %></span>
</a>
</p>
<p class="p1 font-16">
<a href="<%= user_path(@user) %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">创建课堂</span>
<span class="user_filtrate_span2 ml10"><%= @create_courses_count %></span>
</a>
<a href="<%= user_path(@user) %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">参与课堂</span>
<span class="user_filtrate_span2 ml10"><%= @join_courses_count %></span>
</a>
<a href="<%= user_path(@user) %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">创建实训</span>
<span class="user_filtrate_span2 ml10"><%= @create_num %></span>
</a>
<a href="<%= user_path(@user) %>" class="user_course_filtrate fl mt20 mr30 font-14" target="_blank">
<span class="user_filtrate_span1">参与实训</span>
<span class="user_filtrate_span2 ml10"><%= @join_shixuns %></span>
</a>
</p>
</div>
<div class="top-right fr font-14 mr10">
<% update_visiti_count @user %>
<div class="itnew">
<p class="p2 font-12 mt10 mb10">
最近登录：<%= format_time(@user.last_login_on) %>
</p>
<p class="p2 font-16">
<span class="fl">
<% if !@user.user_extensions.school_id.blank? && @user.user_extensions.school %>
<%= @user.user_extensions.school.name %>
<% end %>
</span>
<ul class="fr mb10 p2">
<a href="<%= authentication_account_path %>">
<% if @user.authentication %>
<li class="pr user-info-span" data-tip-down="已实名认证">
<i class="fa fa-user color-light-green" aria-hidden="true"></i><!--已实名认证-->
</li>
<% else %>
<% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id, :auth_type => 1).last %>
<% if apply_auth && apply_auth.status == 0 %>
<li class="pr user-info-span" data-tip-down="实名认证中">
<i class="fa fa-user u-color-light-red" aria-hidden="true"></i><!--实名认证中-->
</li>
<% else %>
<li class="pr user-info-span" data-tip-down="未实名认证">
<i class="fa fa-user u-color-light-grey" aria-hidden="true"></i><!--还未实名认证-->
</li>
<% end %>
<% end %>
</a>
<a href="<%= professional_certification_account_path %>">
<% if @user.professional_certification %>
<li class="pr user-info-span" data-tip-down="已职业认证">
<i class="fa fa-list-alt color-light-green" aria-hidden="true"></i><!--已职业认证-->
</li>
</a>
<% else %>
<% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id, :auth_type => 2).last %>
<% if apply_auth && apply_auth.status == 0 %>
<li class="pr user-info-span" data-tip-down="职业认证中">
<i class="fa fa-list-alt u-color-light-red" aria-hidden="true"></i><!--职业认证中-->
</li>
<% else %>
<li class="pr user-info-span" data-tip-down="未职业认证">
<i class="fa fa-list-alt u-color-light-grey" aria-hidden="true"></i><!--还未职业认证-->
</li>
<% end %>
<% end %>
</a>
<a href="<%= security_settings_path %>">
<% if @user.try(:phone).blank? %>
<li class="pr user-info-span font-16" data-tip-down="未绑定手机">
<i class="fa fa-mobile u-color-light-grey" aria-hidden="true"></i><!--还未绑定手机-->
</li>
<% else %>
<li class="pr user-info-span font-16" data-tip-down="已绑定手机">
<i class="fa fa-mobile color-light-green" aria-hidden="true"></i><!--已绑定手机-->
</li>
<% end %>
</a>
<a href="<%= security_settings_path %>">
<% if @user.try(:mail).blank? %>
<li class="pr user-info-span" data-tip-down="未绑定邮箱">
<i class="fa fa-envelope u-color-light-grey" aria-hidden="true"></i><!--还未绑定邮箱-->
</li>
<% else %>
<li class="pr user-info-span" data-tip-down="已绑定邮箱">
<i class="fa fa-envelope color-light-green" aria-hidden="true"></i><!--已绑定邮箱-->
</li>
<% end %>
</a>
</ul>
</p>
<p class="sub clearfix">
<a href="<%= %>" class="fr font-14 ml10 link-color-orange">给TA留言</a>
<% if (@user.watched_by?(User.current)) %>
<%= link_to "已关注",
watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
:class => "fr font-14 user_watch link-color-orange",
:id => "cancel_watch",
:method => "delete",
:remote => "true" %>
<% else %>
<%= link_to "添加关注",
watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
:class => "fr font-14 user_watch link-color-orange ",
:method => "post",
:remote => "true" %>
<% end %>
</p>
</div>
</div>
</div>
</div>
</div>
<div class=" clearfix mt15">
<!--<div>-->
<%= labelled_form_for :user, @user, :url => {:controller => "my",:action => "account"}, :html => {:id => 'my_account_form', :method => :post, :remote => true} do |f| %>
<ul>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18">ID:</label>
<input type="text" id="user_id" name="user_id" readonly class="input-height task-form-20 panel-box-sizing fl" value="<%= @user.id %>">
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18">昵称:</label>
<input type="text" id="nickname" name="nickname" maxlength="20" nh_required="1" required="required" class="input-height task-form-20 panel-box-sizing fl" placeholder="请输入昵称，最多20个字符" value="<%= @user.nickname %>">
<span class="color-orange fl hint none" id="nickname_hint" style="margin-left:20px;"><i class="fa fa-exclamation-circle mr5"></i>请输入昵称，最多20个字符</span>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18">姓名:</label>
<input type="text" id="lastname" name="lastname" maxlength="20" nh_required="1" required="required" class="mr15 input-height task-form-20 panel-box-sizing fl" placeholder="填写您的真实姓名" value="<%= @user.lastname+@user.firstname %>">
<input type="checkbox" id="show_realname" name="show_realname" class="fl magic-checkbox" value="1" <%= User.current.show_realname ? '' : 'checked' %>>
<span class="color-orange fl hint none" id="lastname_hint" style="margin-left:20px;"><i class="fa fa-exclamation-circle mr5"></i>请填写真实姓名</span>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18">性别:</label>
<span class="fl mt3 mr15">
<input id="sex_0" type="radio" class="magic-radio" name="sex" value="0" checked>
<label for="sex_0">男</label>
</span>
<span class="fl mt3">
<input id="sex_1" type="radio" class="magic-radio" name="sex" value="1">
<label for="sex_1">女</label>
</span>
<div class="cl"></div>
</li>
<li class="clearfix mb10 hascontont">
<label class="panel-form-label fl mr18">职业:</label>
<select id="userIdentity" name="identity" required="required" nh_required="1" class="fl input-height mr15 select-width">
<option value="-1" style="display:none">请选择职业</option>
<option value="0">教师</option>
<option value="1">学生</option>
<option value="2">专业人士</option>
</select>
<select id="teacher" name="te_technical_title" nhname="tag_1" nh_tag_0="true" class="fl input-height select-width">
<option value="0" style="display:none">请选择职称</option>
<option value="教授">教授</option>
<option value="副教授">副教授</option>
<option value="讲师">讲师</option>
<option value="助教">助教</option>
</select>
<select id="profession" name="pro_technical_title" nhname="tag_1" nh_tag_2="true" class="fl input-height select-width">
<option value="0" style="display:none">请选择职称</option>
<option value="企业管理者">企业管理者</option>
<option value="部门管理者">部门管理者</option>
<option value="高级工程师">高级工程师</option>
<option value="工程师">工程师</option>
<option value="助理工程师">助理工程师</option>
</select>
<div class="cl"></div>
</li>
<li class="clearfix mb10" id="number">
<label class="panel-form-label fl mr18">学号:</label>
<input type="text" nhname="tag_1" nh_tag_1="true" id="user_student_id" class="input-height task-form-20 panel-box-sizing fl" name="no" value="<%= @user.user_extensions.student_id %>" placeholder="填写您的学号">
<div class="cl"></div>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18">地区:</label>
<select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="fl input-height mr15 select-width">
<option value="0">请选择所在省份</option>
<option value="北京">北京</option>
<option value="上海">上海</option>
<option value="广东">广东</option>
<option value="江苏">江苏</option>
<option value="浙江">浙江</option>
<option value="重庆">重庆</option>
<option value="安徽">安徽</option>
<option value="福建">福建</option>
<option value="甘肃">甘肃</option>
<option value="广西">广西</option>
<option value="贵州">贵州</option>
<option value="海南">海南</option>
<option value="河北">河北</option>
<option value="黑龙江">黑龙江</option>
<option value="河南">河南</option>
<option value="湖北">湖北</option>
<option value="湖南">湖南</option>
<option value="江西">江西</option>
<option value="吉林">吉林</option>
<option value="辽宁">辽宁</option>
<option value="内蒙古">内蒙古</option>
<option value="宁夏">宁夏</option>
<option value="青海">青海</option>
<option value="山东">山东</option>
<option value="山西">山西</option>
<option value="陕西">陕西</option>
<option value="四川">四川</option>
<option value="天津">天津</option>
<option value="新疆">新疆</option>
<option value="西藏">西藏</option>
<option value="云南">云南</option>
<option value="香港">香港特别行政区</option>
<option value="澳门">澳门特别行政区</option>
<option value="台湾">台湾</option>
<option value="海外">海外</option>
</select>
<select id="userCity" class="fl input-height select-width" name="city">
<option value="0">请选择所在城市:</option>
</select>
<div class="cl"></div>
<span class="color-orange fl none" id="province_hint" style="margin-left:20px;"><i class="fa fa-exclamation-circle mr5"></i>请选择你所在的省份/城市</span>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18">单位:</label>
<input nhname="tag" autocomplete="off" maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="school" class="task-form-30 task-height-40 panel-box-sizing fl" type="text" value="<%= @user.user_extensions.school.try(:name) %>" placeholder="在校师生请写所在学校，其它用户填写所在工作单位"/>
<input nhname="tag" nh_tag_4="true" class="fl task-form-30" id="occupation" name="occupation" style="display: none;" type="text" value="<%= @user.user_extensions.school.try(:id) %>"/> <!-- 单位名称的test框选中下拉列表框的id -->
<p id="no_school_hint" class="none fl ml10 mt8">你的单位不在列表中？请点击<a href="javascript:void(0);" class="link-color-blue">申请添加</a></p>
<div class="cl"></div>
<span class="color-orange fl none" id="school_name_hint" style="margin-left:20px;"><i class="fa fa-exclamation-circle mr5"></i>请从下拉列表中选择你的单位</span>
</li>
<li style="margin-left: 10%" class="clearfix mb10">
<input type="text" autocomplete="off" id="department" name="department" class="ml18 task-height-40 panel-box-sizing fl" placeholder="所在学院或者所在部门" value="<%= @user.user_extensions.department.try(:name) %>" style="width: 350px;padding: 5px">
<input nhname="tag" nh_tag_5="true" class="fl ml18" id="department_id" name="department_id" style="display: none;" type="text" value="<%= @user.user_extensions.department.try(:id) %>"/> <!-- 单位名称的test框选中下拉列表框的id -->
<p id="no_department_hint" class="none fl ml10 mt8">你的部门不在列表中？请点击<a href="javascript:void(0);" class="link-color-blue">申请添加</a></p>
<div class="cl"></div>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18">介绍:</label>
<textarea class="task-form-80 task-height-150 panel-box-sizing fl" name="brief_introduction" style="width:82%; resize: none;" placeholder=" 一句话介绍一下自己吧~（最多100个字符）"><%= @user.user_extensions.brief_introduction %></textarea>
<div class="cl"></div>
</li>
</ul>
<% end %>
</div>
<div class="clearfix mt20 mb20" style="border-bottom: 1px solid #ddd;border-top:1px solid #ddd ">
<%= form_tag(my_password_path(:user_id => @user.id),:id => 'my_password_form') do %>
<li class="clearfix mb10 mt30">
<label class="panel-form-label fl mr18">修改密码:</label>
<input id="new_password" type="password" name="new_password" class="input-height task-form-20 panel-box-sizing fl" placeholder="设置8-16位新密码，区分大小写字母">
<i class="fa font-16 ml20" id="user_password_2_check"></i>
<span class="color-orange fl hint none" id="user_password_2_notice" style="margin-left:20px;"> 新密码8-16位，区分大小写字母</span>
</li>
<li class="clearfix mb30">
<label class="panel-form-label fl mr18">确认密码:</label>
<input id="new_password_confirmation" name="new_password_confirmation" type="password" class="input-height task-form-20 panel-box-sizing fl" placeholder="确认密码">
<i class="fa font-16 ml20" id="user_password_3_check"></i>
<span class="color-orange fl hint none" id="user_password_3_notice" style="margin-left:20px;">两次密码输入不一致</span>
</li>
<% end %>
</div>
<div class="clearfix mt20">
<li class="clearfix mb10">
<label class="panel-form-label fl mr18">邮箱地址:</label>
<input type="email" class="input-height task-form-20 panel-box-sizing fl" placeholder="请输入真实有效的邮箱" value="<%= @user.mail %>" id="user_email_addr">
<i class="fa font-16 ml20 " id="user_email_check"></i>
<div class="cl"></div>
<span class="color-orange fl hint none" id="user_email_hint" style="margin-left:12%;"><i class="fa fa-exclamation-circle mr5"></i>邮箱格式不正确</span>
</li>
<li class="clearfix mb25">
<label class="panel-form-label fl mr18">手机号码:</label>
<input type="tel" class="input-height task-form-20 panel-box-sizing fl" placeholder="请输入手机号码" value="<%= @user.phone %>" id="user_phone">
<i class="fa font-16 ml20 " id="user_phone_check"></i>
<div class="cl"></div>
<span class="color-orange fl hint none" id="user_phone_hint" style="margin-left:12%;"><i class="fa fa-exclamation-circle mr5"></i>手机号输入不正确</span>
</li>
<li class="clearfix mb20" style="margin-right:41px;">
<a href="javascript:void(0);" id="my_account_form_link" class="task-btn task-btn-blue fr">保存</a>
<a href="javascript:void(0);" onclick="cancel_edit_account();" class="task-btn fr mr10">取消</a>
</li>
</div>
<div id="search_school_result_list" style="width: 330px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display: none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
</div>
<div id="search_department_result_list" style="width: 330px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display: none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
</div>
</div>
<% if !@user.user_extensions.nil? %>
<% province = @user.user_extensions.location %>
<% city = @user.user_extensions.location_city %>
<% identity = @user.user_extensions.identity %>
<% title = @user.user_extensions.technical_title %>
<% language = @user.language %>
<% else %>
<% province = "湖南省" %>
<% city = "长沙" %>
<% identity = "" %>
<% title = "" %>
<% language = "" %>
<% end %>
<script type="text/javascript">
function apply_add_school() {
var htmlvalue = "<%= escape_javascript(render :partial => 'my/apply_add_school')%>";
pop_box_new(htmlvalue, 575, 465);
$("#schoolname").val($("input[name='school']").val());
}
function apply_add_department() {
if ($("#schoolname").val() == "") {
$("#school_name_hint").show();
} else {
var htmlvalue = "<%= escape_javascript(render :partial => 'my/apply_add_department')%>";
pop_box_new(htmlvalue, 575, 465);
$("#schoolname").html($("input[name='school']").val());
$("#school_id").val($("input[name='occupation']").val());
$("#department_name").val($("input[name='department']").val());
}
}
var d_lastSearchCondition = '';
var d_page = 1; //唯一控制页码 变量
var d_count = 0; //查询结果的总量
var d_maxPage = 0;//最大页面值
$(function () {
$("#search_department_result_list").scroll(function (e) {
d_nScrollHight = $(this)[0].scrollHeight;
d_nScrollTop = $(this)[0].scrollTop;
var nDivHight = $(this).height();
if (d_nScrollTop + nDivHight >= d_nScrollHight) //到底部了，
{
//判断页码是否是最大值，如果是的，就不去请求了
if (page >= maxPage) {
return;
} else { //如果不是，那就请求下一页，请求数据处理
page++;
$.ajax({
url: '<%= url_for(:controller => 'department',:action => 'on_search') %>' + '?name=' + $("input[name='department']").val() + '&school_id=' + $("input[name='occupation']").val() + '&page=' + page,
type: 'post',
success: function (data) {
d_schoolsResult = data.departments;
if (d_schoolsResult.length != undefined && d_schoolsResult.length != 0) {
var i = 0;
for (; i < d_schoolsResult.length; i++) {
link = '<a onclick="window.changeDepValue(\'' + d_schoolsResult[i].department.name.replace(/\s/g, " ") + '\',\'' + d_schoolsResult[i].department.id + '\')" href="javascript:void(0)">' + d_schoolsResult[i].department.name + '</a><br/>';
$("#search_department_result_list").append(link);
}
} else {
}
}
});
}
}
});
//查询学校
$("input[name='department']").on('input', function (e) {
throttle(department_search_fn, window, e);
});
function throttle(method, context, e) {
clearTimeout(method.tId);
method.tId = setTimeout(function () {
method.call(context, e);
}, 500);
}
function department_search_fn(e) {
if ($(e.target).val().trim() == d_lastSearchCondition && $(e.target).val().trim() != '') {//如果输入框没有改变或者输入框为空就返回
return;
}
$("input[name='department_id']").val(''); //一旦有输入就清空id。
d_lastSearchCondition = $(e.target).val().trim();
page = 1; //有新的搜索，页面重置为1
$.ajax({
url: '<%= url_for(:controller => 'department',:action => 'on_search') %>' + '?name=' + e.target.value + '&school_id=' + $("input[name='occupation']").val() + '&page=' + d_page,
type: 'post',
success: function (data) {
d_schoolsResult = data.departments;
count = data.count;
maxPage = Math.ceil(count / 100); //最大页码值
if (d_schoolsResult.length != undefined && d_schoolsResult.length != 0) {
var i = 0;
$("#search_department_result_list").html('');
for (; i < d_schoolsResult.length; i++) {
link = '<a onclick="window.changeDepValue(\'' + d_schoolsResult[i].department.name.replace(/\s/g, " ") + '\',\'' + d_schoolsResult[i].department.id + '\')" href="javascript:void(0)">' + d_schoolsResult[i].department.name + '</a><br/>';
$("#search_department_result_list").append(link);
}
$("#search_department_result_list").css('left', $(e.target).offset().left);
$("#search_department_result_list").css('top', $(e.target).offset().top + 40);
$("#search_department_result_list").css("position", "absolute");
$("#search_department_result_list").show();
} else {
$("#search_department_result_list").html('');
str = e.target.value.length > 4 ? e.target.value.substr(0, 4) + "..." : e.target.value;
$("#no_department_hint").html('你的学院/部门不在列表中？请点击<a class="link-color-blue" onclick="apply_add_department();" href="javascript:void(0);">申请添加</a>');
$("#no_department_hint").show();
}
}
});
}
$(document.body).click(function (e) {
if ($(e.target).attr("id") != 'search_department_result_list' && $(e.target).attr("id") != 'department') {
$("#search_department_result_list").hide();
}
});
$("input[name='department']").on('focus', function (e) {
if ($("input[name='department_id']").val() != '') { //如果已经有id了。肯定存在，不用去找了。
return;
}
$.ajax({
url: '<%= url_for(:controller => 'department',:action => 'on_search') %>' + '?name=' + e.target.value + '&school_id=' + $("input[name='occupation']").val() + '&page=' + page,
type: 'post',
success: function (data) {
schoolsResult = data.departments;
count = data.count;
maxPage = Math.ceil(count / 100); //最大页码值
if (schoolsResult.length != undefined && schoolsResult.length != 0) {
var i = 0;
$("#search_department_result_list").html('');
for (; i < schoolsResult.length; i++) {
link = '<a onclick="window.changeDepValue(\'' + schoolsResult[i].department.name.replace(/\s/g, " ") + '\',\'' + schoolsResult[i].department.id + '\')" href="javascript:void(0)">' + schoolsResult[i].department.name + '</a><br/>';
$("#search_department_result_list").append(link);
}
$("#search_department_result_list").css('left', $(e.target).offset().left);
$("#search_department_result_list").css('top', $(e.target).offset().top + 40);
$("#search_department_result_list").css("position", "absolute");
$("#search_department_result_list").show();
} else {
$("#search_department_result_list").html('');
str = e.target.value.length > 4 ? e.target.value.substr(0, 4) + "..." : e.target.value;
$("#no_department_hint").html('你的学院/部门不在列表中？请点击<a class="link-color-blue" onclick="apply_add_department();" href="javascript:void(0);">申请添加</a>');
$("#no_department_hint").show();
}
}
});
});
var lastSearchCondition = '';
var page = 1; //唯一控制页码 变量
var count = 0; //查询结果的总量
var maxPage = 0;//最大页面值
$(function () {
$("#search_school_result_list").scroll(function (e) {
nScrollHight = $(this)[0].scrollHeight;
nScrollTop = $(this)[0].scrollTop;
var nDivHight = $(this).height();
if (nScrollTop + nDivHight >= nScrollHight) //到底部了，
{
//判断页码是否是最大值，如果是的，就不去请求了
if (page >= maxPage) {
return;
} else { //如果不是，那就请求下一页，请求数据处理
page++;
$.ajax({
url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + $("input[name='school']").val() + '&page=' + page,
type: 'post',
success: function (data) {
schoolsResult = data.schools;
if (schoolsResult.length != undefined && schoolsResult.length != 0) {
var i = 0;
for (; i < schoolsResult.length; i++) {
link = '<a onclick="window.changeValue(\'' + schoolsResult[i].school.name.replace(/\s/g, " ") + '\',\'' + schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + schoolsResult[i].school.name + '</a><br/>';
$("#search_school_result_list").append(link);
}
} else {
}
}
});
}
}
});
//查询学校
$("input[name='school']").on('input', function (e) {
throttle(shcool_search_fn, window, e);
});
function throttle(method, context, e) {
clearTimeout(method.tId);
method.tId = setTimeout(function () {
method.call(context, e);
}, 500);
}
function shcool_search_fn(e) {
if ($(e.target).val().trim() == lastSearchCondition && $(e.target).val().trim() != '') {//如果输入框没有改变或者输入框为空就返回
return;
}
$("input[name='department']").val('');
$("input[name='department_id']").val('');
$("#search_department_result_list").hide();
$("input[name='occupation']").val(''); //一旦有输入就清空id。
lastSearchCondition = $(e.target).val().trim();
page = 1; //有新的搜索，页面重置为1
$.ajax({
url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value + '&page=' + page,
type: 'post',
success: function (data) {
schoolsResult = data.schools;
count = data.count;
maxPage = Math.ceil(count / 100) //最大页码值
if (schoolsResult.length != undefined && schoolsResult.length != 0) {
var i = 0;
$("#search_school_result_list").html('');
for (; i < schoolsResult.length; i++) {
link = '<a onclick="window.changeValue(\'' + schoolsResult[i].school.name.replace(/\s/g, " ") + '\',\'' + schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + schoolsResult[i].school.name + '</a><br/>';
$("#search_school_result_list").append(link);
}
$("#search_school_result_list").css('left', $(e.target).offset().left);
$("#search_school_result_list").css('top', $(e.target).offset().top + 40);
$("#search_school_result_list").css("position", "absolute");
$("#search_school_result_list").show();
if ($(e.target).val().trim() != '') {
str = e.target.value.length > 8 ? e.target.value.substr(0, 6) + "..." : e.target.value;
$("#no_school_hint").html('找到了' + count + '个包含"' + str + '"的高校（单位）');
$("#no_school_hint").show();
} else {
$("#no_school_hint").hide();
}
} else {
$("#search_school_result_list").html('');
str = e.target.value.length > 4 ? e.target.value.substr(0, 4) + "..." : e.target.value;
$("#no_school_hint").html('你的单位不在列表中？请点击<a class="link-color-blue" onclick="apply_add_school();" href="javascript:void(0);">申请添加</a>');
$("#no_school_hint").show();
}
}
});
}
$(document.body).click(function (e) {
if ($(e.target).attr("id") != 'search_school_result_list' && $(e.target).attr("id") != 'province') {
$("#search_school_result_list").hide();
}
});
// $("input[name='school']").on('focus', function (e) {
// if ($("input[name='occupation']").val() != '') { //如果已经有id了。肯定存在，不用去找了。
// return;
// }
//
// $.ajax({
// url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value + '&page=' + page,
// type: 'post',
// success: function (data) {
// schoolsResult = data.schools;
// count = data.count;
// maxPage = Math.ceil(count / 100); //最大页码值
// if (schoolsResult.length != undefined && schoolsResult.length != 0) {
// var i = 0;
// $("#search_school_result_list").html('');
// for (; i < schoolsResult.length; i++) {
// link = '<a onclick="window.changeValue(\'' + schoolsResult[i].school.name.replace(/\s/g, " ") + '\',\'' + schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + schoolsResult[i].school.name + '</a><br/>';
// $("#search_school_result_list").append(link);
// }
// $("#search_school_result_list").css('left', $(e.target).offset().left);
// $("#search_school_result_list").css('top', $(e.target).offset().top + 40);
// $("#search_school_result_list").css("position", "absolute");
// $("#search_school_result_list").show();
// if ($(e.target).val().trim() != '') {
// str = e.target.value.length > 8 ? e.target.value.substr(0, 6) + "..." : e.target.value;
// $("#no_school_hint").html('找到了' + count + '个包含"' + str + '"的高校（单位）');
// $("#no_school_hint").show();
// } else {
// $("#no_school_hint").hide();
// }
// } else {
// $("#search_school_result_list").html('');
// str = e.target.value.length > 4 ? e.target.value.substr(0, 4) + "..." : e.target.value;
// $("#no_school_hint").html('你的单位不在列表中？请点击<a class="link-color-blue" onclick="apply_add_school();" href="javascript:void(0);">申请添加</a>');
// $("#no_school_hint").show();
// }
// }
// });
// });
});
//地区
var province = "<%= "#{province}" %>";
var city = "<%= "#{city}" %>";
init_province_and_city(document.getElementById('userProvince'), province, document.getElementById('userCity'), city);
//select
var identity = "<%= "#{identity}" %>";
var title = "<%= "#{title}" %>";
var language = "<%= "#{language}" %>";
init_identity_and_title(document.getElementById('userIdentity'), identity, title);
$("#userIdentity").change();
$("input[name='confirm_password']").on('blur',function(){
confirm_password = $("input[name='confirm_password']").val();
password = $("input[name='password']").val();
if(confirm_password != password){
$("#password_hint").css('display','block');
}
});
$("#new_password_confirmation").on("blur",function(){
if($("#new_password").val().length < 8 || $("#new_password").val().length > 16){
$("#user_password_2_check").removeClass("fa-check-circle").removeClass("color-light-green").addClass("fa-times-circle").addClass("color-orange");
$("#user_password_3_check").removeClass("fa-check-circle").removeClass("color-light-green").addClass("fa-times-circle").addClass("color-orange");
$('#user_password_2_notice').show();
} else{
$("#user_password_2_check").removeClass("fa-times-circle").removeClass("color-orange").addClass("fa-check-circle").addClass("color-light-green");
$('#user_password_2_notice').hide();
if($("#new_password").val() != $("#new_password_confirmation").val()) {
$("#user_password_3_check").removeClass("fa-check-circle").removeClass("color-light-green").addClass("fa-times-circle").addClass("color-orange");
$('#user_password_3_notice').show();
} else{
$("#user_password_3_check").removeClass("fa-times-circle").removeClass("color-orange").addClass("fa-check-circle").addClass("color-light-green");
$('#user_password_3_notice').hide();
$("#my_password_form").submit();
}
}
});
$("#user_email_addr").blur(function (event) {
if (/^[a-zA-Z0-9]+([._\\]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){
$('#user_phone_hint').show();
$('#user_phone_notice').show();
$("#user_email_check").removeClass("fa-check-circle").removeClass("color-light-green").addClass("fa-times-circle").addClass("color-orange");
$mail_correct = false;
return ;
}
});
});
</script>

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

@ -22,7 +22,7 @@
<div class="fl with30">
<input type="text" class="fl task-form-100 task-height-40 panel-box-sizing" name="research_contents" placeholder="输入关键字进行搜索">
</div>
<li class="fl task-height-30 mb10 ml35" style="display: inline-block">
<li class="fl task-height-30 mb10 ml10" style="display: inline-block">
<input nhname="tag" autocomplete="off" maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="school" class="task-height-40 panel-box-sizing fl" type="text" placeholder="请输入单位名称关键字进行搜索" style="width: 330px" />
<input nhname="tag" nh_tag_5="true" class="fl" id="school_id" name="school_id" style="display:none;" type="text"/> <!-- 单位名称的test框选中下拉列表框的id -->
<div class="cl"></div>

1
app/views/my/account.js.erb Normal file
View File

@ -0,0 +1 @@
alert("修改成功");

2
app/views/repositories/commits.html.erb
View File

@ -1,4 +1,4 @@
<div class="new_roadmap_conbox mb10 mt15">
<div class="new_roadmap_conbox box_bg_shandow mb10 mt15">
<div class=" clear">
<ul class="reply-container-branch fl" >
<%= render :partial => 'shixun_navigation' %>

2
app/views/repositories/shixun_commit_diff.html.erb
View File

@ -1,4 +1,4 @@
<div class="container-big mt20 mb20" style="width: 100%;">
<div class="container-big box_bg_shandow mt20 mb20" style="width: 100%;">
<div class="new_roadmap_conbox mb10" >
<div class="new_roadmap_info_top clear ">
<%=link_to "<span class='new_roadmap_icons_back mr5'></span>返回提交历史".html_safe,

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

@ -35,10 +35,10 @@
<% end %>
<a href="javascript:void(0);" class="fr shixun-task-ban-btn mr15">已关闭</a>
<% end %>
<%# if @shixun.can_copy && User.current.manager_of_shixun?(@shixun) %>
<% if @shixun.can_copy || User.current.manager_of_shixun?(@shixun) %>
<%#= link_to "复制", copy_shixun_path(@shixun), :class => "fr shixun-task-btn task-btn-green mr15" %>
<!--<a href="javascript:void(0);" onclick="op_confirm_box_loading('<%#= copy_shixun_path(@shixun) %>', '复制将在后台执行</br>平台将为你创建一个新的同名实训和内容，请问是否继续？');" class = "fr shixun-task-btn task-btn-green mr15">复制</a>-->
<%# end %>
<a href="javascript:void(0);" onclick="op_confirm_box_loading('<%= copy_shixun_path(@shixun) %>', '复制将在后台执行</br>平台将为你创建一个新的同名实训和内容，请问是否继续？');" class = "fr shixun-task-btn task-btn-green mr15">复制</a>
<% end %>
<% end %>
<div class="cl"></div>
<% unless User.current.manager_of_shixun?(@shixun) %>

57
app/views/shixuns/_statistics_student_list.html.erb Normal file
View File

@ -0,0 +1,57 @@
<style>
table.panel-new-table tr:hover{background:#EFF9FD}
</style>
<% if @statistics.blank? %>
<div style="background: #fff;padding-bottom: 15px;margin-top:30px;" class="box_bg_shandow bor-grey-e ">
<%= render :partial => "welcome/no_data" %>
</div>
<% else %>
<div class="task-pm-content ">
<div class="task-pm-box mt30 mb30 box_bg_shandow bor-grey-e">
<div class="panel-header clearfix">
<h3 class="fl mt color-black font-16" style=" height:40px;line-height:40px;">学员列表</h3>
</div>
<table class="panel-new-table panel-table-pd15" cellpadding="0" cellspacing="0">
<tbody>
<% @statistics.each do |statistics| %>
<tr>
<td class="" style="display: flex;align-items: center;justify-content: center;">
<!--<img class="picture" src="/images/../images/bigdata/bigdata-logo.png" alt="头像" style="width:36px;height:36px;border-radius:18px;">-->
<%= link_to image_tag(url_to_avatar(statistics.owner), :width => "36", :height => "36", :alt => "头像"), user_path(statistics.owner), :target => '_blank', :class => "", :style => "border-radius:18px;"%>
</td>
<td >
<%= link_to statistics.owner.try(:show_name), user_path(statistics.owner), :class => "panel-table-name hide fl color-grey" %>
</td>
<td><%= format_time(statistics.created_at) %> 开启</td>
<td>
<div style="padding:10px 0;background:#fff;" class="fl mt5">
<div class="panel-slider-bg ">
<span class="panel-slider-inner03 " style = "width:<%= statistics.current_stage*100.to_f / statistics.games.count %>%"></span>
</div>
</div>
<span class="panel-slider-txt fl ml30">挑战至第<%= statistics.current_stage %>关/共<%= statistics.games.count %>关</span>
</td>
<td>
<span class=" mr20">
<% if statistics.total_score == 0 %>
--
<% else %>
<span style="color:#29bd8b;font-weight:bold;" class="font-14"> + <%= statistics.total_score %></span> 经验值
<% end %>
</span>
</td>
</tr>
<% end %>
</tbody>
</table>
<div style="text-align:center;margin-top:20px;margin-bottom:20px;" >
<div class="pages_right_min" style="width:auto; display:inline-block;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @statistic_pages, @statistics_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
</ul>
<div class="cl"></div>
</div>
</div>
</div> 
</div>
<% end %>

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

@ -2,9 +2,9 @@
<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js',
'/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js'%>
<div class="mt30 mb30 box_bg_shandow">
<ul id="tab_nav" style="background:#fff;border-bottom:1px solid #eee;border-top: 1px solid #eee;">
<li id="tab_nav_1" class="tab_hover_setting" onclick="HoverLi(1);">
<a href="javascript:void(0);" class="tab_type">配置</a>
<ul id="tab_nav" style="background:#fff;border-bottom:1px solid #eee;border-top: 1px solid #eee;" class="panel-header">
<li id="tab_nav_1" class="tab_hover_setting" onclick="HoverLi(1);" style = "padding-left:0">
<a href="javascript:void(0);" class="tab_type font-16 color-black">配置</a>
</li>
<!--<li id="tab_nav_2" onclick="HoverLi(2);">-->
<!--<a href="javascript:void(0);" class="tab_type" >版本库</a>-->

5
app/views/shixuns/statistics.html.erb
View File

@ -187,7 +187,7 @@
</div>
<span class="panel-slider-txt fl ml10">第<%= latest_myshixun.current_stage %>关/共<%= latest_myshixun.games.count %>关</span>
</td>
<td><span class=" mr20"><%= sum_myshixun_score(latest_myshixun.id) %>分</span></td>
<td><span class=" mr20"><%= latest_myshixun.games.count %>分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<% end %>
@ -197,3 +197,6 @@
</div>
<% end %>
<script>
console.log("<%= @latest_myshixuns.each_with_index%>")
</script>

199
app/views/shixuns/statistics_students.html.erb
View File

@ -1,197 +1,6 @@
<div class="task-pm-content ">
<div class="task-pm-box mt20 mb20">
<div class="panel-header clearfix">
<h3 class="fl mt5">学员广场</h3>
<div class="fr panel-search">
<input type="text" class="panel-search-input" placeholder="输入学员登录名、姓名进行搜索"/>
<a href="#" class="panel-search-btn"><i class="fa fa-search font-16"></i></a>
</div>
</div>
<table class="panel-new-table panel-table-pd15" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td class="table-num">1</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner03 "></span>
</div>
<span class="panel-slider-txt fl ml10">第3关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">2</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner06 "></span>
</div>
<span class="panel-slider-txt fl ml10">第6关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">3</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner03 "></span>
</div>
<span class="panel-slider-txt fl ml10">第3关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">4</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner06 "></span>
</div>
<span class="panel-slider-txt fl ml10">第6关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">4</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner06 "></span>
</div>
<span class="panel-slider-txt fl ml10">第6关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">4</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner06 "></span>
</div>
<span class="panel-slider-txt fl ml10">第6关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">4</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner06 "></span>
</div>
<span class="panel-slider-txt fl ml10">第6关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">4</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner06 "></span>
</div>
<span class="panel-slider-txt fl ml10">第6关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">4</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner06 "></span>
</div>
<span class="panel-slider-txt fl ml10">第6关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
<tr>
<td class="table-num">4</td>
<td >
<a href="#" class="panel-table-name hide fl">胡莎莎学员 </a>
<span class="ml5 mr5 fl">/</span>
<a href="#" class="panel-table-title hide fl">Helloworld：Java入门实训项目Helloworld：Java入门实训项目</a>
<div class="cl"></div>
</td>
<td>
<div class="panel-slider-bg fl mt15">
<span class="panel-slider-inner06 "></span>
</div>
<span class="panel-slider-txt fl ml10">第6关/共10关</span>
</td>
<td><span class=" mr20">100分</span></td>
<td ><a href="#" class="link-color-grey02 font-14 mr15"><span class="fa-icons-flower mr5"></span>给TA送花</a></td>
</tr>
</tbody>
</table>
<div class="panel-pages ">
<a href="javascript:void(0);" class="pages-big">上一页</a>
<a href="javascript:void(0);" class="active ">1</a>
<a href="javascript:void(0);">2</a>
<a href="javascript:void(0);">3</a>
<a href="javascript:void(0);">...</a>
<a href="javascript:void(0);">31</a>
<a href="javascript:void(0);" class="pages-big">下一页</a>
<div class="cl"></div>
</div>
<div id="statistics_student">
<%= render "statistics_student_list" %>
</div>
</div>
</div>

1
app/views/shixuns/statistics_students.js.erb Normal file
View File

@ -0,0 +1 @@
$("#statistics_student").html('<%= escape_javascript( render :partial => 'shixuns/statistics_student_list') %>');

2
app/views/student_work/_shixun_work_show.html.erb
View File

@ -23,7 +23,7 @@
</ul>
<ul class="fl edu-txt-w240">
<li>通关情况：<%= had_passed_changllenge_num(@shixun, @work.user).to_s+" / "+@shixun.challenges.count.to_s %></li>
<li>总耗时&nbsp;&nbsp;&nbsp;&nbsp;：<%=had_passed_changllenge_num(@shixun, @work.user) > 0 ? game_spend_time(@myshixun.total_spend_time) : '- -' %></li>
<li>&nbsp;&nbsp;总耗时：<%=had_passed_changllenge_num(@shixun, @work.user) > 0 ? game_spend_time(@myshixun.total_spend_time) : '- -' %></li>
</ul>
</div>
<div class="edu-h200-auto" style="max-height:250px;">

6
app/views/student_work/_student_work_score.html.erb
View File

@ -2,16 +2,16 @@
<% show_real_score = @homework.score_open == 1 || @is_teacher || score.student_work.user == User.current || score.user == User.current %>
<div class="comment_item_cont clearfix">
<div class="J_Comment_Face fl">
<%= link_to image_tag(url_to_avatar(show_real_name ? score.user : ""), :width => "50", :height => "50"), show_real_name ? user_path(score.user) : "javascript:void(0)", :target => "_blank" %>
<%= link_to image_tag(url_to_avatar(show_real_name ? score.user : ""), :width => "50", :height => "50"), show_real_name ? user_path(score.user) : "javascript:void(0)", :style => "#{show_real_name ? '' : 'cursor: text;'}", :target => "_blank" %>
</div>
<div class="t_content fl">
<div class="J_Comment_Info">
<div class="t_info clearfix">
<%= link_to show_real_name ? score.user.show_real_name : "匿名", show_real_name ? user_path(score.user) : "javascript:void(0)", :title => show_real_name ? score.user.show_real_name : "匿评用户", :class => "color-grey hide fl" %>
<%= link_to show_real_name ? score.user.show_real_name : "匿名", show_real_name ? user_path(score.user) : "javascript:void(0)", :title => show_real_name ? score.user.show_real_name : "匿评用户", :style => "#{show_real_name ? '' : 'cursor: text;'}", :class => "#{show_real_name ? 'color-grey' : 'color-grey-no-a'} hide fl" %>
<span class="fl mr15 color-grey">（<%= student_work_score_role score%>）</span>
<span class="t_area fl"><%= format_time score.updated_at %></span>
<% unless score.score.nil? %>
<span class="color-light-green fl ml15"><%= show_real_score ? score.score : "**" %></span>分
<span class="color-light-green fl ml15"><%= show_real_score ? score.score : "**" %></span>&nbsp;&nbsp;分
<% end %>
<% if @is_teacher && score.user == User.current && score.reviewer_role != 3 %>
<% scores = User.current.student_works_scores.where("student_work_id = #{score.student_work_id} and reviewer_role != 3").order("created_at desc") %>

8
app/views/student_work/_student_work_score_div.html.erb
View File

@ -1,6 +1,6 @@
<div class="panel-mesbox">
<% if @is_teacher || (@homework.homework_detail_manual.comment_status == 3 && @work.user != User.current ) %>
<%= form_for('new_form', :remote => true, :method => :post, :url => add_score_student_work_path(@work.id),:id=>'add_score_'+@work.id.to_s) do |f| %>
<div class="panel-mesbox mb20">
<%= form_for('new_form', :remote => true, :method => :post, :url => add_score_student_work_path(@work.id),:id=>'add_score_'+@work.id.to_s) do |f| %>
<div class="panel-mes-head clearfix">
<h6 class="fl font-14">全部评阅<span class="ml5" id="student_work_count">(<%= @student_work_scores.count %>)</span></h6>
<!--<p class="fr mr15">-->
@ -51,11 +51,11 @@
</ul>
</div>
<% end %>
</div>
<% end %>
<div class="panel-comment_item mt20" style="border-top:1px solid #eee;" id="score_content_list" >
<div class="panel-comment_item" style="border-top:1px solid #eee;" id="score_content_list" >
<%= render :partial => 'student_work_score_records', :locals => {:student_work_scores => @student_work_scores} %>
</div>
</div>
<script>
var first_click_score = true;

2
app/views/student_work/_work_attachments_status.html.erb
View File

@ -4,7 +4,7 @@
<i class="fa fa-folder color-orange03" aria-hidden="true"></i>
<span title="点击可下载" ><%= link_to_short_attachment attachment,:length=> 58,:class=>"color-orange03", :download => true -%></span>
<span>(<%= number_to_human_size attachment.filesize %>)</span>
<span><%= link_to attachment.author.try(:show_real_name), user_path(attachment.author),:class=>"color-orange03" %></span>
<!--<span><%#= link_to attachment.author.try(:show_real_name), user_path(attachment.author),:class=>"color-orange03" %></span>-->
<span ><%= format_time(attachment.created_on) %></span>
</a>
</li>

2
app/views/student_work/index.html.erb
View File

@ -312,7 +312,7 @@
<span class="color-orange ml30">提交已截止</span>
<% end %>
<% elsif @homework.homework_detail_manual.comment_status == 3%>
<% end_time = @homework.homework_detail_manual.evaluation_end.to_time.to_i + 24*60*60 - 1 %>
<% end_time = @homework.homework_detail_manual.evaluation_end.to_time.to_i %>
<% if end_time >= Time.now.to_i %>
<span class="ml30">匿评剩余时间<span class="color-orange"> <%= (end_time - Time.now.to_i) / (24*60*60)%> 天 <%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%> 小时 <%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%> 分</span></span>
<% else %>

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

@ -1,15 +1,22 @@
<%= javascript_include_tag "/codemirror/lib/codemirror", "/codemirror/mode/javascript/javascript", "/codemirror/addon/edit/matchbrackets.js", "/codemirror/mode/clike/clike" %>
<%= stylesheet_link_tag "/codemirror/lib/codemirror" %>
<div class="edu-class-container">
<p class="mb10"><i class="fa fa-map-marker mr5 color-grey"></i><a href="<%= course_path(@course) %>"><%= @course.name %></a> > <a href="<%= homework_common_index_path(:course => @course.id, :homework_type => @homework.homework_type) %>"><%= @homework.homework_type_ch %>作业</a> >
#<%= link_to (get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1), student_work_index_path(:homework => @homework.id) %> >
<%#= link_to get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1, student_work_index_path(:homework => @homework.id) %>
<a href="<%= student_work_index_path(:homework => @homework.id) %>">#<%= get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1 %></a>
<% if @is_teacher || @work.user == User.current || (@homework.homework_detail_manual.comment_status != 3 && @homework.homework_detail_manual.comment_status != 4) %>
<%= link_to @work.user.try(:show_real_name), user_path(@work.user) %>
<% else %>
匿名
<% end %>
</p>
<% if !@is_teacher && @work.user != User.current && @homework.anonymous_comment == 0 && @homework.homework_detail_manual.comment_status > 3 %>
<div class="alert alert-orange mb15 mt15" style="width: 1180px; margin:20px auto;">
作品匿评已截止
</div>
<% end %>
<div class="edu-con-top clearfix user_bg_shadow bor-grey-e">
<p class="ml15 fl color-grey"><i class="fa fa-lock mr5" ></i><%= @work.name %></p>
<a href="<%= student_work_index_path(:homework => @work.homework_common_id, :tab => 2) %>" class="fr font-12 mr15 mt3 color-grey">返回</a>
@ -45,14 +52,14 @@
</div>
<% if !@work.attachments.where(:attachtype => 7).blank? %>
<% revise_attachment = @work.attachments.where("attachtype = 7").first %>
<div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e" >
<div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e">
<div class="edu-con-top clearfix">
<p class="ml15 font-bd">补交附件</p>
</div>
<div class="edu-tab-con-box">
补交原因：<%= revise_attachment.description %>
</div>
<ul class="pl15 pr15 pb15">
<ul class="pl15 pr15 pb15 clearfix">
<%= render :partial => 'work_attachments_status', :locals => {:attachments => @work.attachments.where("attachtype = 7"), :status => @homework.homework_detail_manual.comment_status} %>
<li class="color-grey font-12"><span class="fr"><%= format_time(revise_attachment.created_on) %> 提交</span></li>
</ul>
@ -121,7 +128,7 @@
</script>
<% end %>
<% unless @work.student_work_tests.blank? %>
<div class="edu-con-bg01 mt15" >
<div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e" >
<div class="edu-con-top clearfix">
<p class="ml15 font-bd">评测历史</p>
</div>
@ -172,7 +179,7 @@
<% end %>
<% end %>
<% end %>
<% if @is_teacher || (@homework.homework_detail_manual.comment_status == 3 && @work.user != User.current ) %>
<% if @is_teacher || (@homework.homework_detail_manual.comment_status == 3 && @work.user != User.current) || !@student_work_scores.blank? %>
<div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e" id="student_work_score_div">
<%= render :partial => 'student_work_score_div' %>
</div>

3
app/views/syllabuses/_syllabus_index.html.erb
View File

@ -2,8 +2,7 @@
<p class="edu-con-top clearfix" style="height: 50px; border: none;">
<a href="<%= syllabuses_path(:type => 1, :tab => @tab) %>" class="fl ml15 edu-filter-cir-grey mr5 font-12 active mt12" data-remote="true" id="syllabuses_processing">正在进行</a>
<a href="<%= syllabuses_path(:type => 2, :tab => @tab) %>" class="fl edu-filter-cir-grey mr5 font-12 mt12" data-remote="true" id="syllabuses_end">已结束</a>
<a href="/courses/new" class="white-btn orange-btn fr font-14 mr30 " style="margin-top:10px">+&nbsp;新建</a>
<a href="/courses/join_private_courses" class="white-btn orange-btn fr mr20 font-14 " style="margin-top:10px" data-method="post" data-remote="true" rel="nofollow" >+&nbsp;加入课堂</a>
</p>
<div id="my_syllabuses">
<%= render :partial => "syllabuses/my_syllabuses" %>

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

@ -15,6 +15,10 @@
<li id="edu-tab-nav-3" class="new-tab-nav">
<%=link_to "我参与的", syllabuses_path(:tab => 3), :class => "tab_type font-16", :remote => true %>
</li>
<li>
<a href="/courses/new" class="white-btn orange-btn fr font-16 " style="margin-top:10px">+&nbsp;新建</a>
<a href="/courses/join_private_courses" class="white-btn orange-btn fr mr20 font-16 " style="margin-top:10px" data-method="post" data-remote="true" rel="nofollow" >+&nbsp;加入课堂</a>
</li>
</ul>
<div class="cl"></div>

12
app/views/users/_user_fans_or_watch.html.erb
View File

@ -5,15 +5,15 @@
<div class="clearfix">
<%= link_to user.show_name, user_path(user), :target => '_blank', :class => "mr15 fl fans-name color-grey3" %>
<% if user.authentication %>
<li class="fl white-icon-ring mr5"><i class="fa fa-user color-light-green" title="已实名认证"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-list-alt u-color-light-red" title="职业认证中"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-user color-light-green" data-tip-down="已实名认证"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-list-alt u-color-light-red" data-tip-down="职业认证中"></i></li>
<% else %>
<% if user.apply_user_authentication.last.try(:status) == 0 %>
<li class="fl white-icon-ring mr5"><i class="fa fa-user u-color-light-red" title="实名认证中"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-list-alt u-color-light-grey" title="还未职业认证"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-user u-color-light-red" data-tip-down="实名认证中"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-list-alt u-color-light-grey" data-tip-down="还未职业认证"></i></li>
<% else %>
<li class="fl white-icon-ring mr5"><i class="fa fa-user u-color-light-grey" title="还未实名认证"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-list-alt u-color-light-grey" title="还未职业认证"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-user u-color-light-grey" data-tip-down="还未实名认证"></i></li>
<li class="fl white-icon-ring mr5"><i class="fa fa-list-alt u-color-light-grey" data-tip-down="还未职业认证"></i></li>
<% end %>
<% end %>
</div>

3
app/views/users/_user_journalsformessage.html.erb
View File

@ -40,7 +40,8 @@
留言时间：<%= format_time(activity.created_on) %>
</div>
<div class="homepagePostDate fl ml15">
更新时间：<%= format_time(PrincipalActivity.where("principal_act_type='#{activity.class}' and principal_act_id =#{activity.id}").first.updated_at) %>
<% update_time = PrincipalActivity.where("principal_act_type='#{activity.class}' and principal_act_id =#{activity.id}").first %>
更新时间：<%= format_time(update_time.try(:updated_at).nil? ? update_time.try(:updated_on) : update_time.try(:updated_at)) %>
</div>
<div class="cl"></div>
<% if activity.user == User.current || User.current.admin?%>

4
app/views/users/search_shixuns_or_courses.html.erb
View File

@ -8,7 +8,7 @@
</div>
<div class="content clearfix" id="intelligence_course_list">
<% if !@course_result.blank? %>
<div class="mh650">
<div class="mh650 mt20">
<% @course_result.each do |sy| %>
<% sy_author = User.find(sy.tea_id) %>
<div class="sub-con fl" style="cursor: default; position:relative">
@ -63,7 +63,7 @@
</div>
<% elsif !@shixuns_result.blank? %>
<% @shixuns_result.each do |shixun| %>
<div class="task-index-list-box fl" style="position: relative">
<div class="task-index-list-box fl" style="position: relative;margin-top:20px;">
<% if shixun.status == 2 %>
<p class="triangle-topright font-12"></p>
<span class="triangle-font">已发布</span>

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

@ -17,7 +17,7 @@
<li id="shixun_challenge" class="new-tab-nav">
<a href="javascript:void(0);" class="tab_type font-16">我挑战的</a>
</li>
<a href="javascript:void(0);" class="white-btn orange-btn fr font-16 mr30" style = "margin-top:8px" onclick="shixun_new(<%= @mail %>)">+&nbsp;新建</a>
<a href="javascript:void(0);" class="white-btn orange-btn fr font-16" style = "margin-top:8px" onclick="shixun_new(<%= @mail %>)">+&nbsp;新建</a>
</ul>
<div class="cl"></div>
<div id="edu-tab-con-1" class="box_bg_shandow">

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

@ -14,7 +14,7 @@
</li>
</ul>
<div id="edu-tab-con-1" class="box_bg_shandow">
<div class="clearfix mt20" id="user_fans_list">
<div class="clearfix " id="user_fans_list">
<%= render :partial => "user_watcher_or_fans_list", :locals => {:users => @user_fanlist, :user_count => @user_fanlist_count, :user_pages => @fans_pages} %>
</div>
</div>

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

@ -14,7 +14,7 @@
</li>
</ul>
<div id="edu-tab-con-1" class="box_bg_shandow mh650">
<div class="clearfix mt20" id="user_watch_list">
<div class="clearfix" id="user_watch_list">
<%= render :partial => "user_watcher_or_fans_list", :locals => {:users => @user_watchlist, :user_count => @user_watchlist_count, :user_pages => @watchlist_pages} %>
</div>
</div>

5
config/routes.rb
View File

@ -210,6 +210,7 @@ RedmineApp::Application.routes.draw do
get 'agree_authentication'
match 'users', :via => [:get, :post]
get 'users_trial'
get 'auto_users_trial'
match 'users_authorization_agree'
match 'users_authorization_cancel'
get 'update_webssh'
@ -238,11 +239,15 @@ RedmineApp::Application.routes.draw do
get 'create_departments'
post 'add_department'
get 'shixun_feedback'
get 'shixun_feedback_message'
get 'leave_message'
get 'messages_list'
match 'update_user',:via=>[:get,:post]
post 'support_shixuns_search'
match 'export_excel', :via => [:get, :post]
get 'add_departments_part'
post 'save_school'
post 'update_user_message'
end
end
# Enable Grack support

8
db/migrate/20170912090828_update_user_id_to_courselists.rb
View File

@ -1,8 +0,0 @@
class UpdateUserIdToCourselists < ActiveRecord::Migration
def up
sql = "update course_lists set user_id = 1 where user_id is null"
end
def down
end
end

8
db/migrate/20170918014832_update_course_lists.rb Normal file
View File

@ -0,0 +1,8 @@
class UpdateCourseLists < ActiveRecord::Migration
def up
CourseList.where("user_id is null").update_all(:user_id => 1)
end
def down
end
end

9
db/migrate/20170922091816_change_copy_from_in_shixuns.rb Normal file
View File

@ -0,0 +1,9 @@
class ChangeCopyFromInShixuns < ActiveRecord::Migration
def up
remove_column :shixuns, :can_copy
add_column :shixuns, :can_copy, :boolean, :default => false
end
def down
end
end

22
db/migrate/20170922112450_sync_publish_game_for_gitlab.rb Normal file
View File

@ -0,0 +1,22 @@
class SyncPublishGameForGitlab < ActiveRecord::Migration
def up
begin
g = Gitlab.client
shixuns = Shixun.where(:status => 2)
shixuns.each do |shixun|
shixun.shixun_members.each do |member|
gid = User.find(member.user_id).try(:gid)
g.edit_team_member(shixun.gpid, gid, 10) # 3代表角色master
end
# 加入超级管理员
admin_gid = User.where(:admin => 1).first.try(:gid)
g.add_team_member(shixun.gpid, admin_gid, 40) # 30代表角色master
end
rescue Exception => e
puts e.message
end
end
def down
end
end

10
db/migrate/20170922114504_add_score_default_value_for_challenge.rb Normal file
View File

@ -0,0 +1,10 @@
class AddScoreDefaultValueForChallenge < ActiveRecord::Migration
def up
challenges = Challenge.where(:score => nil)
challenges.update_all(:score => 100)
change_column :challenges, :score, :integer, :default => 100
end
def down
end
end

2
public/javascripts/application.js
View File

@ -1968,7 +1968,7 @@ function delete_confirm_box(url, str){
pop_box_new(htmlvalue, 300, 140);
}
//点击删除时的确认弹框: 走destroy方法,remote为true
//点击删除时的确认弹框: d走estroy方法,remote为true
function delete_confirm_box_2(url, str){
var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
'<div class="clear mt15"><p class="text_c f14 fontGrey7">' + str + '</p><div class="cl"></div><a href="'+ url +'" class="fr sy_btn_blue mt10" style="margin-right: 92px;" data-method="delete" data-remote="true">确定</a>'+

1
public/javascripts/edu/account.js
View File

@ -520,6 +520,7 @@ $(function(){
$("#user_email_addr").blur(function (event) {
if (/^[a-zA-Z0-9]+([._\\]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){
$('#user_phone_hint').show();
$('#user_phone_notice').html('邮箱地址格式不对');
$('#user_phone_notice').parent().show();
$("#user_email_check").removeClass("fa-check-circle").removeClass("color-light-green").addClass("fa-times-circle").addClass("color-orange");

43
public/javascripts/edu/application.js
View File

@ -53,32 +53,37 @@ $(function(){
LeaveTitle($("[data-tip-left]"),$(".data-tip-right"));
$("[data-tip-down]").live("mouseenter",function(){
var $tool = $(this).attr("data-tip-down");
$(".data-tip-down").show().html($tool);
$desc.show().css({
left:$(this).offset().left -($desc.width()-$(this).outerWidth())/2,
opacity:0.7,
top:$(this).offset().top + $(this).height() +10
});
if($tool != ""){
$(".data-tip-down").show().html($tool);
$desc.show().css({
left:$(this).offset().left -($desc.width()-$(this).width())/2,
opacity:0.7,
top:$(this).offset().top + $(this).height() +10
});
}
});
$("[data-tip-right]").live("mouseenter",function(){
var $tool = $(this).attr("data-tip-right");
$(".data-tip-left").show().html($tool);
$desc.show().css({
left:$(this).offset().left +30,
opacity:0.7,
top:$(this).offset().top-$desc.height()/8
});
if($tool != ""){
$(".data-tip-left").show().html($tool);
$desc.show().css({
left:$(this).offset().left +30,
opacity:0.7,
top:$(this).offset().top-($desc.height()-$(this).height())/2
});
}
});
$("[data-tip-left]").live("mouseenter",function(){
var $tool = $(this).attr("data-tip-left");
$(".data-tip-right").show().html($tool);
$desc.show().css({
left:$(this).offset().left-$desc.width()-10,
opacity:0.7,
top:$(this).offset().top-$desc.height()/8
});
if($tool != ""){
$(".data-tip-right").show().html($tool);
$desc.show().css({
left:$(this).offset().left-$desc.width()-10,
opacity:0.7,
top:$(this).offset().top-($desc.height()-$(this).height())/2
});
}
});
//下拉框
$("[select-for]").append("<i class='fa fa-sort-desc lesson_img color-grey'></i>");
$("[select-for]").hover(function(){

666
public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x.css
View File

@ -1,333 +1,333 @@
/* Focused windows */
.overlay_mac_os_x {
background-color: #85BBEF;
filter:alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
.mac_os_x_nw {
background: transparent url(mac_os_x/TL_Main.png) no-repeat 0 0;
width:24px;
height:30px;
}
.mac_os_x_n {
background: transparent url(mac_os_x/T_Main.png) repeat-x 0 0;
height:30px;
}
.mac_os_x_ne {
background: transparent url(mac_os_x/TR_Main.png) no-repeat 0 0;
width:31px;
height:30px;
}
.mac_os_x_w {
background: transparent url(mac_os_x/L_Main.png) repeat-y top left;
width:16px;
}
.mac_os_x_e {
background: transparent url(mac_os_x/R_Main.png) repeat-y top right;
width:16px;
}
.mac_os_x_sw {
background: transparent url(mac_os_x/BL_Main.png) no-repeat 0 0;
width:31px;
height:40px;
}
.mac_os_x_s {
background: transparent url(mac_os_x/B_Main.png) repeat-x 0 0;
height:40px;
}
.mac_os_x_se, .mac_os_x_sizer {
background: transparent url(mac_os_x/BR_Main.png) no-repeat 0 0;
width:31px;
height:40px;
}
.mac_os_x_sizer {
cursor:se-resize;
}
.mac_os_x_close {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/close.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:25px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_minimize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:45px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_maximize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:65px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_title {
float:left;
height:14px;
font-family: Tahoma, Arial, sans-serif;
font-size:12px;
text-align:center;
margin-top:8px;
width:100%;
color:#000;
}
.mac_os_x_content {
overflow:auto;
color: #222;
font-family: Tahoma, Arial, sans-serif;
font-size: 10px;
background:#FFF;
}
.mac_os_x_s .status_bar {
padding-bottom:24px;
}
/* FOR IE */
* html .mac_os_x_nw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
}
* html .mac_os_x_n {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
}
* html .mac_os_x_ne {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
}
* html .mac_os_x_w {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
}
* html .mac_os_x_e {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
}
* html .mac_os_x_sw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
}
* html .mac_os_x_s {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
}
* html .mac_os_x_se {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
}
* html .mac_os_x_sizer {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
}
/* Focused windows */
.overlay_blur_os_x {
background-color: #85BBEF;
filter:alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
.blur_os_x_nw {
background: transparent url(mac_os_x/TL.png) no-repeat 0 0;
width:24px;
height:30px;
}
.blur_os_x_n {
background: transparent url(mac_os_x/T.png) repeat-x 0 0;
height:30px;
}
.blur_os_x_ne {
background: transparent url(mac_os_x/TR.png) no-repeat 0 0;
width:31px;
height:30px;
}
.blur_os_x_w {
background: transparent url(mac_os_x/L.png) repeat-y top left;
width:16px;
}
.blur_os_x_e {
background: transparent url(mac_os_x/R.png) repeat-y top right;
width:16px;
}
.blur_os_x_sw {
background: transparent url(mac_os_x/BL.png) no-repeat 0 0;
width:31px;
height:40px;
}
.blur_os_x_s {
background: transparent url(mac_os_x/B.png) repeat-x 0 0;
height:40px;
}
.blur_os_x_se, .blur_os_x_sizer {
background: transparent url(mac_os_x/BR.png) no-repeat 0 0;
width:31px;
height:40px;
}
.blur_os_x_sizer {
cursor:se-resize;
}
.blur_os_x_close {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/close.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:25px;
cursor:pointer;
z-index:1000;
}
.blur_os_x_minimize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:45px;
cursor:pointer;
z-index:1000;
}
.blur_os_x_maximize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:65px;
cursor:pointer;
z-index:1000;
}
.blur_os_x_title {
float:left;
height:14px;
font-family: Tahoma, Arial, sans-serif;
font-size:12px;
text-align:center;
margin-top:8px;
width:100%;
color:#000;
}
.blur_os_x_content {
overflow:auto;
color: #222;
font-family: Tahoma, Arial, sans-serif;
font-size: 10px;
background:#FFF;
}
.blur_os_x_s .status_bar {
padding-bottom:24px;
}
/* FOR IE */
* html .blur_os_x_nw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
}
* html .blur_os_x_n {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
}
* html .blur_os_x_ne {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
}
* html .blur_os_x_w {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
}
* html .blur_os_x_e {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
}
* html .blur_os_x_sw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
}
* html .blur_os_x_s {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
}
* html .blur_os_x_se {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
}
* html .blur_os_x_sizer {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
}
/* Focused windows */
.overlay_mac_os_x {
background-color: #85BBEF;
filter:alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
.mac_os_x_nw {
background: transparent url(mac_os_x/TL_Main.png) no-repeat 0 0;
width:24px;
height:30px;
}
.mac_os_x_n {
background: transparent url(mac_os_x/T_Main.png) repeat-x 0 0;
height:30px;
}
.mac_os_x_ne {
background: transparent url(mac_os_x/TR_Main.png) no-repeat 0 0;
width:31px;
height:30px;
}
.mac_os_x_w {
background: transparent url(mac_os_x/L_Main.png) repeat-y top left;
width:16px;
}
.mac_os_x_e {
background: transparent url(mac_os_x/R_Main.png) repeat-y top right;
width:16px;
}
.mac_os_x_sw {
background: transparent url(mac_os_x/BL_Main.png) no-repeat 0 0;
width:31px;
height:40px;
}
.mac_os_x_s {
background: transparent url(mac_os_x/B_Main.png) repeat-x 0 0;
height:40px;
}
.mac_os_x_se, .mac_os_x_sizer {
background: transparent url(mac_os_x/BR_Main.png) no-repeat 0 0;
width:31px;
height:40px;
}
.mac_os_x_sizer {
cursor:se-resize;
}
.mac_os_x_close {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/close.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:25px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_minimize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:45px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_maximize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:65px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_title {
float:left;
height:14px;
font-family: Tahoma, Arial, sans-serif;
font-size:12px;
text-align:center;
margin-top:8px;
width:100%;
color:#000;
}
.mac_os_x_content {
overflow:auto;
color: #222;
font-family: Tahoma, Arial, sans-serif;
font-size: 10px;
background:#FFF;
}
.mac_os_x_s .status_bar {
padding-bottom:24px;
}
/* FOR IE */
* html .mac_os_x_nw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL_Main.png", sizingMethod="crop");
}
* html .mac_os_x_n {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T_Main.png", sizingMethod="scale");
}
* html .mac_os_x_ne {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR_Main.png", sizingMethod="crop");
}
* html .mac_os_x_w {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L_Main.png", sizingMethod="scale");
}
* html .mac_os_x_e {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R_Main.png", sizingMethod="scale");
}
* html .mac_os_x_sw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL_Main.png", sizingMethod="crop");
}
* html .mac_os_x_s {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B_Main.png", sizingMethod="scale");
}
* html .mac_os_x_se {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
}
* html .mac_os_x_sizer {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR_Main.png", sizingMethod="crop");
}
/* Focused windows */
.overlay_blur_os_x {
background-color: #85BBEF;
filter:alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
.blur_os_x_nw {
background: transparent url(mac_os_x/TL.png) no-repeat 0 0;
width:24px;
height:30px;
}
.blur_os_x_n {
background: transparent url(mac_os_x/T.png) repeat-x 0 0;
height:30px;
}
.blur_os_x_ne {
background: transparent url(mac_os_x/TR.png) no-repeat 0 0;
width:31px;
height:30px;
}
.blur_os_x_w {
background: transparent url(mac_os_x/L.png) repeat-y top left;
width:16px;
}
.blur_os_x_e {
background: transparent url(mac_os_x/R.png) repeat-y top right;
width:16px;
}
.blur_os_x_sw {
background: transparent url(mac_os_x/BL.png) no-repeat 0 0;
width:31px;
height:40px;
}
.blur_os_x_s {
background: transparent url(mac_os_x/B.png) repeat-x 0 0;
height:40px;
}
.blur_os_x_se, .blur_os_x_sizer {
background: transparent url(mac_os_x/BR.png) no-repeat 0 0;
width:31px;
height:40px;
}
.blur_os_x_sizer {
cursor:se-resize;
}
.blur_os_x_close {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/close.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:25px;
cursor:pointer;
z-index:1000;
}
.blur_os_x_minimize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/minimize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:45px;
cursor:pointer;
z-index:1000;
}
.blur_os_x_maximize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x/maximize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:65px;
cursor:pointer;
z-index:1000;
}
.blur_os_x_title {
float:left;
height:14px;
font-family: Tahoma, Arial, sans-serif;
font-size:12px;
text-align:center;
margin-top:8px;
width:100%;
color:#000;
}
.blur_os_x_content {
overflow:auto;
color: #222;
font-family: Tahoma, Arial, sans-serif;
font-size: 10px;
background:#FFF;
}
.blur_os_x_s .status_bar {
padding-bottom:24px;
}
/* FOR IE */
* html .blur_os_x_nw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TL.png", sizingMethod="crop");
}
* html .blur_os_x_n {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/T.png", sizingMethod="scale");
}
* html .blur_os_x_ne {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/TR.png", sizingMethod="crop");
}
* html .blur_os_x_w {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/L.png", sizingMethod="scale");
}
* html .blur_os_x_e {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/R.png", sizingMethod="scale");
}
* html .blur_os_x_sw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BL.png", sizingMethod="crop");
}
* html .blur_os_x_s {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/B.png", sizingMethod="scale");
}
* html .blur_os_x_se {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
}
* html .blur_os_x_sizer {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x/BR.png", sizingMethod="crop");
}

320
public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
View File

@ -1,160 +1,160 @@
.overlay_mac_os_x_dialog {
background-color: #FF7224;
filter:alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
.mac_os_x_dialog_nw {
background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;
width:16px;
height:16px;
}
.mac_os_x_dialog_n {
background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;
height:18px;
}
.mac_os_x_dialog_ne {
background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
width:16px;
height:16px;
}
.mac_os_x_dialog_w {
background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;
width:16px;
}
.mac_os_x_dialog_e {
background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;
width:16px;
}
.mac_os_x_dialog_sw {
background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;
width:31px;
height:40px;
}
.mac_os_x_dialog_s {
background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;
height:40px;
}
.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;
width:31px;
height:40px;
}
.mac_os_x_dialog_sizer {
cursor:se-resize;
}
.mac_os_x_dialog_close {
width: 19px;
height: 19px;
background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:25px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_dialog_minimize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:45px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_dialog_maximize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:65px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_dialog_title {
float:left;
height:14px;
font-family: Tahoma, Arial, sans-serif;
font-size:12px;
text-align:center;
margin-top:6px;
width:100%;
color:#000;
}
.mac_os_x_dialog_content {
overflow:auto;
color: #222;
font-family: Tahoma, Arial, sans-serif;
font-size: 10px;
background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;
}
.mac_os_x_dialog_buttons {
text-align: center;
}
/* FOR IE */
* html .mac_os_x_dialog_nw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_ne {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_w {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_e {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_sw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
}
* html .mac_os_x_dialog_s {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_se {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
}
* html .mac_os_x_dialog_sizer {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
}
.overlay_mac_os_x_dialog {
background-color: #FF7224;
filter:alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
.mac_os_x_dialog_nw {
background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;
width:16px;
height:16px;
}
.mac_os_x_dialog_n {
background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;
height:18px;
}
.mac_os_x_dialog_ne {
background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
width:16px;
height:16px;
}
.mac_os_x_dialog_w {
background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;
width:16px;
}
.mac_os_x_dialog_e {
background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;
width:16px;
}
.mac_os_x_dialog_sw {
background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;
width:31px;
height:40px;
}
.mac_os_x_dialog_s {
background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;
height:40px;
}
.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;
width:31px;
height:40px;
}
.mac_os_x_dialog_sizer {
cursor:se-resize;
}
.mac_os_x_dialog_close {
width: 19px;
height: 19px;
background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:25px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_dialog_minimize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:45px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_dialog_maximize {
width: 19px;
height: 19px;
background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;
position:absolute;
top:12px;
left:65px;
cursor:pointer;
z-index:1000;
}
.mac_os_x_dialog_title {
float:left;
height:14px;
font-family: Tahoma, Arial, sans-serif;
font-size:12px;
text-align:center;
margin-top:6px;
width:100%;
color:#000;
}
.mac_os_x_dialog_content {
overflow:auto;
color: #222;
font-family: Tahoma, Arial, sans-serif;
font-size: 10px;
background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;
}
.mac_os_x_dialog_buttons {
text-align: center;
}
/* FOR IE */
* html .mac_os_x_dialog_nw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_ne {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_w {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_e {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_sw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
}
* html .mac_os_x_dialog_s {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
}
* html .mac_os_x_dialog_se {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
}
* html .mac_os_x_dialog_sizer {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
}

328
public/plugin_assets/redmine_code_review/stylesheets/window_js/nuncio.css
View File

@ -1,164 +1,164 @@
.overlay_nuncio img { border: none; }
.overlay_nuncio {
background-color: #666666;
}
.nuncio_nw {
width: 12px;
height: 28px;
background: url(nuncio/top_left.png) no-repeat;
}
.nuncio_n {
background: url(nuncio/top_mid.png) repeat-x;
height: 28px;
}
.nuncio_ne {
width: 21px;
height: 28px;
background: url(nuncio/top_right.png) no-repeat;
}
.nuncio_e {
width: 21px;
background: url(nuncio/center_right.png) repeat-y top right;
}
.nuncio_w {
width: 12px;
background: url(nuncio/center_left.png) repeat-y top left;
}
.nuncio_sw {
width: 12px;
height: 18px;
background: url(nuncio/bottom_left.png) no-repeat;
}
.nuncio_s {
background: url(nuncio/bottom_mid.png) repeat-x 0 0;
height: 18px;
}
.nuncio_se, .nuncio_sizer {
width: 21px;
height: 18px;
background: url(nuncio/bottom_right.png) no-repeat;
}
.nuncio_close {
width: 14px;
height: 14px;
background: url(nuncio/close.png) no-repeat;
position:absolute;
top:10px;
right:22px;
cursor:pointer;
z-index:2000;
}
.nuncio_minimize {
width: 14px;
height: 15px;
background: url(nuncio/minimize.png) no-repeat;
position:absolute;
top:10px;
right:40px;
cursor:pointer;
z-index:2000;
}
.nuncio_title {
float:left;
font-size:11px;
font-weight: bold;
font-style: italic;
color: #fff;
width: 100%
}
.nuncio_content {
background: url(nuncio/overlay.png) repeat;
overflow:auto;
color: #ddd;
font-family: Tahoma, Arial, "sans-serif";
font-size: 10px;
}
.nuncio_sizer {
cursor:se-resize;
}
.top_draggable, .bottom_draggable {
cursor:move
}
/* FOR IE */
* html .nuncio_nw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
}
* html .nuncio_n {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
}
* html .nuncio_ne {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
}
* html .nuncio_w {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
}
* html .nuncio_e {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
}
* html .nuncio_sw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
}
* html .nuncio_s {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
}
* html .nuncio_se {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
}
* html .nuncio_sizer {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
}
* html .nuncio_close {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
}
* html .nuncio_minimize {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
}
.overlay_nuncio img { border: none; }
.overlay_nuncio {
background-color: #666666;
}
.nuncio_nw {
width: 12px;
height: 28px;
background: url(nuncio/top_left.png) no-repeat;
}
.nuncio_n {
background: url(nuncio/top_mid.png) repeat-x;
height: 28px;
}
.nuncio_ne {
width: 21px;
height: 28px;
background: url(nuncio/top_right.png) no-repeat;
}
.nuncio_e {
width: 21px;
background: url(nuncio/center_right.png) repeat-y top right;
}
.nuncio_w {
width: 12px;
background: url(nuncio/center_left.png) repeat-y top left;
}
.nuncio_sw {
width: 12px;
height: 18px;
background: url(nuncio/bottom_left.png) no-repeat;
}
.nuncio_s {
background: url(nuncio/bottom_mid.png) repeat-x 0 0;
height: 18px;
}
.nuncio_se, .nuncio_sizer {
width: 21px;
height: 18px;
background: url(nuncio/bottom_right.png) no-repeat;
}
.nuncio_close {
width: 14px;
height: 14px;
background: url(nuncio/close.png) no-repeat;
position:absolute;
top:10px;
right:22px;
cursor:pointer;
z-index:2000;
}
.nuncio_minimize {
width: 14px;
height: 15px;
background: url(nuncio/minimize.png) no-repeat;
position:absolute;
top:10px;
right:40px;
cursor:pointer;
z-index:2000;
}
.nuncio_title {
float:left;
font-size:11px;
font-weight: bold;
font-style: italic;
color: #fff;
width: 100%
}
.nuncio_content {
background: url(nuncio/overlay.png) repeat;
overflow:auto;
color: #ddd;
font-family: Tahoma, Arial, "sans-serif";
font-size: 10px;
}
.nuncio_sizer {
cursor:se-resize;
}
.top_draggable, .bottom_draggable {
cursor:move
}
/* FOR IE */
* html .nuncio_nw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_left.png", sizingMethod="crop");
}
* html .nuncio_n {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_mid.png", sizingMethod="scale");
}
* html .nuncio_ne {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/top_right.png", sizingMethod="crop");
}
* html .nuncio_w {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_left.png", sizingMethod="scale");
}
* html .nuncio_e {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/center_right.png", sizingMethod="scale");
}
* html .nuncio_sw {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_left.png", sizingMethod="crop");
}
* html .nuncio_s {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_mid.png", sizingMethod="scale");
}
* html .nuncio_se {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
}
* html .nuncio_sizer {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/bottom_right.png", sizingMethod="crop");
}
* html .nuncio_close {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/close.png", sizingMethod="crop");
}
* html .nuncio_minimize {
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/nuncio/minimize.png", sizingMethod="crop");
}

216
public/plugin_assets/redmine_code_review/stylesheets/window_js/spread.css
View File

@ -1,108 +1,108 @@
.overlay_spread {
background-color: #85BBEF;
filter:alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
.spread_nw {
background: transparent url(spread/left-top.gif) no-repeat 0 0;
width:10px;
height:25px;
}
.spread_n {
background: transparent url(spread/top-middle.gif) repeat-x 0 0;
height:25px;
}
.spread_ne {
background: transparent url(spread/right-top.gif) no-repeat 0 0;
width:10px;
height:25px;
}
.spread_w {
background: transparent url(spread/frame-left.gif) repeat-y top left;
width:7px;
}
.spread_e {
background: transparent url(spread/frame-right.gif) repeat-y top right;
width:7px;
}
.spread_sw {
background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0;
width:7px;
height:7px;
}
.spread_s {
background: transparent url(spread/bottom-middle.gif) repeat-x 0 0;
height:7px;
}
.spread_se, .spread_sizer {
background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0;
width:7px;
height:7px;
}
.spread_sizer {
cursor:se-resize;
}
.spread_close {
width: 23px;
height: 23px;
background: transparent url(spread/button-close-focus.gif) no-repeat 0 0;
position:absolute;
top:0px;
right:11px;
cursor:pointer;
z-index:1000;
}
.spread_minimize {
width: 23px;
height: 23px;
background: transparent url(spread/button-min-focus.gif) no-repeat 0 0;
position:absolute;
top:0px;
right:55px;
cursor:pointer;
z-index:1000;
}
.spread_maximize {
width: 23px;
height: 23px;
background: transparent url(spread/button-max-focus.gif) no-repeat 0 0;
position:absolute;
top:0px;
right:33px;
cursor:pointer;
z-index:1000;
}
.spread_title {
float:left;
height:14px;
font-family: Tahoma, Arial, sans-serif;
font-size:14px;
font-weight:bold;
text-align:left;
margin-top:2px;
width:100%;
color:#E47211;
}
.spread_content {
overflow:auto;
color: #222;
font-family: Tahoma, Arial, sans-serif;
font-size: 10px;
background:#A9EA00;
}
.overlay_spread {
background-color: #85BBEF;
filter:alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
.spread_nw {
background: transparent url(spread/left-top.gif) no-repeat 0 0;
width:10px;
height:25px;
}
.spread_n {
background: transparent url(spread/top-middle.gif) repeat-x 0 0;
height:25px;
}
.spread_ne {
background: transparent url(spread/right-top.gif) no-repeat 0 0;
width:10px;
height:25px;
}
.spread_w {
background: transparent url(spread/frame-left.gif) repeat-y top left;
width:7px;
}
.spread_e {
background: transparent url(spread/frame-right.gif) repeat-y top right;
width:7px;
}
.spread_sw {
background: transparent url(spread/bottom-left-c.gif) no-repeat 0 0;
width:7px;
height:7px;
}
.spread_s {
background: transparent url(spread/bottom-middle.gif) repeat-x 0 0;
height:7px;
}
.spread_se, .spread_sizer {
background: transparent url(spread/bottom-right-c.gif) no-repeat 0 0;
width:7px;
height:7px;
}
.spread_sizer {
cursor:se-resize;
}
.spread_close {
width: 23px;
height: 23px;
background: transparent url(spread/button-close-focus.gif) no-repeat 0 0;
position:absolute;
top:0px;
right:11px;
cursor:pointer;
z-index:1000;
}
.spread_minimize {
width: 23px;
height: 23px;
background: transparent url(spread/button-min-focus.gif) no-repeat 0 0;
position:absolute;
top:0px;
right:55px;
cursor:pointer;
z-index:1000;
}
.spread_maximize {
width: 23px;
height: 23px;
background: transparent url(spread/button-max-focus.gif) no-repeat 0 0;
position:absolute;
top:0px;
right:33px;
cursor:pointer;
z-index:1000;
}
.spread_title {
float:left;
height:14px;
font-family: Tahoma, Arial, sans-serif;
font-size:14px;
font-weight:bold;
text-align:left;
margin-top:2px;
width:100%;
color:#E47211;
}
.spread_content {
overflow:auto;
color: #222;
font-family: Tahoma, Arial, sans-serif;
font-size: 10px;
background:#A9EA00;
}

6
public/stylesheets/css/edu-class.css
View File

@ -348,10 +348,10 @@ a:hover.edu-class-inner-list{color:#FF7500!important;}
/* 评分插件 */
.ui-slider{position:relative;width:400px;float:left;margin-right:20px;margin-left:7px;height:14px; margin-top:12px;background:#e2e2e2; }
.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.0em;height:1.2em;top:-.2em;margin-left:-.5em;cursor:pointer;background:#3498db;}
.ui-slider .ui-slider-handle:hover,.ui-slider .ui-slider-handle:focus{background:#3498db;}
.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.0em;height:1.2em;top:-.2em;margin-left:-.5em;cursor:pointer;background:#29bd8b;}
.ui-slider .ui-slider-handle:hover,.ui-slider .ui-slider-handle:focus{background:#29bd8b;}
.ui-slider .ui-slider-handle:active{background-image:none;}
.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;top:0;height:100%;background:#3498db;left:0;}
.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;top:0;height:100%;background:#29bd8b;left:0;}
/* 我的实训我的课堂 20170608byLB */
.edu-class-inner-max a.edu-class-inner-list{ max-width:84%;}

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

@ -56,6 +56,7 @@ a.color-orange05:hover,i.color-orange05:hover{color:#ff7500!important;}
.color-yellow2{color:#ff9933!important;}
.color-light-grey{color:#afafaf!important;}
.color-grey-no-a{color:#888!important;}
.color-grey{color:#888!important;}
.color-grey9{color:#999!important;}
a.color-grey:hover{color: #FF7500!important;}/*a标签，移入变橙色*/
@ -100,7 +101,7 @@ a:hover.link-color-grey03{color:#3498db!important;}
/*通用内外边距*/
.mt-10{ margin-top:-10px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px;}.mt8{ margin-top:8px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}.mt50{ margin-top:50px;}.mt95{ margin-top:95px;}
.mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}.mb40{ margin-bottom: 40px;}.mb50{ margin-bottom: 50px;}
.ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml50{ margin-left: 50px;}.ml75{ margin-left: 75px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml230{ margin-left: 230px;}
.ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml50{ margin-left: 50px;}.ml75{ margin-left: 75px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml230{ margin-left: 230px;}
.mr3{margin-right: 3px}.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr40{margin-right:40px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}
.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}.pt30{ padding-top:30px;}.pt40{ padding-top:40px;}
.pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb30{ padding-bottom:30px;}
@ -278,7 +279,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-pop-table tr td .alink-name{color: #666666!important;}
.edu-pop-table tr td .alink-name{color: #333!important;}
.edu-pop-table tr td .alink-name:hover{color: #FF7500!important;}
.edu-pop-table tr td .alink-operate{color: #cccccc!important;}
.edu-pop-table tr td .alink-operate:hover{color: #FF7500!important;}
@ -443,14 +444,7 @@ input::-ms-clear{display:none;}
.bor-gray-c{border:1px solid #ccc;}
.bor-grey-e{border:1px solid #eee;}
.bor-grey01{border:1px solid #E6EAEB;}
.bor-blue{border:1px solid #5faee3;}/*-------------------------tip样式-------------------------*/
/*.-task-title{opacity:0;position:absolute;left:0;top:0;display:none;}*/
/*.-task-desc-title{background:#000;color:#fff;box-shadow:0px 0px 8px #194a81;max-width:300px;word-wrap: break-word;text-align:center;border-radius:10px;padding:0 10px;}*/
/*.-title-zhixiang{color:#000;position:absolute;display:none;}*/
/*.tip-down{left:50%;top:-13px;margin-left:-3px;}*/
/*.tip-left{left:-4px;top:50%;margin-top:-14px;}*/
/*.tip-right{right:-4px;top:50%;margin-top:-14px;}*/
.bor-blue{border:1px solid #5faee3;}
/*
tip公共样式的设置：
tip整体的背景色的设置在 2、7、10、13行。要统一修改

2
public/stylesheets/css/edu-subject.css
View File

@ -10,7 +10,7 @@
.subject-box{padding: 20px;background: #fff;text-align: center;position: relative;}
.unit-name{line-height: 17px;height: 17px;width:196px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.active-class .content .sub-con{width:23.69%;border:1px solid #eee;background:#fff;margin: 0 1.5% 30px 0px;box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);}
.active-class .content .sub-con{box-sizing:border-box;border:1px solid #eee;width:23.87%;background:#fff;margin: 0 1.5% 30px 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 30px 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;}
@-webkit-keyframes bounce-down {

5
public/stylesheets/css/structure.css
View File

@ -539,5 +539,6 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.activities_btn li{flex: 1;height: 50px;line-height: 50px;float: left;text-align: center;border-right: 1px solid #FF7500;}
.activities_btn li:last-child{border: none;}
.activities_btn li:hover{color:#fff!important;background: #FF7500;}
.activities_btn li:hover a{color: #fff!important;}
.activities_btn li:hover .edu-cir-orange{background: #fff;color: #FF7500}
.activities_btn li:hover .color-orange03{color: #fff!important;}
.activities_btn li .edu-cir-orange{color: #fff!important;}
.activities_btn li:hover .edu-cir-orange{background: #fff;color: #FF7500!important;}

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

@ -245,7 +245,7 @@ input.knowledge_frame{height:28px;line-height:28px;border:none;background:#f3f5f
.task-index-list{ width: 1200px;}
.task-index-list-box{ width:23.69%;margin: 0 1.5% 30px 0px; border-radius:2px; border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
.task-index-list-box{box-sizing:border-box; width:23.87%;margin: 0 1.5% 30px 0px; border-radius:2px;border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
.task-index-list-box:hover{-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1; }
.task-index-list-box:nth-child(4n+0) {margin: 0 0 30px 0;}
.task-mg8{ margin:0 15px 15px 0px; border-radius:2px; border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
@ -418,6 +418,13 @@ html>body #ajax-indicator-base { position: fixed; }
.tab-key{background: #494A4C;display: inline; margin: 0 2px; padding: 0 6px;}
.nav_check_item li{padding: 0px 17px!important;}
/*二次回复的提示语的样式*/
.points-data-tip-top{position:absolute;left:100px;top:-30px;opacity:.7;width:150px;height:30px;z-index:9999;display:none;}
.data-tip-top{position:relative;box-shadow:0px 0px 8px #000;background:#000;color:#fff;word-wrap: break-word;
text-align:center;border-radius:4px;padding:0 10px;border:1px solid #000;}
.data-tip-top:after,.data-tip-top:before{position: absolute;content:'';width:0;height:0;left: 45%;bottom:-10px;border-left: 5px solid transparent;
border-right: 5px solid transparent;border-top: 10px solid #000;}
.data-tip-top:before{bottom:-11px;}
/*选择题tab切换*/
.nav_option li{overflow: hidden;width: 110px; text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius: 5px;border-top-left-radius: 5px;border:1px solid #e2e2e2;border-bottom: 0px;color: #FF7500;border-right: none;}
.nav_option li:last-child{border-right: 1px solid #e2e2e2;}