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

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

Conflicts:
	app/controllers/managements_controller.rb
	config/routes.rb
This commit is contained in:
XuCheng642 2017-07-20 14:36:24 +08:00
parent ae5df8e76b 4c73e71e5d
commit b97e935cf8
75 changed files with 678 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/account_controller.rb
View File

@ -453,7 +453,7 @@ class AccountController < ApplicationController
end
def apply_trail
apply_action = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization").first
apply_action = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization", :status => 0).first
if apply_action.blank?
ApplyAction.create(:user_id => User.current.id, :status => 0, :container_type => "TrialAuthorization")
end

2
app/controllers/courses_controller.rb
View File

@ -1658,7 +1658,7 @@ class CoursesController < ApplicationController
def search_not_students
if !params[:search].nil?
members = @course.members.select{|m| m.roles.to_s.include?("Student")}
member_ids = "(" + members.map(&:user_id).join(',') + ")"
member_ids = members.empty? ? "(-1)" : "(" + members.map(&:user_id).join(',') + ")"
condition = "%#{params[:search].strip}%".gsub(" ","")
@users = User.joins(:user_extensions).where("users.id not in #{member_ids} and status = 1 and (LOWER(concat(lastname, firstname)) LIKE '#{condition}' or user_extensions.student_id LIKE '#{condition}')")
end

7
app/controllers/managements_controller.rb
View File

@ -272,6 +272,7 @@ class ManagementsController < ApplicationController
@autu_pages = Paginator.new @autu_count, @limit, params['page'] || 1
@offset ||= @autu_pages.offset
@authorizations = paginateHelper @authorizations, @limit
end
# 批量授权
@ -295,6 +296,12 @@ class ManagementsController < ApplicationController
apply_action.update_attributes(:status => (params[:type] == "1" ? 2 : 1), :reason => params[:reject_reason], :dealer_id => User.current.id)
user_id = User.find_by_sql("select id from users where concat(lastname,firstname) like '%#{search}%'")
@authorizations = ApplyAction.where(:container_type => "TrialAuthorization", :status => 0, :user_id => user_id).includes(:user)
@autu_count = @authorizations.count
@limit = 15
@is_remote = true
@autu_pages = Paginator.new @autu_count, @limit, params['page'] || 1
@offset ||= @autu_pages.offset
@authorizations = paginateHelper @authorizations, @limit
respond_to do |format|
format.js
end

1
app/controllers/my_controller.rb
View File

@ -192,6 +192,7 @@ class MyController < ApplicationController
#changed_login = (@user.login != params[:login])
#changed_mail = (@user.mail != params[:user][:mail])
#@user.safe_attributes = params[:user]
@user.nickname = params[:nickname]
@user.lastname = params[:lastname]
@user.firstname = ""
@user.pref.attributes = params[:pref]

1
app/controllers/shixuns_controller.rb
View File

@ -489,6 +489,7 @@ class ShixunsController < ApplicationController
render_403
return
end
Subject.where(:id => @shixun.stage_shixuns.map(&:subject_id)).destroy_all
@shixun.destroy
respond_to do |format|
format.html{ redirect_to shixuns_managements_path }

19
app/controllers/syllabuses_controller.rb
View File

@ -69,6 +69,7 @@ class SyllabusesController < ApplicationController
@syllabus.major_level = params[:major_level].to_i
@syllabus.discipline_category_id = params[:discipline_category_id].to_i
@syllabus.first_level_discipline_id = params[:first_level_discipline_id].to_i
@syllabus.major_id = params[:major_id].to_i
@syllabus.syllabus_type = params[:syllabus_type].to_i
@syllabus.description = Message.where("id = 19412").first.nil? ? '' : Message.where("id = 19412").first.content
if @syllabus && @syllabus.save
@ -116,6 +117,7 @@ class SyllabusesController < ApplicationController
@syllabus.major_level = params[:major_level].to_i
@syllabus.discipline_category_id = params[:discipline_category_id].to_i
@syllabus.first_level_discipline_id = params[:first_level_discipline_id].to_i
@syllabus.major_id = params[:major_id].to_i
@syllabus.syllabus_type = params[:syllabus_type].to_i
if @syllabus.save
if title != params[:title].to_s.strip
@ -450,6 +452,23 @@ class SyllabusesController < ApplicationController
render :json =>data
end
def get_major
data = {result:0,options:[]}
if params[:first_level_discipline_id]
if Major.where(:first_level_discipline_id => params[:first_level_discipline_id].to_i).count > 0
data[:result] = 1
Major.where(:first_level_discipline_id => params[:first_level_discipline_id].to_i).each do |dis|
option = []
option << dis.name.to_s
option << dis.id
data[:options] << option
end
end
end
render :json =>data
end
private
def find_syllabus
@syllabus = Syllabus.find params[:id]

2
app/controllers/users_controller.rb
View File

@ -1235,7 +1235,7 @@ class UsersController < ApplicationController
#导入作业，确定按钮
def user_select_homework
params[:checkMenu].each do |homework_bank|
homework = HomeworkBank.find_by_id params[:checkMenu]
homework = HomeworkBank.find_by_id homework_bank
@select_course = Course.find params[:select_course]
if homework && @select_course
quote_homework_bank homework, @select_course

15
app/helpers/syllabuses_helper.rb
View File

@ -102,6 +102,21 @@ module SyllabusesHelper
content
end
def syllabus_major_option fir_dis = 213
content = []
option0 = []
option0 << "选择课程所属专业"
option0 << 0
content << option0
Major.where(:first_level_discipline_id => fir_dis).each do |major|
option = []
option << major.name.to_s
option << major.id
content << option
end
content
end
def syllabus_type_option
content = []
option0 = []

2
app/models/game.rb
View File

@ -6,7 +6,7 @@ class Game < ActiveRecord::Base
belongs_to :user
belongs_to :challenge
has_many :outputs, :dependent => :destroy
has_many :test_sets
has_many :test_sets, :dependent => :destroy
has_many :challenge_samples
has_one :game_code, :dependent => :destroy

1
app/models/shixun.rb
View File

@ -17,6 +17,7 @@ class Shixun < ActiveRecord::Base
has_many :homework_commons_shixunses
has_many :challenges, :dependent => :destroy, :order => "challenges.id ASC"
has_many :myshixuns, :dependent => :destroy
has_many :stage_shixuns, :dependent => :destroy
belongs_to :major
belongs_to :major_course
has_many :shixun_major_courses, :dependent => :destroy

7
app/models/syllabus.rb
View File

@ -29,7 +29,8 @@ class Syllabus < ActiveRecord::Base
has_one :praise_tread_cache, as: :object, dependent: :destroy
belongs_to :discipline_category
belongs_to :first_level_discipline
attr_accessible :description, :user_id, :title, :eng_name, :syllabus_type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course, :major_level, :discipline_category_id, :first_level_discipline_id
belongs_to :major
attr_accessible :description, :user_id, :title, :eng_name, :syllabus_type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course, :major_level, :discipline_category_id, :first_level_discipline_id, :major_id
safe_attributes 'title','user', 'description', 'eng_name', 'syllabus_type', 'credit', 'hours', 'theory_hours', 'practice_hours', 'credit', 'applicable_major', 'pre_course', 'major_level', 'discipline_category_id', "first_level_discipline_id"
validates :title, :user_id, presence: true
@ -91,6 +92,10 @@ class Syllabus < ActiveRecord::Base
self.first_level_discipline ? self.first_level_discipline.name : ''
end
def syllabus_major
self.major ? self.major.name : ''
end
###添加回复
def self.add_syllabus_jour(user, notes, id, root_id, options = {})
syllabus = Syllabus.find(id)

8
app/models/user.rb
View File

@ -208,6 +208,7 @@ class User < Principal
has_one :user_wechat
has_one :sso
has_many :apply_user_authentication
# add by zjc
has_one :level, :class_name => 'UserLevels', :dependent => :destroy
@ -647,10 +648,6 @@ class User < Principal
end
end
def nickname(formatter = nil)
login.nil? || (login && login.empty?) ? "AnonymousUser" : login
end
def name(formatter = nil)
login
end
@ -1253,7 +1250,8 @@ class User < Principal
'custom_fields',
'identity_url',
'phone',
'authentication'
'authentication',
'nickname'
safe_attributes 'status',
'auth_source_id',

6
app/services/courses_service.rb
View File

@ -110,7 +110,7 @@ class CoursesService
#双重身份 学生列表中不显示
# unless (params[:role] == '2' && role_ids.length >= 2)
users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender,
users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.nickname, :gender => gender,
:work_unit => work_unit, :mail => m.user.mail, :location => location,
role_name: m.roles.first.name,
name: m.user.show_name,
@ -138,7 +138,7 @@ class CoursesService
work_unit = get_user_work_unit user
location = get_user_location user
roles_ids = m.content.split(",")
reviewers << {:id => user.id, :img_url => img_url, :nickname => user.login, :gender => gender,
reviewers << {:id => user.id, :img_url => img_url, :nickname => user.nickname, :gender => gender,
:work_unit => work_unit, :mail => user.mail, :location => location,
role_name: "",
name: user.show_name,
@ -168,7 +168,7 @@ class CoursesService
work_unit = get_user_work_unit user
location = get_user_location user
roles_ids = messages.content.split(",")
info = {:id => user.id, :img_url => img_url, :nickname => user.login, :gender => gender,
info = {:id => user.id, :img_url => img_url, :nickname => user.nickname, :gender => gender,
:work_unit => work_unit, :mail => user.mail, :location => location,
role_name: "",
name: user.show_name,

4
app/services/projects_service.rb
View File

@ -215,7 +215,7 @@ class ProjectsService
gender = user.user_extensions.gender.nil? ? 0 : user.user_extensions.gender
work_unit = get_user_work_unit user
location = get_user_location user
review_members << {:id => user.id, :img_url => img_url, :nickname => user.login, :gender => gender,
review_members << {:id => user.id, :img_url => img_url, :nickname => user.nickname, :gender => gender,
:work_unit => work_unit, :mail => user.mail, :location => location,
role_name: "",
name: user.show_name,
@ -244,7 +244,7 @@ class ProjectsService
gender = user.user_extensions.gender.nil? ? 0 : user.user_extensions.gender
work_unit = get_user_work_unit user
location = get_user_location user
info = {:id => user.id, :img_url => img_url, :nickname => user.login, :gender => gender,
info = {:id => user.id, :img_url => img_url, :nickname => user.nickname, :gender => gender,
:work_unit => work_unit, :mail => user.mail, :location => location,
role_name: "",
name: user.show_name,

2
app/services/users_service.rb
View File

@ -99,7 +99,7 @@ class UsersService
gender = @user.user_extensions.gender.nil? ? 0 : @user.user_extensions.gender
work_unit = get_user_work_unit @user
location = get_user_location @user
{:id => @user.id, :img_url => img_url,:realname => @user.realname, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
{:id => @user.id, :img_url => img_url,:realname => @user.realname, :nickname => @user.nickname, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
end
#忘记密码

2
app/views/account/apply_trail.js.erb
View File

@ -1 +1 @@
$("body").append('<%= j( render :partial => 'welcome/one_btn_mask_pop', :locals => {:btn => "确定", :tip1 => "申请成功，我们将在一个工作日内完成审核", :url => "javascript:void(0);"}) %>');
$("body").append('<%= j( render :partial => 'welcome/one_btn_mask_pop', :locals => {:btn => "确定", :tip1 => "申请成功，我们将在一个工作日内完成审核", :url => "#{my_account_path()}"}) %>');

9
app/views/account/avatar.html.erb
View File

@ -34,14 +34,19 @@
<div class="fl ">
<div class="avatar-preview preview-lg" id="imageHead">
<%= image_tag(url_to_avatar(@user), :width => 240, :height => 240, :alt => "头像") %>
</div>
<span>尺寸：240*240像素</span>
</div>
<div class="fl ml15">
<div class="avatar-preview preview-md" id="imageHead"></div>
<div class="avatar-preview preview-md" id="imageHead">
<%= image_tag(url_to_avatar(@user), :width => 100, :height => 100, :alt => "头像") %>
</div>
<span>尺寸：100*100像素</span>
<div class="avatar-preview preview-sm" id="imageHead"></div>
<div class="avatar-preview preview-sm" id="imageHead">
<%= image_tag(url_to_avatar(@user), :width => 40, :height => 40, :alt => "头像") %>
</div>
<span>尺寸：40*40像素</span>
</div>
</div>

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

@ -1,7 +1,13 @@
<% if @syllabuses.count > 0 %>
<% @syllabuses.each do | sy | %>
<% sy_author = User.find(sy.tea_id) %>
<div class="sub-con fl" style="cursor: default;">
<div class="sub-con fl pr" style="cursor: default;">
<% unless (sy.is_public == 1 || User.current.admin? || User.current.member_of_course?(sy)) %>
<div class="black-half">
<div class="black-half-lock"><i class="fa fa-lock" style="font-size: 50px"></i></div>
<div class="black-half-info font-16">私有课堂，非成员不能访问</div>
</div>
<% end %>
<% sy_author = User.find(sy.tea_id) %>
<div class="task-index-list-box-top">
<a href="<%= course_path(sy) %>" title="<%= sy.name %>" target="_blank">
<p class="font-14 task-index-list-title two_lines_show">
@ -52,8 +58,23 @@
</div>
</div>
<% else %>
<div class="edu-tab-con-box">
<div class="edu-tab-con-box edu-tab-con-box">
<img src="../images/bigdata/edu-class/edu-nodata.png" class="edu-nodata-img">
<p class="edu-nodata-p mb30">没有数据可以显示！</p>
</div>
<% end %>
<% end %>
<script>
var timer="";
$(".sub-con").hover(function(ev){
this.fn = function(){
$(this).find(".black-half").show();
};
clearTimeout(timer);
var item=$(this);
timer=setTimeout(this.fn(),500);
},function(){
clearTimeout(timer);
$(this).find(".black-half").hide();
})
</script>

1
app/views/courses/search_not_students.js.erb
View File

@ -1,6 +1,7 @@
<% if params[:is_observe] %>
$("#search_not_students_list").html("<%= j(render :partial => 'courses/settings/search_not_students_list') %>");
<% else %>
laststSearchCondition = '';
var htmlvalue = "<%= j(render :partial => 'courses/settings/add_students') %>";
pop_box_new(htmlvalue, 440, 490);
<% end %>

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

@ -1,7 +1,7 @@
<%= javascript_include_tag 'jquery.datetimepicker.js' %>
<div class="stud-class-set">
<div class="set-top mb15 clearfix">
<div class="set-top mb15 clearfix user_bg_shadow">
<span class="fl pl20 font-16">设置</span>
<%= link_to '返回', course_path(@course), :class => 'fr mr15 link-color-grey' %>
</div>
@ -24,7 +24,7 @@
<div class="container">
<!----------------基本信息模块----------------------->
<div class="basic">
<div class="basic user_bg_shadow">
<%= labelled_form_for @course, :html => {:remote => true} do |f| %>
<!-- <div class="top clearfix">
<div class="pic fl">
@ -99,7 +99,7 @@
</div>
<!-----------------成员管理模块-------------------------------->
<div class="member" style="display:none;">
<div class="top mb20">
<div class="top mb20 user_bg_shadow">
<p class="clearfix">
<a href="javascript:void(0);" id="constration" onclick="add_new_group(<%= @course.id %>);" class="task-btn constration task-btn-green">＋ 添加分班</a>
</p>

4
app/views/courses/settings/_members.html.erb
View File

@ -1,10 +1,10 @@
<div class="people clearfix">
<div class="left fl font-16">
<div class="left fl font-16 user_bg_shadow">
<ul id="all_teacher_list_ul">
<%= render :partial => 'courses/settings/all_teacher_list_ul' %>
</ul>
</div>
<div class="right fl">
<div class="right fl user_bg_shadow">
<div class="banner clearfix font-16 teacher_banner" style="border-bottom:1px solid #eee;">
<span class="span1 fl ">成员列表</span>
<span class="span2 fr color-blue">

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

@ -8,7 +8,7 @@
<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
<div class="homepageRight mt0 " style="width:85%; float:left;">
<div class="homepageRightBanner" style="width:973px;">
<div class="homepageRightBanner user_bg_shadow" style="width:973px;">
<div class="NewsBannerName">
<%= get_acts_list_type @type %></div>
<ul class="resourcesSelect">

12
app/views/files/_attachment_history_popub_delete.html.erb
View File

@ -38,11 +38,17 @@
</table>
<div>
<% if @attachment.container_type == "Project" %>
<%= link_to( '删除所有资源', attachment_path(@attachment, :history_delete => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5", :onclick =>"hideModal();") if (is_project_manager?(User.current.id, @attachment.container_id) || User.current.id == @attachment.author_id || User.current.admin?) %>
<%#= link_to( '删除所有资源', attachment_path(@attachment, :history_delete => true), :method => :delete,:class => "fr fontGrey2 mb5 btn", :onclick =>"hideModal();") if (is_project_manager?(User.current.id, @attachment.container_id) || User.current.id == @attachment.author_id || User.current.admin?) %>
<% if (is_project_manager?(User.current.id, @attachment.container_id) || User.current.id == @attachment.author_id || User.current.admin?) %>
<a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= attachment_path(@attachment, :history_delete => true) %>', '本资源有多个版本，你确定要全部删除？')" class="fr fontGrey2 mb5 btn">删除所有资源</a>
<% end %>
<% elsif @attachment.container_type == "Course" %>
<%= link_to( '删除所有资源', attachment_path(@attachment, :history_delete => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5", :onclick =>"hideModal();") if (User.current.allowed_to?(:as_teacher, @attachment.container) || User.current.id == @attachment.author_id || User.current.admin?) %>
<%#= link_to( '删除所有资源', attachment_path(@attachment, :history_delete => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5 btn", :onclick =>"hideModal();") if (User.current.allowed_to?(:as_teacher, @attachment.container) || User.current.id == @attachment.author_id || User.current.admin?) %>
<% if (User.current.allowed_to?(:as_teacher, @attachment.container) || User.current.id == @attachment.author_id || User.current.admin?) %>
<a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= attachment_path(@attachment, :history_delete => true) %>', '本资源有多个版本，你确定要全部删除？')" class="fr fontGrey2 mb5 btn">删除所有资源</a>
<% end %>
<% elsif @attachment.container_type == "OrgSubfield" %>
<%= link_to( '删除所有资源', attachment_path(@attachment, :history => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5", :onclick =>"hideModal();") if (User.current.id == @attachment.author_id || User.current.admin_of_org?(@attachment) || User.current.admin?) %>
<%= link_to( '删除所有资源', attachment_path(@attachment, :history => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5 btn", :onclick =>"hideModal();") if (User.current.id == @attachment.author_id || User.current.admin_of_org?(@attachment) || User.current.admin?) %>
<% end %>
</div>

4
app/views/files/_course_file.html.erb
View File

@ -70,7 +70,7 @@
</script>
<div class="homepageRight mt0 ml10">
<div class="homepageRightBanner">
<div class="homepageRightBanner user_bg_shadow">
<div class="NewsBannerName">资源库</div>
<ul class="resourcesSelect">
<li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
@ -94,7 +94,7 @@
</p>
</div>
<% end %>
<div class="resources mt10 pr" style="padding-bottom:5px;">
<div class="resources mt10 pr user_bg_shadow" style="padding-bottom:5px;">
<div class="reTop mb5">
<%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
<%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>

2
app/views/files/_course_list.html.erb
View File

@ -13,7 +13,7 @@
<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
</ul>
<% else %>
<div class="mt10" style="background-color: #fff;padding-bottom: 10px; margin-left: 7px;">
<div class="mt10 user_bg_shadow" style="background-color: #fff;padding-bottom: 10px; margin-left: 7px;">
<%= render :partial => "welcome/no_data" %>
</div>
<% end %>

2
app/views/files/_resource_detail.html.erb
View File

@ -1,5 +1,5 @@
<% delete_allowed = User.current.allowed_to?(:manage_files, @course) %>
<div class="resources mt10"><!--资源库内容开始--->
<div class="resources mt10 user_bg_shadow"><!--资源库内容开始--->
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>

4
app/views/games/_repository.html.erb
View File

@ -2,7 +2,7 @@
<li id="codetab_nav_1" class="blacktab_hover" onclick="HoverLi_new(1);">
<a href="javascript:void(0);" class="tab_type tab_color" >代码</a>
</li>
<% if @shixun.webssh %>
<% if @myshixun.shixun.try(:webssh) %>
<li id="codetab_nav_2">
<a href="javascript:void(0);" class="tab_type tab_color" >命令行</a>
</li>
@ -80,7 +80,7 @@
return;
}else{
// 测试版
var html = "<iframe src='<%= Redmine::Configuration['webssh'] %>/?Host=" + data.host + "&Port=" + data.port + "&Username=" + data.username + "&Password=" + data.password + "&Gameid=" + data.game_id + "'" + "style='width:100%;border:0;' scrolling='no' id='game_webssh'></iframe>";
var html = "<iframe src='<%= Redmine::Configuration['webssh'] %>/?Host=" + data.host + "&Port=" + data.port + "&Username=" + data.username + "&Password=" + data.password + "&Gameid=" + data.game_id + "'" + " style='width:100%;border:0;' scrolling='no' id='game_webssh'></iframe>";
// 本地版
var html_local ="<iframe src='http://127.0.0.1:9527?Host=106.75.96.108&Port=40054&Username=root&Password=123123&Gameid=" +data.game_id + "'" + " style='width:100%;border:0;' scrolling='no' id='game_webssh'></iframe>";
console.log(html);

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

@ -41,7 +41,9 @@
<% if homework.syllabus_id && homework.syllabus.major_level %>
<% syllabus = homework.syllabus %>
<span class="ml30">
<%= syllabus.syllabus_major_level %> - <%= syllabus.syllabus_discipline_category %> - <%= syllabus.syllabus_first_level_discipline %> - <%= syllabus.title %>
<% str = syllabus.syllabus_major_level + " - " + syllabus.syllabus_discipline_category + " - " + syllabus.syllabus_first_level_discipline %>
<% str += " -" + syllabus.syllabus_major if syllabus.major %>
<%= str + " - " + syllabus.title %>
</span>
<% end %>
</p>

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

@ -1,11 +1,11 @@
<div class="with85 fl">
<div class="ml15">
<div class="ml15 user_bg_shadow">
<div class="edu-con-top clearfix">
<p class="ml15 color-grey fl">作业列表</p>
<% if @is_teacher %>
<a href="javascript:void(0);" onclick="alert_choose_homework_type('<%= @course.id %>');" class="task-btn task-btn-blue fr mr20">新建</a>
<%= link_to("题库选用", user_import_homeworks_user_path(User.current.id, :select_course => @course.id), :class => "edu-btn fr mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") %>
<% end %>
<%= link_to("题库选用", user_import_homeworks_user_path(User.current.id, :select_course => @course.id), :class => "edu-btn fr mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") %>
<!--<a href="<%#= export_course_member_excel_course_path(@course) %>" class="edu-btn fr mr10">导出成绩</a>-->
</div>
<div class="edu-class-innner-conbox">

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

@ -20,7 +20,7 @@
</div>
<div class="edu-class-box">
<div class="edu-class-top clearfix mb20 pr">
<div class="edu-class-top clearfix mb20 pr user_bg_shadow">
<!-- <div class="edu-class-img fl">
<%= image_tag(url_to_avatar(@course),width:"178", height: "100", :id=>'nh_source_tx') %>
</div>

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

@ -16,7 +16,6 @@
</div>
<ul class="fl innner-nav">
<li><%= link_to "项目实训", shixuns_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "课程实训", subjects_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "课堂教学", courses_path, :class => "new-nav-a font-16" %></li>
<!-- <li><%#= link_to "论坛", forums_path, :class =>"new-nav-a", :target => "_blank" %></li>-->
@ -106,11 +105,11 @@
});
$(".inner-nav-user").hover(function(){
$(".color_white").removeClass("fa-sort-down mt10");
$(".color_white").addClass("fa-sort-up mt15");
$(".inner-nav-user i").removeClass("fa-sort-down mt10");
$(".inner-nav-user i").addClass("fa-sort-up mt15");
}, function(){
$(".color_white").removeClass("fa-sort-up mt15");
$(".color_white").addClass("fa-sort-down mt10");
$(".inner-nav-user i").removeClass("fa-sort-up mt15");
$(".inner-nav-user i").addClass("fa-sort-down mt10");
});
$("#header_keyword_search").live("click", function(){

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

@ -19,7 +19,7 @@
<!-- <li><%#= link_to "论坛", forums_path, :class =>"new-nav-a", :target => "_blank" %></li>
<li><%#= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "new-nav-a", :target=>"_blank" %></li>-->
<li><%= link_to "项目实训", shixuns_path, :class => "new-nav-a font-16", :target => "_blank" %></li>
<li><%= link_to "课程实训", subjects_path, :class => "new-nav-a font-16", :target => "_blank" %></li>
<!--<li><%#= link_to "课程实训", subjects_path, :class => "new-nav-a font-16", :target => "_blank" %></li>-->
<li><%= link_to "课堂教学", courses_path, :class => "new-nav-a font-16", :target => "_blank" %></li>
<div class="cl"></div>
</ul>

6
app/views/layouts/base_courses.html.erb
View File

@ -57,15 +57,15 @@
<i class="fa fa-map-marker mr5 color-grey" ></i>
<%= link_to User.current.show_name, user_path(User.current) %> >
<%= link_to '课堂教学', courses_path %> >
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> >
<%= link_to @course.name, course_path(@course), :title => '班级' %>
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> ><%= @course.name%>
<%#= link_to @course.name, course_path(@course), :title => '班级' %>
</p>
<div id="course_info_<%= @course.id %>">
<%= render :partial => 'layouts/course_base_info' %>
</div>
<div class="edu-class-inner mb20 clearfix">
<div class="with15 fl ">
<div class="mb10">
<div class="mb10 user_bg_shadow">
<ul class="edu-class-leftnav">
<li class="clearfix" id="sy_01">
<a href="<%= course_path(@course) %>" class="fl ml15">动态</a>

6
app/views/layouts/base_edu_course.html.erb
View File

@ -27,13 +27,13 @@
<i class="fa fa-map-marker mr5 color-grey" ></i>
<%= link_to User.current.show_name, user_path(User.current) %> >
<%= link_to '课堂教学', courses_path %> >
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> >
<%= link_to @course.name, course_path(@course), :title => '班级' %>
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> ><%= @course.name%>
<%#= link_to @course.name, course_path(@course), :title => '班级' %>
</p>
<% else %>
<p class="mb10">
<i class="fa fa-map-marker mr5 color-grey" ></i>
<%= link_to @course.name, course_path(@course) %> > <span class="color-dark-grey"><%= @curr_page %></span>
<%= link_to @course.name, course_path(@course) %> > <span><%= @curr_page %></span>
</p>
<% end %>
<% if params[:action] != "settings" %>

16
app/views/managements/_shixun_list.html.erb
View File

@ -20,7 +20,7 @@
<td><%= shixun.owner.try(:show_name) %></td>
<td><%= format_time shixun.created_at %></td>
<td class="operate">
<!--<a class="fl" href="<%#= shixun_path(shixun) %>" date-methods="delete" data-remote="true">删除</a>-->
<!-- <a class="fl" href="<%#= shixun_path(shixun) %>" data-method="delete" >删除</a>-->
<% if shixun.status == 0 %>
<%= link_to(l(:button_delete), shixun_path(shixun), :method => :delete, :data => { confirm: "确认删除" } ) %>
<% end %>
@ -52,5 +52,17 @@
data: {sx_order:sx_order},
dateType: "script"
});
})
});
$(".shixun_webssh").on("click", 'input', function(ev){
//console.log($(ev.target));
console.log($(ev.target).parent().find("div").html());
var id = $(ev.target).parent().find("div").html();
console.log($(ev.target).parent().find("input").is(':checked'));
var status = $(ev.target).parent().find("input").is(':checked');
$.ajax({
url:"<%= update_webssh_managements_path %>",
dataType: "script",
data:{shixun_id: id, status: status}
});
});
</script>

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

@ -49,16 +49,4 @@
$("#sx_condition_status").val("u_name");
$("#sx_status").val("");
}
$(".shixun_webssh").on("click", 'input', function(ev){
//console.log($(ev.target));
console.log($(ev.target).parent().find("div").html());
var id = $(ev.target).parent().find("div").html();
console.log($(ev.target).parent().find("input").is(':checked'));
var status = $(ev.target).parent().find("input").is(':checked')
$.ajax({
url:"<%= update_webssh_managements_path %>",
dataType: "script",
data:{shixun_id: id, status: status}
});
});
</script>

95
app/views/my/account.html.erb
View File

@ -24,10 +24,22 @@
<p>您添加新的部门“<%= @d_message.name %>”的申请，经确认为无效的部门信息，已被删除，请重新编辑您的部门资料。谢谢！</p>
<% end %>
</div>
<% if @user.authentication %>
<div class="user_auth_notice mb10">
<i class="fa fa-lightbulb-o font-14 color-yellow"></i>
已通过实名认证和职业认证，实名信息无法再修改，若您的职业信息需要变更，请重新申请<%= link_to "职业认证", authentication_account_path, :class => "link-color-blue" %>
</div>
<% end %>
<div class="panel-form ml30">
<%= labelled_form_for :user, @user, :url => {:action => "account"}, :html => {:id => 'my_account_form', :method => :post} do |f| %>
<% if @user.authentication %>
<ul>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>昵称</label>
<input type="text" id="nickname" name="nickname" maxlength="20" nh_required="1" required="required" class="input-height select-width panel-box-sizing fl" placeholder="请输入昵称，最多20个字符" value="<%= @user.nickname %>">
<div class="cl"></div>
<span class="color-orange fl hint none" id="nickname_hint" style="margin-left:90px;"><i class="fa fa-exclamation-circle mr5"></i>请输入昵称，最多20个字符</span>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>真实姓名</label>
<input type="hidden" id="lastname" name="lastname" maxlength="20" nh_required="1" required="required" class="input-height select-width panel-box-sizing fl" placeholder="填写您的真实姓名" value="<%= @user.lastname+@user.firstname %>">
@ -172,10 +184,15 @@
</ul>
<% else %>
<ul>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>昵称</label>
<input type="text" id="nickname" name="nickname" maxlength="20" nh_required="1" required="required" class="input-height select-width panel-box-sizing fl" placeholder="请输入昵称，最多20个字符" value="<%= @user.nickname %>">
<div class="cl"></div>
<span class="color-orange fl hint none" id="nickname_hint" style="margin-left:90px;"><i class="fa fa-exclamation-circle mr5"></i>请输入昵称，最多20个字符</span>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl mr18"><span class="color-red mr5">*</span>真实姓名</label>
<input type="text" id="lastname" name="lastname" maxlength="20" nh_required="1" required="required" class="input-height select-width panel-box-sizing fl" placeholder="填写您的真实姓名" value="<%= @user.lastname+@user.firstname %>">
<div class="cl"></div>
<span class="color-orange fl hint none" id="lastname_hint" style="margin-left:90px;"><i class="fa fa-exclamation-circle mr5"></i>请填写您的真实姓名</span>
</li>
@ -320,10 +337,49 @@
<div class="cl"></div>
<ul>
<li class="clearfix mb10">
<label class="panel-form-label fl"><span class="color-red mr5">*</span>昵称：</label>
<p class="fl task-bg-grey02 panel-box-sizing "><span class="mr15"><%= @user.try(:nickname) %></span></p>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl"><span class="color-red mr5">*</span>真实姓名：</label>
<p class="fl task-bg-grey02 panel-box-sizing "><span class="mr15"><%= @user.try(:lastname) + @user.try(:firstname) %></span></p>
<p class="fl task-bg-grey02 panel-box-sizing pr">
<span class="fl mr15"><%= @user.try(:lastname) + @user.try(:firstname) %></span>
<% if @user.authentication %>
<span class="account-auth-span color-green">
<span class="fl account-info-span">
<i class="fa fa-user" aria-hidden="true"></i>
</span>
<span class="fl">已实名认证</span>
</span>
<% else %>
<% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id).last %>
<% if apply_auth && apply_auth.status == 0 %>
<span class="account-auth-span color-orange02">
<span class="fl account-info-span">
<i class="fa fa-user" aria-hidden="true"></i>
</span>
<span class="fl">实名认证中</span>
</span>
<% elsif apply_auth && apply_auth.status == 2 %>
<span class="account-auth-span color-orange">
<span class="fl account-info-span">
<i class="fa fa-user" aria-hidden="true"></i>
</span>
<span class="fl">实名认证未通过</span>
</span>
<% else %>
<span class="account-auth-span color-grey">
<span class="fl account-info-span">
<i class="fa fa-user" aria-hidden="true"></i>
</span>
<span class="fl">未实名认证</span>
</span>
<% end %>
<% end %>
</p>
</li>
<li class="clearfix mb10">
<label class="panel-form-label fl"><span class="color-red mr5">*</span>我的性别：</label>
@ -333,24 +389,37 @@
<li class="clearfix mb10">
<label class="panel-form-label fl"><span class="color-red mr5">*</span>职业：</label>
<p class="fl task-bg-grey02 panel-box-sizing">
<p class="fl task-bg-grey02 panel-box-sizing pr">
<%= @user.user_extensions.show_identity %>
<% if @user.authentication %>
<span class="color-green ml20">
<i class="fa fa-check-circle-o" aria-hidden="true"></i>
已认证
</span>
<span class="account-auth-span color-green">
<span class="fl account-info-span">
<i class="fa fa-list-alt" aria-hidden="true"></i>
</span>
<span class="fl">已职业认证</span>
</span>
<% else %>
<% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id).last %>
<% if apply_auth && apply_auth.status == 0 %>
<span class="color-orange ml20">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>
认证中
<span class="account-auth-span color-orange02">
<span class="fl account-info-span">
<i class="fa fa-list-alt" aria-hidden="true"></i>
</span>
<span class="fl">职业认证中</span>
</span>
<% elsif apply_auth && apply_auth.status == 2 %>
<span class="account-auth-span color-orange">
<span class="fl account-info-span">
<i class="fa fa-list-alt" aria-hidden="true"></i>
</span>
<span class="fl">职业认证未通过</span>
</span>
<% else %>
<span class="color-grey ml20">
<i class="fa fa-times-circle-o" aria-hidden="true"></i>
未认证
<span class="account-auth-span color-grey">
<span class="fl account-info-span">
<i class="fa fa-list-alt" aria-hidden="true"></i>
</span>
<span class="fl">未职业认证</span>
</span>
<% end %>
<% end %>

135
app/views/shixuns/_form.html.erb
View File

@ -25,12 +25,16 @@
<div id="shixun_introduction" class="new_li fl" style="margin-bottom: 0px">
<textarea name="shixun[description]"><%= @shixun.description %></textarea>
</div>
<p id="e_tip_in" style="margin-left: 10%" class="c_grey"></p>
<p id="e_tips_in" style="margin-left: 10%" class="c_grey"></p>
</li>
<li class="clearfix mb15">
<label class="panel-form-label fl">预备知识&nbsp;&nbsp;&nbsp;</label>
<div id="shixun_propaedeutics" class="new_li fl" style="margin-left: 0px;">
<textarea name="shixun[propaedeutics]"><%= @shixun.propaedeutics %></textarea>
</div>
<p id="e_tip_pr" style="margin-left: 10%" class="c_grey"></p>
<p id="e_tips_pr" style="margin-left: 10%" class="c_grey"></p>
<div class="cl"></div>
</li>
<li class="clearfix mb15">
@ -42,7 +46,7 @@
<li class="clearfix mb15 pr">
<label class="panel-form-label fl"><span class="color-orange mr5">*</span>适用课程&nbsp;&nbsp;&nbsp;</label>
<div id="shixun[lesson]" class="fl task-form-28 task-height-40 lesson pr">
<input type="text" class="lesson_content" placeholder="选择实训适用的课程">
<input type="text" class="lesson_content" readonly placeholder="选择实训适用的课程">
<i class="fa fa-sort-desc lesson_img"></i>
<ul class="lesson_checkbox" showul="0">
</ul>
@ -60,7 +64,7 @@
</li>
<li class="clearfix">
<a href="javascript:void(0)" class="task-btn task-btn-blue fr" onclick="submit_new_project();">提交</a>
<%= link_to "取消", shixuns_path,:class => "task-btn fr mr10" %>
<%= link_to "取消",user_activities_path(User.current.id),:class => "task-btn fr mr10" %>
</li>
<% end %>
</ul>
@ -171,6 +175,14 @@
};
$(function(){
// md_elocalStorage($("textarea[name='shixun[description]']"),"shixun_in_<%#= User.current.id %>","in");
// md_elocalStorage($("textarea[name='shixun[propaedeutics]']"),"shixun_pr_<%#= User.current.id %>","pr");
//$("textarea[name='shixun[description]']").md_elocalStorage();
// 防止刷新页面后适用课程的下拉列表为空
$("#shixun_major").val("0");
$(".lesson_content").val("");
//多选适用课程
$("body").click(function(event){
$(".lesson_checkbox").hide();
@ -247,4 +259,123 @@
$(".lesson_checkbox").html("");
}
});
// var editor_in;
// var editor_pr;
// function md_elocalStorage(editor,mdu,id){
// if (window.sessionStorage){
// if(id=="in"){
// editor_in = editor;
// } else{
// editor_pr = editor;
// }
// var oc = window.sessionStorage.getItem('content'+mdu);
// if(oc !== null ){
// var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
// $("#e_tips_"+id).html(h);
// }
// setInterval(function() {
// d = new Date();
// var h = d.getHours();
// var m = d.getMinutes();
// var s = d.getSeconds();
// h = h < 10 ? '0' + h : h;
// m = m < 10 ? '0' + m : m;
// s = s < 10 ? '0' + s : s;
// if(editor.val().trim() != ""){
// md_add_data("content",mdu,editor.val());
// var id1 = "#e_tip_"+id;
// var id2 = "#e_tips_"+id;
// $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存 ");
// $(id2).html("");
// }
// },10000);
//
// }else{
// $('.ke-edit').after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
// }
// }
// function md_add_data(k,mdu,d){
// console.log(d);
// window.sessionStorage.setItem(k+mdu,d);
// }
// function md_rec_data(k,mdu,id){
// if(window.sessionStorage.getItem(k+mdu) !== null){
// if(id == "in"){
// editor_in.val(window.sessionStorage.getItem(k+mdu));
// } else{
// editor_pr.val(window.sessionStorage.getItem(k+mdu));
// }
// if(id == "pr"){
// console.log(shixun_propaedeutics);
// /* --------------------------------- 预备知识 -------------------------------------- */
// var shixun_propaedeutics = editormd("shixun_propaedeutics", {
// width : "89.7%",
// height : 300,
// syncScrolling : "single",
// //你的lib目录的路径，我这边用JSP做测试的
// path : "/editormd/lib/",
// tex : true,
// toolbarIcons : function() {
// // Or return editormd.toolbarModes[name]; // full, simple, mini
// // Using "||" set icons align right.
// return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear" ]
// },
// toolbarCustomIcons : {
// testIcon : "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
// testIcon1 : "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
// },
// //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
// saveHTMLToTextarea : true,
// autoFocus: false,
// // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
// dialogMaskOpacity : 0.6,
// placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息",
// imageUpload : true,
// imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
// imageUploadURL : "<%= upload_with_markdown_path(:container_id => @shixun.id, :container_type => @shixun.class) %>" //url
// });
// shixun_propaedeutics.getHTML();
// } else{
// var shixun_editormd = editormd("shixun_introduction", {
// width : "89.7%",
// height : 300,
// syncScrolling : "single",
// //你的lib目录的路径，我这边用JSP做测试的
// path : "/editormd/lib/",
// tex : true,
// toolbarIcons : function() {
// // Or return editormd.toolbarModes[name]; // full, simple, mini
// // Using "||" set icons align right.
// return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear" ]
// },
//
// toolbarCustomIcons : {
// testIcon : "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
// testIcon1 : "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
// },
// //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
// saveHTMLToTextarea : true,
// autoFocus: false,
// // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
// dialogMaskOpacity : 0.6,
// placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息",
// imageUpload : true,
// imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
// imageUploadURL : "<%= upload_with_markdown_path(:container_id => @shixun.id, :container_type => @shixun.class) %>" //url
// });
// shixun_editormd.getHTML();
// }
// md_clear_data(k,mdu,id);
// }
// }
// function md_clear_data(k,mdu,id){
// window.sessionStorage.removeItem(k+mdu);
// var id1 = "#e_tip_"+id;
// var id2 = "#e_tips_"+id;
// if(k == 'content'){
// $(id2).html("");
// }else{
// $(id1).html("");
// }
// }
</script>

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

@ -27,7 +27,7 @@
<li class="clearfix pr">
<label class="panel-form-label fl"><span class="color-orange mr5">*</span>适用课程&nbsp;&nbsp;&nbsp;</label>
<div id="shixun[lesson]" class="fl task-form-28 task-height-40 lesson pr">
<input type="text" class="lesson_content" placeholder="选择实训适用的课程">
<input type="text" class="lesson_content" readonly placeholder="选择实训适用的课程">
<i class="fa fa-sort-desc lesson_img"></i>
<ul class="lesson_checkbox" showul="0">
</ul>

20
app/views/shixuns/_shixun_course_search.html.erb
View File

@ -9,4 +9,22 @@
<label for="course_<%= course.id %>"><%= course.name %></label>
</li>
<% end %>
</ul>
</ul>
<script>
$(function(){
var liwidth=0;
for(var i=0;i<$("#shixun_course_search li").length;i++){
liwidth=liwidth+Number($("#shixun_course_search li").eq(i).width())+40;
}
if(liwidth>Number($("#shixun_course_search").width())*2){
$(".geng_down").show();
}else{
$(".geng_down").hide();
$(".lesson_item").removeClass("more_line_lesson");
$(".lesson_item").removeClass("scroll_lesson");
$(".lesson_item").addClass("two_line_lesson");
}
$(".shou_up").hide();
})
</script>

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

@ -17,7 +17,7 @@
<% if shixun.status < 2 && !User.current.manager_of_shixun?(shixun) %>
<div class="black-half">
<div class="black-half-lock"><i class="fa fa-lock" style="font-size: 50px"></i></div>
<div class="black-half-info font-16">正在编辑中，无法访问</div>
<div class="black-half-info font-16">尚未正式发布，请稍等</div>
</div>
<% end %>
<div class="task-index-list-box-top xy_box" onclick="shixun_link('<%= shixun.identifier %>')" style="cursor: pointer;">

33
app/views/shixuns/index.html.erb
View File

@ -125,7 +125,7 @@
<input type="text" class="searchinput" name="search" placeholder="请输入实训名称的关键字进行搜索"/>
<i class="fa fa-close mr5 color-light-grey" onclick="colse_searchbox();" title="搜索"></i>
</div>
<i class="fa fa-search mr5 color-light-grey search_icon" style="margin:10px" title="搜索"></i>
<i class="fa fa-search mr5 color-light-grey search_icon" onclick="search_shixun()" style="margin:10px" title="搜索"></i>
</div>
</div>
</div>
@ -278,6 +278,37 @@
}
})
});
$(".searchCon").on("keydown", "input[name='search']", function(event){
var target, code, tag;
if (!event) {
event = window.event; //针对ie浏览器
code = event.keyCode;
}
else {
code = event.keyCode;
}
if(code == 13) {
search_shixun();
return false;
}
});
//搜索实训
function search_shixun(){
if($(".searchCon").is(":visible")){
$.ajax({
url: '/shixuns/search',
type: 'post',
data: $("#shixun_index_search_form").serialize(),
remote: true,
success: function(data){
}
});
} else{
$(".searchCon").show();
}
}
//关闭搜索框
function colse_searchbox(){
$('.searchCon').hide();

2
app/views/stages/_edit.html.erb
View File

@ -4,7 +4,7 @@
<li class="fl font-16 font-bd">阶段<span class="font-16 font-bd"><%= @stage.position %></span></li>
<li class="fr">
<a class="task-btn color_white bc-grey del-editstage" onclick="cancel_edit(<%= @stage.id %>);">取消</a>
<a class="course-bth-blue color_white" onclick="saveeidtsatge(this);">保存</a>
<a class="course-bth-blue color_white" onclick="saveeidtsatge();">保存</a>
</li>
</div>
<div class="stage-entry clearfix">

2
app/views/stages/edit.js.erb
View File

@ -2,5 +2,5 @@ var element = document.createElement("div");
$(element).html("<%= j(render :partial => 'stages/edit') %>");
$(element).insertAfter($("#stage_div_<%= @stage.id %>"));
$("#stage_div_<%= @stage.id %>").hide();
$("#sortable").sortable();
$("#sortable").sortable({containment:".stage-item"});
$("#sortable").disableSelection();

23
app/views/subjects/_subject_list.html.erb
View File

@ -14,11 +14,11 @@
</div>
<% else %>
<% @subjects.each do |subject| %>
<div class="sub-con fl" style="cursor: default;">
<div class="sub-con fl pr" style="cursor: default;">
<% if subject.status < 2 && !User.current.manager_of_subject?(subject) %>
<div class="black-half">
<div class="black-half-lock"><i class="fa fa-lock" style="font-size: 50px"></i></div>
<div class="black-half-info font-16">正在编辑中，无法访问</div>
<div class="black-half-info font-16">尚未正式发布，请稍等</div>
</div>
<% end %>
<div class="course-list-index-name" onclick="subject_link(<%= subject.id %>)" style="cursor: pointer;">
@ -31,7 +31,7 @@
</div>
<p class="color-grey college task-text-center">
<% if !subject.user.user_extensions.school_id.blank? && subject.user.user_extensions.school %>
<%= subject.user.user_extensions.school.name %>&nbsp;&nbsp;
<%= subject.user.user_extensions.school.name %>
<% end %>
</p>
<p class="color-grey pl15 pr15 clearfix" style="text-align: center;">
@ -61,4 +61,19 @@
</div>
<% end %>
<% end %>
</div>
</div>
<script>
var timer="";
$(".sub-con").hover(function(ev){
this.fn = function(){
$(this).find(".black-half").show();
};
clearTimeout(timer);
var item=$(this);
timer=setTimeout(this.fn(),500);
},function(){
clearTimeout(timer);
$(this).find(".black-half").hide();
})
</script>

2
app/views/subjects/append_to_stage.js.erb
View File

@ -21,6 +21,6 @@ var html= '<div class="task-index-list-box-all fl pr ui-state-default">' +
'</ul>' +
'</div>';
$("#sortable").append(html);
$("#sortable" ).sortable();
$("#sortable" ).sortable({containment:".stage-item"});
$("#sortable" ).disableSelection();
<% end %>

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

@ -13,7 +13,7 @@
<div class="task-index-list clearfix mb20">
<% stage.stage_shixuns.each_with_index do |stage_shixun, index| %>
<% shixun = stage_shixun.shixun %>
<div class="task-index-list-box fl pr">
<div class="task-index-list-box-all fl pr">
<div class="task-array"><%= index + 1 %></div>
<div class="task-index-list-box-top xy_box" style="cursor: pointer;" onclick="shixun_link('<%= shixun.identifier %>')">
<p class="task-index-list-title two_lines_show">
@ -75,10 +75,26 @@
<% end %>
<script>
var flag = true;
$(function() {
//初始化拖拽层
$( "#sortable" ).sortable();
$( "#sortable" ).sortable({containment:".stage-item"});
$( "#sortable" ).disableSelection();
$("div").on("keydown", "input[name='stage_name']", function(event){
var target, code, tag;
if (!event) {
event = window.event; //针对ie浏览器
code = event.keyCode;
}
else {
code = event.keyCode;
}
if(code == 13) {
saveeidtsatge();
return false;
}
});
});
//编辑列表里右上角的删除icon，删除单个实训
function deleidtstageitem(item){
@ -100,7 +116,7 @@
edithtml+="<li class=\"fl font-16 font-bd\">阶段<span class=\"font-16 font-bd\">"+count+"</span></li>";
edithtml+="<li class=\"fr\">";
edithtml+="<a class=\"task-btn color_white bc-grey mr5 del-editstage\" onclick=\"deleditstage(this);\">删除</a>";
edithtml+="<a class=\"course-bth-blue\" onclick=\"saveeidtsatge(this);\">保存</a>";
edithtml+="<a class=\"course-bth-blue\" onclick=\"saveeidtsatge();\">保存</a>";
edithtml+="</li></div>";
edithtml+="<div class=\"stage-entry clearfix\">";
edithtml+="<li class=\"fl mr10\"><label class=\"stage-name-label\"><span class=\"color-orange mr5\">*</span>名称:</label></li>";
@ -131,7 +147,7 @@
}
//保存
function saveeidtsatge(item){
function saveeidtsatge(){
//判断是否输入阶段名称
var status = true;
var stagename= $("input[name='stage_name']").val();
@ -147,7 +163,8 @@
} else{
$("#sx_none_notice").hide();
}
if(status){
if(status && flag){
flag = false;
$("#new_stage_form").submit();
}
}

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

@ -1,4 +1,4 @@
<div class="edu-tab-con-box" id="sy_des_show_div">
<div class="edu-sy-con-box" id="sy_des_show_div">
<% if @syllabus.des_status == 1 %>
<% if @is_syllabus_admin %>
<a href="javascript:void(0);" id="edit_sy_des" class="link-color-grey fr font-16" title="编辑"><i class="fa fa-edit "></i></a>
@ -13,7 +13,7 @@
还没有<% if @is_syllabus_admin %><a href="javascript:void(0)" id="edit_sy_des_add" class="link-color-blue">添加</a><% else %>添加<% end %>授课大纲 ~ </p>
<% end %>
</div>
<div class="edu-tab-con-box undis" id="sy_des_edit_div">
<div class="edu-sy-con-box undis" id="sy_des_edit_div">
<a href="javascript:void(0)" id="save_sy_des" class="link-color-grey fr font-16" title="保存"><i class="fa fa-floppy-o "></i></a>
<a href="javascript:void(0)" id="cancel_edit_sy_des" class="link-color-grey fr font-16" title="取消"><i class="fa fa-undo mr15"></i></a>
<%= labelled_form_for @syllabus, :url =>update_des_syllabus_path(@syllabus),

2
app/views/syllabuses/_syllabus_homeworks.html.erb
View File

@ -1,4 +1,4 @@
<div class="edu-tab-con-box">
<div class="edu-sy-con-box">
<% if @homework_count == 0 %>
<img src="../images/bigdata/edu-class/edu-nodata.png" width="200" height="" class="edu-nodata-img">
<p class="edu-nodata-p mb30">还没有添加课程题库 ~ </p>

10
app/views/syllabuses/_syllabus_members.html.erb
View File

@ -1,5 +1,5 @@
<% @members.each do |member| %>
<div class="clearfix mb20">
<% @members.each_with_index do |member, index| %>
<div class="sy_member_div clearfix mb20 <%= index > 9 ? 'none' : '' %>">
<% user = member.user %>
<%= link_to image_tag(url_to_avatar(user), :width => "100", :height => "100", :alt => "头像"), user_path(user), :target => '_blank', :class => "fl edu-class-user-img ml15 mr15" %>
<ul class="fl mr15">
@ -25,4 +25,10 @@
</li>
</ul>
</div>
<% if index == 10 %>
<a href="javascript:void(0);" onclick="show_all_members(this)" class="edu-class-right-add color-light-green" style="background:#fff; border-top:1px solid #eee; position: inherit;">
<i class="fa fa-angle-down"></i>
<span>查看全部</span>
</a>
<% end %>
<% end %>

2
app/views/syllabuses/_syllabus_resources.html.erb
View File

@ -1,4 +1,4 @@
<div class="edu-tab-con-box">
<div class="edu-sy-con-box">
<% if @resource_count == 0 %>
<img src="../images/bigdata/edu-class/edu-nodata.png" width="200" height="" class="edu-nodata-img">
<p class="edu-nodata-p mb30">还没有添加课程资源库 ~ </p>

6
app/views/syllabuses/edit.html.erb
View File

@ -33,6 +33,12 @@
<div class="cl"></div>
<span class="color-orange fl none" id="first_level_discipline_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属一级学科</span>
</li>
<li class="clearfix mb20">
<label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>专业名称&nbsp;&nbsp;&nbsp;&nbsp;</label>
<%= select_tag :major_id,options_for_select(syllabus_major_option(@syllabus.first_level_discipline_id),@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
<div class="cl"></div>
<span class="color-orange fl none" id="major_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属专业</span>
</li>
<li class="clearfix mb20">
<label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>课程名称&nbsp;&nbsp;&nbsp;&nbsp;</label>
<input type="text" name="title" maxlength="50" value="&nbsp;<%= @syllabus.title %>" id="new_syllabus_name" class="task-form-80 task-height-40 panel-box-sizing fl" placeholder=" 例如&nbsp;&nbsp;计算机基础">

8
app/views/syllabuses/new.html.erb
View File

@ -29,10 +29,16 @@
</li>
<li class="clearfix mb20">
<label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>一级学科&nbsp;&nbsp;&nbsp;&nbsp;</label>
<%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option,@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"} %>
<%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option,@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"} %>
<div class="cl"></div>
<span class="color-orange fl none" id="first_level_discipline_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属一级学科</span>
</li>
<li class="clearfix mb20">
<label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>专业名称&nbsp;&nbsp;&nbsp;&nbsp;</label>
<%= select_tag :major_id,options_for_select(syllabus_major_option,@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
<div class="cl"></div>
<span class="color-orange fl none" id="major_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属专业</span>
</li>
<li class="clearfix mb20">
<label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>课程名称&nbsp;&nbsp;&nbsp;&nbsp;</label>
<input type="text" name="title" maxlength="50" id="new_syllabus_name" class="task-form-80 task-height-40 panel-box-sizing fl" placeholder=" 例如&nbsp;&nbsp;计算机基础">

10
app/views/syllabuses/show.html.erb
View File

@ -34,6 +34,9 @@
<span class="ml15"><%= @syllabus.syllabus_major_level %></span>
<span class="ml15"><%= @syllabus.syllabus_discipline_category %></span>
<span class="ml15"><%= @syllabus.syllabus_first_level_discipline %></span>
<% if @syllabus.major %>
<span class="ml15"><%= @syllabus.syllabus_major %></span>
<% end %>
<% end %>
<span class="ml15 <%= @syllabus.syllabus_type_str ? '' : 'none' %>"><%= @syllabus.syllabus_type_str %></span></li>
</ul>
@ -106,7 +109,7 @@
</div>
</div>
</div>
<div class="edu-h300-auto " id="syllabus_members_box">
<div class="" id="syllabus_members_box">
<%= render :partial => "syllabus_members" %>
</div>
@ -193,5 +196,10 @@
});
autoUrl('syllabus_description_<%= @syllabus.id %>');
});
function show_all_members(ele){
$(".sy_member_div").show();
$(ele).hide();
}
</script>

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

@ -1,4 +1,4 @@
<div class="resources mt10">
<div class="resources mt10 user_bg_shadow">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>

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

@ -1,4 +1,4 @@
<div class="resources mt10">
<div class="resources mt10 user_bg_shadow">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_path(activity.teacher), :alt => "用户头像" %>

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

@ -1,5 +1,5 @@
<% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
<div class="resources mt10 user_bg_shadow" id="user_activity_<%= user_activity_id%>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>

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

@ -1,4 +1,4 @@
<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
<div class="resources mt10 user_bg_shadow" id="user_activity_<%= user_activity_id%>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>

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

@ -1,4 +1,4 @@
<div class="resources mt10" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
<div class="resources mt10 user_bg_shadow" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author, :host => Setting.host_user), :alt => "用户头像" %>

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

@ -1,4 +1,4 @@
<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
<div class="resources mt10 user_bg_shadow" id="user_activity_<%= user_activity_id%>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author), :alt => "用户头像" %>

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

@ -1,7 +1,7 @@
<% has_commit = has_commit_poll?(activity.id ,User.current)%>
<% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
<% if ( activity.polls_status==2) %>
<div class="resources mt10">
<div class="resources mt10 user_bg_shadow">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->

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

@ -10,7 +10,7 @@
<% @shixuns.each do |shixun| %>
<p class="clearfix pl10">
<a href="<%= shixun_path(shixun) %>" target="_blank" class="font-16 first"><i class="fa fa-circle-o color-orange02 font-12 ml5 mr5" aria-hidden="true"></i><%= shixun.name.strip %></a>
<span class="font-14 hasmargin"><a href="javascript:void(0);" style="cursor: default;">已解锁第<i><%= had_passed_changllenge_count(shixun, User.current) %></i>关/共<i><%= shixun.challenges.count %></i>关</a></span>
<span class="font-14 hasmargin"><a href="javascript:void(0);" style="cursor: default;">已解锁第<i><%= had_passed_changllenge_count(shixun, @user) %></i>关/共<i><%= shixun.challenges.count %></i>关</a></span>
<span class="font-14 hasmargin"><a href="<%= user_path(shixun.user_id) %>" class="link-color-grey03" target="_blank"><%= User.where(:id => shixun.user_id).first.show_name %></a></span>
<span class="font-14 fr mr25 color-grey"><%= format_time shixun.created_at %></span>
<span class="font-14 last cl" style="display: none;">分享&nbsp;&nbsp;<i class="fa fa-weixin font-14 blue" aria-hidden="true"></i></span>

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

@ -70,7 +70,7 @@
<ul class="task-index-list-box-bottom clearfix">
<li><i class="fa fa-gamepad mr5 color-light-green" title="实训任务"></i><span><%= shixun.challenges.count %></span></li>
<li><i class="fa fa-users mr5 color-light-green" title="已开启实训"></i><span><%= shixun.myshixuns.count %></span></li>
<li><i class="fa fa-viacoin mr5 color-light-green" title="实训总积分"></i><span><%= shixun.shixun_score %></span></li>
<li><i class="fa fa-viacoin mr5 color-light-green" title="实训经验值"></i><span><%= shixun.shixun_score %></span></li>
</ul>
</div>
<% end %>

99
app/views/users/show.html.erb
View File

@ -13,7 +13,7 @@
<div class="top cl">
<div class="top-left fl">
<p class="p1 font-16">
<span><%= @user.login %></span>
<span><%= @user.nickname %></span>
<% if @user.user_extensions && @user.user_extensions.gender && @user.user_extensions.gender == 1 %>
<i class="pl20 fa fa-venus color-orange" aria-hidden="true"></i>
<% else %>
@ -22,34 +22,65 @@
</p>
<p class="p2 font-16">
<span class="wordbold">
<%= @user.show_name %> (<%= @user.identity %>)
</span>
<span class="pl20 pr20">
<span class="fl lector"><%= @user.identity %></span>
<span class="fl">
<% if !@user.user_extensions.school_id.blank? && @user.user_extensions.school %>
<%= @user.user_extensions.school.name %>
<% end %>
</span>
<% if @user.authentication %>
<span class="color-green">
<!---<%# if @user.authentication %>
<span class="color-green fl">
<i class="fa fa-check-circle-o" aria-hidden="true"></i>
已认证
</span>
<% else %>
<span class="color-grey">
<%# else %>
<span class="color-grey fl">
<i class="fa fa-times-circle-o" aria-hidden="true"></i>
未认证
</span>
<%# end %>--->
<ul class="fl ml20">
<% if @user.apply_user_authentication.blank? || @user.apply_user_authentication.last.try(:status) == 2 %>
<li class="pr user-info-span" title="还未实名认证">
<i class="fa fa-user u-color-light-grey" aria-hidden="true"></i><!--还未实名认证-->
</li>
<li class="pr user-info-span" title="还未职业认证">
<i class="fa fa-list-alt u-color-light-grey" aria-hidden="true"></i><!--还未职业认证-->
</li>
<% elsif @user.apply_user_authentication.last.try(:status) == 0 %>
<li class="pr user-info-span" title="实名认证中">
<i class="fa fa-user u-color-light-red" aria-hidden="true"></i><!--实名认证中-->
</li>
<li class="pr user-info-span" title="职业认证中">
<i class="fa fa-list-alt u-color-light-red" aria-hidden="true"></i><!--职业认证中-->
</li>
<% elsif @user.apply_user_authentication.last.try(:status) == 1 %>
<li class="pr user-info-span" title="已实名认证">
<i class="fa fa-user color-light-green" aria-hidden="true"></i><!--已实名认证-->
</li>
<li class="pr user-info-span" title="已职业认证">
<i class="fa fa-list-alt color-light-green" aria-hidden="true"></i><!--已职业认证-->
</li>
<% end %>
<span class="pr user-info-span">
<i class="fa fa-user u-color-light-grey" aria-hidden="true"></i><!--还未实名认证-->
</span>
<span class="pr user-info-span">
<i class="fa fa-user u-color-light-red" aria-hidden="true"></i><!--实名认证中-->
</span>
<span class="pr user-info-span">
<i class="fa fa-user color-light-green" aria-hidden="true"></i><!--已实名认证-->
</span>
<% if @user.try(:phone).blank? %>
<li class="pr user-info-span font-16" title="还未绑定手机">
<i class="fa fa-mobile u-color-light-grey" aria-hidden="true"></i><!--还未绑定手机-->
</li>
<% else %>
<li class="pr user-info-span font-16" title="已绑定手机">
<i class="fa fa-mobile color-light-green" aria-hidden="true"></i><!--已绑定手机-->
</li>
<% end %>
<% if @user.try(:mail).blank? %>
<li class="pr user-info-span" title="还未绑定邮箱">
<i class="fa fa-envelope u-color-light-grey" aria-hidden="true"></i><!--还未绑定邮箱-->
</li>
<% else %>
<li class="pr user-info-span" title="已绑定邮箱">
<i class="fa fa-envelope color-light-green" aria-hidden="true"></i><!--已绑定邮箱-->
</li>
<% end %>
</ul>
</p>
</div>
<div class="top-right fr font-14 mr10">
@ -64,8 +95,11 @@
<% update_visiti_count @user %>
<span><%= @user.visits.to_i %></span> 次访问
</p>
<p class="p3">帐户安全：
<p class="p3 font-14">
<span class="mr10 color-grey-6">经验值<span class="ml5 color-orange02"><%= @user.experience %></span></span>
<span class="color-grey-6">金币<span class="ml5 color-orange02"><%= @user.grade %></span></span>
</p>
<!-- <p class="p3">帐户安全：
<a class="<%= @user.phone.blank? ? 'color-grey' : 'color-green' %>" href="<%= security_settings_path %>">
<% if @user.phone.blank? %>
<img class="tubiao1" src="../images/edu_user/edu-cons1.png"/>
@ -81,7 +115,8 @@
<img class="tubiao3" src="../images/edu_user/edu-cons1.png"/>
<% end %>
</a>
</p>
</p>-->
</div>
<% else %>
<div class="itnew">
@ -185,18 +220,18 @@
</div>
</div>
</div>-->
<div class="hascon">
<% str = current_user ? '我' : 'TA' %>
<ul id="edu-user-tab-nav">
<li class="edu-user-tab-hover new-tab-nav">
<a href="javascript:void(0);" class="tab_type font-16"><%= str %>的实训 <%= @shixuns_count %></a>
</li>
</ul>
<div class="hascon">
<% str = current_user ? '我' : 'TA' %>
<ul id="edu-user-tab-nav">
<li class="edu-user-tab-hover new-tab-nav">
<a href="javascript:void(0);" class="tab_type font-16"><%= str %>的实训 <%= @shixuns_count %></a>
</li>
</ul>
<div class="lesson clearfix user_bg_shadow" id="my_shixuns_list">
<%= render :partial => "my_homepage_shixuns_list" %>
</div>
</div>
<div class="lesson clearfix user_bg_shadow" id="my_shixuns_list">
<%= render :partial => "my_homepage_shixuns_list" %>
</div>
</div>
</div>
<div class="passageway mt15" id="user_homepage_course_show">

2
config/locales/navigatiors/zh.yml
View File

@ -63,7 +63,7 @@ zh:
course: 课程
user: 用户
userinfo:
nickname: 登录名
nickname: 昵称
showname: 姓名
email: 邮箱

1
config/routes.rb
View File

@ -1579,6 +1579,7 @@ RedmineApp::Application.routes.draw do
collection do
get 'get_discipline_categories'
get 'get_first_level_disciplines'
get 'get_major'
post 'regex_syllabus_name'
end
end

5
db/migrate/20170717083910_add_major_id_to_syllabus.rb Normal file
View File

@ -0,0 +1,5 @@
class AddMajorIdToSyllabus < ActiveRecord::Migration
def change
add_column :syllabuses, :major_id, :integer
end
end

24
db/migrate/20170718013325_add_major_to_shixun.rb Normal file
View File

@ -0,0 +1,24 @@
class AddMajorToShixun < ActiveRecord::Migration
def change
shixuns = Shixun.where(:identifier => ['s745kpba', 'mqex9s82', 'nf9ja46l', 'mnf6b7z3', '93mzpcqu', 'f9ly35vz'])
unless shixuns.blank?
shixuns.each do |shixun|
shixun.update_column(:major_id, 636)
case shixun.identifier
when 's745kpba'
shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => 636, :course_list_id => 9)
when 'mqex9s82'
shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => 636, :course_list_id => 7)
when 'nf9ja46l'
shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => 636, :course_list_id => 5)
when 'mnf6b7z3'
shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => 636, :course_list_id => 6)
when '93mzpcqu'
shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => 636, :course_list_id => 6)
when 'f9ly35vz'
shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => 636, :course_list_id => 7)
end
end
end
end
end

14
db/migrate/20170718022342_add_nickname_to_users.rb Normal file
View File

@ -0,0 +1,14 @@
class AddNicknameToUsers < ActiveRecord::Migration
def change
add_column :users, :nickname, :string
count = User.all.count / 30 + 2
transaction do
for i in 1 .. count do
User.page(i).per(30).each do |user|
name = user.lastname.to_s + user.firstname.to_s
user.update_column('nickname', name)
end
end
end
end
end

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

@ -150,6 +150,14 @@ function changeDepValue(value, data) {
// 基本资料页面提交表单时，判断身份与单位是否合法
function my_account_form_submit() {
if ($("#nickname").val() == '') {
$("#nickname").focus();
$("#nickname_hint").show();
e.stopImmediatePropagation();
return;
} else{
$("#nickname_hint").hide();
}
//姓名不能为空
if ($("#lastname").val() == '') {
@ -157,24 +165,32 @@ function my_account_form_submit() {
$("#lastname_hint").show();
e.stopImmediatePropagation();
return;
} else{
$("#lastname_hint").hide();
}
if ($("#userIdentity").val() == -1) {
$("#identity_hint").show();
e.stopImmediatePropagation(); // 阻止事件冒泡
return;
} else{
$("#identity_hint").hide();
}
if ($("#teacher").is(":visible") == true && $("#teacher").val() == "0") {
$("#identity_hint").show();
e.stopImmediatePropagation();
return;
} else{
$("#identity_hint").hide();
}
if ($("#profession").is(":visible") == true && $("#profession").val() == "0") {
$("#identity_hint").show();
e.stopImmediatePropagation();
return;
} else{
$("#identity_hint").hide();
}
if ($("#user_student_id").parent().is(":visible") == true && $("#user_student_id").val() == "") {
@ -187,6 +203,8 @@ function my_account_form_submit() {
$("#province_hint").show();
e.stopImmediatePropagation();
return;
} else{
$("#province_hint").hide();
}
// 单位或高校必须从下拉列表中选择
@ -194,12 +212,16 @@ function my_account_form_submit() {
$("#school_name_hint").show();
e.stopImmediatePropagation();
return;
} else{
$("#school_name_hint").hide();
}
if ($("input[name='school']").val().trim() == '') { //学校名字必须填写
$("#school_name_hint").show();
e.stopImmediatePropagation();
return;
} else{
$("#school_name_hint").hide();
}
$('#my_account_form').submit();

28
public/javascripts/edu/base_edu.js
View File

@ -40,8 +40,28 @@ $(function(){
});
$("#first_level_discipline_id").on("change", function(){
if($("#first_level_discipline_id").val() != "0"){
$("#first_level_discipline_id_notice").hide();
$.ajax({
url: '/syllabuses/get_major',
type: 'get',
data: {first_level_discipline_id:$("#first_level_discipline_id").val()},
success: function(data){
if (data.result == 1){
$("#major_id").html("<option value='0'>选择课程所属专业</option>");
for(var i=0; i<data.options.length; i++){
$("#major_id").append("<option value='" + data.options[i][1] + "'>" + data.options[i][0] + "</option>");
}
$("#first_level_discipline_id_notice").hide();
}
else{
}
}
});
});
$("#major_id").on("change", function() {
if ($("#major_id").val() != "0") {
$("#major_id_notice").hide();
}
});
@ -537,6 +557,8 @@ function submit_new_syllabus()
$("#discipline_category_id_notice").show();
} else if($("#first_level_discipline_id").val() == "0"){
$("#first_level_discipline_id_notice").show();
} else if($("#major_id").val() == "0"){
$("#major_id_notice").show();
} else {
if(regex_syllabus_name())
{
@ -568,6 +590,8 @@ function submit_edit_syllabus(id)
$("#discipline_category_id_notice").show();
} else if($("#first_level_discipline_id").val() == "0"){
$("#first_level_discipline_id_notice").show();
} else if($("#major_id").val() == "0"){
$("#major_id_notice").show();
} else {
if(regex_syllabus_name())
{

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

@ -85,6 +85,7 @@ table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
.undis {display:none;}
.dis {display:block;}
.edu-tab-con-box{ padding:15px; max-height:1200px; overflow: auto; color:#666; line-height: 2.0; background:#fff;}
.edu-sy-con-box{ padding:15px; color:#666; line-height: 2.0; background:#fff;}
.edu-class-right-box{ background:#fff; position:relative; padding-bottom:20px;}
a.edu-class-user-img{ height: 80px;}
.edu-class-user-img img{ width: 80px; height: 80px; border-radius:100px;}

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

@ -310,3 +310,5 @@ html>body #ajax-indicator { position: fixed; }
25% {transform: translateY(0);}
50%, 100% {transform: translateY(0);}
}
/*去掉IE input框输入时自带的清除按钮*/
input::-ms-clear{display:none;}

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

@ -45,14 +45,14 @@
.boxborder-dashed-orange{border: 1px dashed #ffbfaa;}
.click_add{text-align: center;height: 90px;line-height: 90px;}
.adding-stage-item{padding: 0px 10px;}
.adding-stage-item{padding: 0px 10px 10px 10px;position: relative}
.task-close-icon{position: absolute;right: -5px;top:-5px;z-index: 2;font-size: 18px!important;}
/*编辑部分的列表不用加浮动效果*/
.task-index-list-box-all{ width:23.7%;margin: 0 1.5% 1.5% 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-all{ width:23.7%;margin: 6px; 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-all:nth-child(4n+0) {margin: 0 0 1.5% 0;}
.allback{background-color:#FFFFFF}
.last-all-count{width: 20%;text-align: right;}

10
public/stylesheets/css/edu-user.css
View File

@ -9,7 +9,7 @@
.-task-con-per .photo .changephoto .subchange{width:100%;text-align:center;line-height:26px;color:#fff;background:black;opacity:0.4;filter: alpha(opacity=40);}
.-task-con-data{width:89%;}
.-task-con-data .top{width:100%;}
.-task-con-data .top .top-left{width:46%;}
.-task-con-data .top .top-left{width:60%;}
.-task-con-data .top .top-left .p1{margin:5px 0;}
.-task-con-data .top .top-right{width:20%;text-align: right;}
.-task-con-data .top .top-right .mynew{display:block;width:100%;}
@ -199,6 +199,12 @@ input.new_loggin_input_test{ -webkit-box-shadow: 0 0 0px 1000px white inset; ou
/*头部排版更改*/
.lector{display: block;width: auto;padding: 0px 8px;background: cornflowerblue;color: #ffffff;font-size: 14px;margin-right: 15px;border-radius: 4px;margin-top: 3px;}
.u-color-light-red{color: #FF6666}
.u-color-light-grey{color: #CCCCCC}
.user-info-span{border-radius: 50%;display: inline-block;background: #F3F5F7;text-align: center;padding: 3px 6px;}
.user-info-span{border-radius: 50%;float:left;background: #F3F5F7;text-align: center;width: 23px;height: 23px;line-height: 23px;margin-top: 3px;margin-right: 5px}
.color-grey-6{color:#888888;}
.account-info-span{border-radius: 50%;float:left;background: #FFF;text-align: center;width: 23px;height: 23px;line-height: 23px;margin-top:2px;margin-right: 5px}
.account-auth-span{position: absolute; left: 140px;}
.user_auth_notice{border: 1px dashed #ff6610; width: 100%; padding: 8px 5px; font-size: 12px;}