diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index a9a2fb72b..9a17e6ca8 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -83,7 +83,7 @@ class AccountController < ApplicationController # 服务协议 def agreement - render :layout => 'static_base' + render :layout => 'base_edu' end def about_us diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb index 8d27ba45a..7451a893c 100644 --- a/app/controllers/syllabuses_controller.rb +++ b/app/controllers/syllabuses_controller.rb @@ -12,12 +12,12 @@ class SyllabusesController < ApplicationController :send_homeworks_to_course, :choose_user_course, :send_resources_to_course, :send_r_and_h_to_course] def index - type = params[:type].nil? ? 1 : params[:type].to_i + @status = params[:type].nil? ? 1 : params[:type].to_i # 1表示正在进行，2表示已结束 user = User.current @my_syllabuses = user.syllabuses - archive_ids = Course.where("tea_id = #{user.id} and is_delete = 1 and syllabus_id is NOT NULL").blank? ? "(-1)" : "(" + Course.where("tea_id = #{user.id} and is_delete = #{type} and syllabus_id is NOT NULL").map{|course| course.syllabus_id}.join(",") + ")" + archive_ids = Course.where("tea_id = #{user.id} and is_delete = 1 and syllabus_id is NOT NULL").blank? ? "(-1)" : "(" + Course.where("tea_id = #{user.id} and is_delete = 1 and syllabus_id is NOT NULL").map{|course| course.syllabus_id}.join(",") + ")" @archive_syllabuses = Syllabus.where("id in #{archive_ids}") sy_courses = user.courses.visible.not_deleted @@ -32,7 +32,10 @@ class SyllabusesController < ApplicationController @join_syllabuses = @join_syllabuses.sort{|x,y| y[:last_update] <=> x[:last_update]} @is_course = 1 - render :layout => 'base_edu' + respond_to do |format| + format.html{ render :layout => 'base_edu'} + format.js + end end def show diff --git a/app/models/course.rb b/app/models/course.rb index 6c546f591..f2172f419 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -24,7 +24,7 @@ class Course < ActiveRecord::Base end end - attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete, :syllabus_id, :end_time, :end_term, :choose_group_allow + attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete, :syllabus_id, :end_time, :end_term, :choose_group_allow, :is_end #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id # 定义一个方法teacher，该方法通过tea_id来调用User表 belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表 @@ -109,6 +109,8 @@ class Course < ActiveRecord::Base acts_as_customizable scope :not_deleted, lambda{where(is_delete: 0)} + scope :not_deleted_not_end, lambda{where(is_delete: 0, is_end: 1)} + scope :not_deleted_but_is_end, lambda{where(is_end: 1, is_delete: 0)} scope :all_course scope :active, lambda { where(:status => STATUS_ACTIVE) } scope :status, lambda {|arg| where(arg.blank? ? nil : {:status => arg.to_i}) } diff --git a/app/views/account/agreement.html.erb b/app/views/account/agreement.html.erb index ac0b9906c..2bb958120 100644 --- a/app/views/account/agreement.html.erb +++ b/app/views/account/agreement.html.erb @@ -1,29 +1,29 @@ <%= stylesheet_link_tag 'css/public'%>
-

Trustie服务协议

+

服务协议

尊敬的用户，您好！
-欢迎使用Trustie平台，在您使用Trustie平台前，请您认真阅读并遵守《Trustie服务协议》（以下简称"本协议"），请您务必审慎阅读、充分理解协议的各条款内容。
-当您在注册过程中点击查看"看过并同意本服务协议"，按照注册流程成功注册为Trustie平台的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。

-

一、Trustie平台权利和义务

-

1、尊重用户隐私：尊重用户隐私，保障用户隐私安全是Trustie平台的一项基本政策；
-2、管理平台用户：Trustie平台依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理平台注册用户；
-3、处理用户反馈：Trustie平台的相关人员会及时处理用户反馈的问题并给予及时回复。

+欢迎使用本网站，在您使用本网站前，请您认真阅读并遵守《服务协议》（以下简称"本协议"），请您务必审慎阅读、充分理解协议的各条款内容。
+当您在注册过程中点击查看"看过并同意本服务协议"，按照注册流程成功注册为网站的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。

+

一、本网站权利和义务

+

1、尊重用户隐私：尊重用户隐私，保障用户隐私安全是网站的一项基本政策；
+2、管理网站用户：网站依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理网站注册用户；
+3、处理用户反馈：网站的相关人员会及时处理用户反馈的问题并给予及时回复。

二、用户权利和义务

-

用户在使用Trustie平台的过程中，必须遵守如下原则：
+

用户在使用网站的过程中，必须遵守如下原则：
1、遵守中国的有关法律和法规；
2、使用网络服务不作非法用途；
3、不干扰和混乱网络服务；
4、遵守所有使用网络服务的网络协议、规定、程序和惯例；
5、不传输任何非法的、骚扰性的、中伤他人的、辱骂性的、恐吓性的、伤害性的、庸俗的，淫秽等信息资料；
6、不传输任何教唆他人构成犯罪行为的资料；
-7、用户不得故意或者过失损害Trustie平台合法权利和利益。及时回复。

+7、用户不得故意或者过失损害网站合法权利和利益。及时回复。

三、关于责任

-

鉴于网络服务的特殊性，用户同意Trustie团队有权在事先通知的情况下，变更、中断、升级部分网络服务。Trustie团队不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。

+

鉴于网络服务的特殊性，本网站有权在事先通知的情况下，变更、中断、升级部分网络服务。本网站不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。

四、服务条款的修改

-

Trustie团队保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由Trustie团队及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。

-

本协议最终解释权归Trustie团队所有。

+

本网站保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由网站项目组及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。

+

本协议最终解释权归本网站所有。

diff --git a/app/views/account/user_join.html.erb b/app/views/account/user_join.html.erb index bde24f690..d62310d51 100644 --- a/app/views/account/user_join.html.erb +++ b/app/views/account/user_join.html.erb @@ -59,7 +59,7 @@
  • - + diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb index f2ffdbe22..efbf903b8 100644 --- a/app/views/homework_common/_homework_index_list.html.erb +++ b/app/views/homework_common/_homework_index_list.html.erb @@ -21,7 +21,7 @@

    • <% if @is_teacher %> -
    +
    -
    -

    Email:zhiqingcs@163.com

    -

    Copyright 2007~2017, 智擎信息 All Rights Reserved

    +
    + +

    Copyright 2007~2017, All Rights Reserved

    -
    +
    • 高校智能化教学与实训平台 @@ -26,8 +26,8 @@
    - <%= link_to image_tag("/images/bigdata/edu-footer-logo.png",width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl edu-footer-logo"), home_path %> -

    高校智能化教学与实训平台

    + <%= link_to image_tag("/images/bigdata/edu-footer-logo.png", width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl edu-footer-logo"), home_path %> +
    diff --git a/app/views/layouts/_public_left_info.html.erb b/app/views/layouts/_public_left_info.html.erb index 3a0618040..7717156ae 100644 --- a/app/views/layouts/_public_left_info.html.erb +++ b/app/views/layouts/_public_left_info.html.erb @@ -1,6 +1,6 @@
    - + 智能教学
    diff --git a/app/views/syllabuses/_courses_list.html.erb b/app/views/syllabuses/_courses_list.html.erb index 9c21a3db5..64341b888 100644 --- a/app/views/syllabuses/_courses_list.html.erb +++ b/app/views/syllabuses/_courses_list.html.erb @@ -1,13 +1,15 @@ -<% courses.each_with_index do |course, i| %> - <% allow_visit = course.is_delete == 0 && (User.current.member_of_course?(course) || User.current.admin? || course.is_public == 1) %> -
  • +<% if !courses.blank? %> + <% courses.each_with_index do |course, i| %> + <% allow_visit = course.is_delete == 0 && (User.current.member_of_course?(course) || User.current.admin? || course.is_public == 1) %> +
  • " class="fl mr5" target="<%= allow_visit ? '_blank' : "" %>"><%= course.name %> <% if course.is_public == 0 %> <% end %> - <%= course.teacher.show_name %> - <%= format_date Time.at(course.updatetime) %>更新 -
    • -<% end %> \ No newline at end of file + <%= course.teacher.show_name %> + <%= format_date Time.at(course.updatetime) %>更新 + + <% end %> +<% end %> diff --git a/app/views/syllabuses/_join_syllabuses.html.erb b/app/views/syllabuses/_join_syllabuses.html.erb index d5f7ff50a..c296f829e 100644 --- a/app/views/syllabuses/_join_syllabuses.html.erb +++ b/app/views/syllabuses/_join_syllabuses.html.erb @@ -1,5 +1,5 @@ <% @join_syllabuses.each_with_index do |syllabus, index|%> - <% course_count = syllabus.courses.not_deleted.count %> + <% course_count = @status == 1 ? syllabus.courses.where("is_delete = 0 and is_end = 0").count : syllabus.courses.where("is_delete = 0 and is_end = 1").count %>
    @@ -26,7 +26,11 @@
      - <% courses = syllabus.courses.not_deleted.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %> + <% if @status == 1 %> + <% courses = syllabus.courses.where("is_delete = 0 and is_end = 0").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %> + <% else %> + <% courses = syllabus.courses.where("is_delete = 0 and is_end = 1").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %> + <% end %> <%= render :partial => 'syllabuses/courses_list', :locals => { :courses => courses, :syllabus => syllabus} %>
    diff --git a/app/views/syllabuses/_my_syllabuses.html.erb b/app/views/syllabuses/_my_syllabuses.html.erb index 865de5d88..4a2873376 100644 --- a/app/views/syllabuses/_my_syllabuses.html.erb +++ b/app/views/syllabuses/_my_syllabuses.html.erb @@ -1,5 +1,5 @@ <% @my_syllabuses.each_with_index do |syllabus, index|%> - <% course_count = syllabus.courses.not_deleted.count %> + <% course_count = @status == 1 ? syllabus.courses.where("is_delete = 0 and is_end = 0").count : syllabus.courses.where("is_delete = 0 and is_end = 1").count %>
    @@ -26,7 +26,11 @@
      - <% courses = syllabus.courses.not_deleted.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %> + <% if @status == 1 %> + <% courses = syllabus.courses.where("is_delete = 0 and is_end = 0").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %> + <% else %> + <% courses = syllabus.courses.where("is_delete = 0 and is_end = 1").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %> + <% end %> <%= render :partial => 'syllabuses/courses_list', :locals => { :courses => courses, :syllabus => syllabus} %>
    diff --git a/app/views/syllabuses/index.html.erb b/app/views/syllabuses/index.html.erb index 7868f6fab..e858d719e 100644 --- a/app/views/syllabuses/index.html.erb +++ b/app/views/syllabuses/index.html.erb @@ -23,16 +23,15 @@

    - +

    + 正在进行 + 已结束 +

    -
    +
    <%= render :partial => "syllabuses/my_syllabuses" %>
    - - @@ -40,58 +39,60 @@
    diff --git a/app/views/syllabuses/index.js.erb b/app/views/syllabuses/index.js.erb new file mode 100644 index 000000000..a07fc7369 --- /dev/null +++ b/app/views/syllabuses/index.js.erb @@ -0,0 +1,36 @@ +$("#my_syllabuses").html("<%= j( render :partial => "syllabuses/my_syllabuses") %>"); +$("#join_syllabuses").html("<%= j( render :partial => "syllabuses/join_syllabuses") %>"); +$(".play .nav p").click(function () { + var $a = $(this).attr("data-option"); + $(".play .nav p i").hide(); + $(".play .nav p").removeClass("bold"); + $(this).addClass("bold"); + $(this).find("i").show(); + $(".con").children().hide(); + $(".con").find("." + $a + "").show(); +}); +$(".con .count").click(function () { + if ($(this).find(".cut").css("display") == "none") { + $(this).find(".cut").show(); + $(this).find(".add").hide(); + $(this).parent().next().show(); + } else { + $(this).find(".cut").hide(); + $(this).find(".add").show(); + $(this).parent().next().hide(); + } +}); +$(".con .operate").click(function () { + if ($(this).parent().next().css("display") == "none") { + $(".con .handle").hide(); + $(this).parent().next().show(); + } else { + $(this).parent().next().hide(); + } +}); +$(document).bind("click", function (e) { + var target = $(e.target); + if (target.closest(".con .handle").length == 0 && target.closest(".con .operate").length == 0) { + $(".con .handle").hide(); + } +}); diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index 191583203..10dad18d8 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -28,7 +28,7 @@ <% end %> <%= @syllabus.syllabus_type_str %> - + <% if @is_syllabus_member %> - <%= link_to '选用', choose_user_course_syllabus_path(@syllabus, :type => 'A'), :class => 'task-btn task-btn-blue fr mr20 ml20', :style => 'margin-top:110px;', :remote => true %> + <%= link_to '选用', choose_user_course_syllabus_path(@syllabus, :type => 'A'), :class => 'task-btn task-btn-blue fr ml20', :style => '', :remote => true %> <% end %>
    +
    diff --git a/public/images/bigdata/bigdata-logo.png b/public/images/bigdata/bigdata-logo.png index b7c819b33..38431c401 100644 Binary files a/public/images/bigdata/bigdata-logo.png and b/public/images/bigdata/bigdata-logo.png differ diff --git a/public/images/bigdata/edu-footer-logo.png b/public/images/bigdata/edu-footer-logo.png index f393a538b..b7c5499df 100644 Binary files a/public/images/bigdata/edu-footer-logo.png and b/public/images/bigdata/edu-footer-logo.png differ diff --git a/public/stylesheets/css/edu-popup.css b/public/stylesheets/css/edu-popup.css index 60c0a9c4f..b561bad57 100644 --- a/public/stylesheets/css/edu-popup.css +++ b/public/stylesheets/css/edu-popup.css @@ -3,7 +3,7 @@ .task-popup-text-center{ text-align: center; color: #666;} .task-popup-title{ border-bottom: 1px solid #eee; padding:10px 15px; } .task-popup-content{ padding:15px;} -.task-popup-submit{ margin:15px auto; width: 120px;} +.task-popup-submit{ margin:0px auto 15px; width: 120px;} .task-popup-sure{ margin:15px auto; width: 54px;} .task-popup-OK{ margin:15px auto; width: 70px;} .task-popup-bggrey{ background:#ccc; color:#333;} diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css index 7317cacce..2c8b0c768 100644 --- a/public/stylesheets/css/edu-user.css +++ b/public/stylesheets/css/edu-user.css @@ -97,7 +97,8 @@ .-task-con-int .passageway .hascon .train p .last:hover{color:#5faee3;} .-task-con-int .passageway .hascon .train p .last:hover .blue{color:#5faee3;} -.-task-con-int .passageway .hascon .expand{display:block;;height:70px;line-height:70px;text-align:center;background:#aaa;color:#fff;} +.-task-con-int .passageway .hascon .expand{display:block;;height:70px;line-height:70px;text-align:center;color:#5faee3;} +.-task-con-int .passageway .hascon .expand:hover{ color:#5faee3;} /*--------------------------------------箭头动画效果-----------------------------------*/ .-task-con-int .passageway .hint .zhuan{ diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index a829d0fc6..f924ff46d 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -8,7 +8,7 @@ .courseRSide{ width:983px; background:#fff; padding:10px; margin-left: 15px; margin-bottom:10px;} .wrap-big {width:980px; background:#fff; padding:10px; margin-bottom:10px;} /*资源库*/ -.resources {width:973px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right;} +.resources {width:973px; background-color:#ffffff; padding:15px; float: right;} .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;} .bannerName {background:#3b94d6; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;} .resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;} diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 08063c4a8..afd2ea71b 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -323,7 +323,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} a.homepageMenuControl {float:left; width:180px;} .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;} .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;} -.homepageRightBanner {width:975px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;} +.homepageRightBanner {width:975px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; } .homepagetopBanner {width:750px; height: 100px; margin:0px auto; float:right; background-color: #90C5EC; border:1px solid #dddddd;} .homepageRightBannerImg{width:1000px; margin:0px auto; height: 60px; margin-top: 10px; background:url(/images/TeachersDay.jpg)} a.homepageWhite {color:#ffffff;}