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

2017-05-27 17:39:33 +08:00 · 2017-05-27 17:39:33 +08:00 · 10218c756d
parent 722a7e5719 11cfc3a9ca
commit 10218c756d
21 changed files with 154 additions and 99 deletions
--- 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
--- 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
--- 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}) }
--- a/app/views/account/agreement.html.erb
+++ b/app/views/account/agreement.html.erb
@ -1,29 +1,29 @@
 <%= stylesheet_link_tag 'css/public'%>
 <!--<div class="homepageContentContainer mb20" >-->
  <div class="homepageContent BgBox mt10">
-  	<h2 class="BgBox_h2">Trustie服务协议</h2>
+  	<h2 class="BgBox_h2">服务协议</h2>
   	<div class="AgreementBox">
    	<p>尊敬的用户，您好！<br />
-欢迎使用Trustie平台，在您使用Trustie平台前，请您认真阅读并遵守《Trustie服务协议》（以下简称"本协议"），请您务必审慎阅读、充分理解协议的各条款内容。<br />
-当您在注册过程中点击查看"看过并同意本服务协议"，按照注册流程成功注册为Trustie平台的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。</p>
-		<h4 class="Agreementh4">一、Trustie平台权利和义务</h4>
-        <p>1、尊重用户隐私：尊重用户隐私，保障用户隐私安全是Trustie平台的一项基本政策；<br />
-2、管理平台用户：Trustie平台依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理平台注册用户；<br />
-3、处理用户反馈：Trustie平台的相关人员会及时处理用户反馈的问题并给予及时回复。</p>
+欢迎使用本网站，在您使用本网站前，请您认真阅读并遵守《服务协议》（以下简称"本协议"），请您务必审慎阅读、充分理解协议的各条款内容。<br />
+当您在注册过程中点击查看"看过并同意本服务协议"，按照注册流程成功注册为网站的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。</p>
+		<h4 class="Agreementh4">一、本网站权利和义务</h4>
+        <p>1、尊重用户隐私：尊重用户隐私，保障用户隐私安全是网站的一项基本政策；<br />
+2、管理网站用户：网站依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理网站注册用户；<br />
+3、处理用户反馈：网站的相关人员会及时处理用户反馈的问题并给予及时回复。</p>
 		<h4 class="Agreementh4">二、用户权利和义务</h4>
-        <p>用户在使用Trustie平台的过程中，必须遵守如下原则：<br />
+        <p>用户在使用网站的过程中，必须遵守如下原则：<br />
 1、遵守中国的有关法律和法规；<br />
 2、使用网络服务不作非法用途；<br />
 3、不干扰和混乱网络服务；<br />
 4、遵守所有使用网络服务的网络协议、规定、程序和惯例；<br />
 5、不传输任何非法的、骚扰性的、中伤他人的、辱骂性的、恐吓性的、伤害性的、庸俗的，淫秽等信息资料；<br />
 6、不传输任何教唆他人构成犯罪行为的资料；<br />
-7、用户不得故意或者过失损害Trustie平台合法权利和利益。及时回复。</p>
+7、用户不得故意或者过失损害网站合法权利和利益。及时回复。</p>
 		<h4 class="Agreementh4">三、关于责任</h4>
-        <p>鉴于网络服务的特殊性，用户同意Trustie团队有权在事先通知的情况下，变更、中断、升级部分网络服务。Trustie团队不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。</p>
+        <p>鉴于网络服务的特殊性，本网站有权在事先通知的情况下，变更、中断、升级部分网络服务。本网站不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。</p>
        <h4 class="Agreementh4">四、服务条款的修改</h4>
-        <p>Trustie团队保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由Trustie团队及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。</p>
-        <p class=" mt15 fb">本协议最终解释权归Trustie团队所有。</p>
+        <p>本网站保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由网站项目组及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。</p>
+        <p class=" mt15 fb">本协议最终解释权归本网站所有。</p>
    </div>
    
    
--- a/app/views/account/user_join.html.erb
+++ b/app/views/account/user_join.html.erb
@ -59,7 +59,7 @@
              </li>
              <li class="pr">
                <input type="checkbox" checked="checked" id="read_and_confirm_1" class=" magic-checkbox">
-                <label for="read_and_confirm_1">我已阅读并同意<a href="<%= agreement_path %>" target="_blank">服务协议条款</a></label>
+                <label for="read_and_confirm_1">我已阅读并同意<a href="<%= agreement_path %>" target="_blank" style="text-decoration: underline;">服务协议条款</a></label>
                <div class="new-login-error" style="display: none;">
                  <p id="user_aggre_1_notice"></p>
                </div>
--- a/app/views/homework_common/_homework_index_list.html.erb
+++ b/app/views/homework_common/_homework_index_list.html.erb
@ -21,7 +21,7 @@
            </p>
          </div>
          <% if @is_teacher %>
-              <div class="fr edu-position edu-position-hidebox mr20 mt25">
+              <div class="fr edu-position edu-position-hidebox mr20 mt20">
                <a href="javascript:void(0);"><i class="fa fa-ellipsis-v font-16"></i></a>
                <ul class="edu-position-hide undis">
                  <li>
--- a/app/views/homework_common/_homework_search_form.html.erb
+++ b/app/views/homework_common/_homework_search_form.html.erb
@ -1,4 +1,4 @@
 <%= form_tag(homework_common_index_path(:course => @course.id, :order => @order), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
    <input type="text" name="search" placeholder="输入作业名称进行搜索" class="task-form-100 panel-box-sizing" id="homework_name_search" value="<%= @search %>" />
-    <a href="javascript:void(0);" onfocus = 'this.blur();' onclick="$('#resource_search_form').submit();" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
+    <a href="javascript:void(0);" onfocus = 'this.blur();' onclick="$('#resource_search_form').submit();" class="edu-btn-search font-16 color-grey mt8"><i class="fa fa-search"></i></a>
 <% end %>
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@ -7,11 +7,11 @@
      <li><a href="<%= forums_path %>" class="fl" target="_blank">社区</a></li>
    </ul>
    <div class="cl"></div>
-    <div class="fl" style="width:440px;">
-      <p class="footer_con-p">Email:zhiqingcs@163.com</p>
-      <p class="footer_con-p">Copyright 2007~2017, 智擎信息 All Rights Reserved</p>
+    <div class="fl mt20" style="width:440px;height: 50px">
+<!--      <p class="footer_con-p">Email:zhiqingcs@163.com</p>-->
+      <p class="footer_con-p">Copyright 2007~2017, All Rights Reserved</p>
    </div>
-    <div class="fr mt20"  >
+    <div class="fr mt20">
      <ul class="saoma-box fl mr30">
        <li>
          <img src="/images/inner/img-back-weixin.png" width="50" height="50"  alt="高校智能化教学与实训平台" class="img-show" >
@ -26,8 +26,8 @@
          </ul>
        </li>
      </ul>
-      <%= link_to image_tag("/images/bigdata/edu-footer-logo.png",width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl edu-footer-logo"), home_path %>
-      <p class="inner-footer-p-big fr ml30">高校智能化教学与实训平台</p>
+      <%= link_to image_tag("/images/bigdata/edu-footer-logo.png", width:"50px", height: "50px", alt:"高校智能化教学与实训平台", class:"fl edu-footer-logo"), home_path %>
+<!--      <p class="inner-footer-p-big fr ml30">高校智能化教学与实训平台</p>-->
    </div>
    <div class="cl"></div>
  </div>
--- a/app/views/layouts/_public_left_info.html.erb
+++ b/app/views/layouts/_public_left_info.html.erb
@ -1,6 +1,6 @@
 <div class="sidebar">
  <div class="sidebar-top">
-    <i class="fa fa-graduation-cap font-20" style="color:#fff;" aria-hidden="true"></i>
+    <i class="fa fa-graduation-cap font-20" style="color:#fff;line-height: 50px;" aria-hidden="true"></i>
    <span>智能教学</span>
  </div>
  <div class="sidebar-con">
--- 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) %>
-    <li class="clearfix">
+<% 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) %>
+        <li class="clearfix">
    <span class="span4 fl ">
 	    <a href="<%= allow_visit ? course_path(course.id) : "javascript:void(0)" %>" class="fl mr5" target="<%= allow_visit ? '_blank' : "" %>"><%= course.name %></a>
      <% if course.is_public == 0 %>
 	    <a href="javascript:void(0);" class="fa fa-lock fl"  style="padding-top:18px;color:#ccc;" aria-hidden="true"></a>
      <% end %>
    </span>
-      <span class="span5 fl font-12"><a href="<%= user_path(course.teacher) %>" class="color-grey"><%= course.teacher.show_name %></a></span>
-      <span class="fl font-12"><i><%= format_date Time.at(course.updatetime) %></i>更新</span>
-    </li>
-<% end %>
+          <span class="span5 fl font-12"><a href="<%= user_path(course.teacher) %>" class="color-grey"><%= course.teacher.show_name %></a></span>
+          <span class="fl font-12"><i><%= format_date Time.at(course.updatetime) %></i>更新</span>
+        </li>
+    <% end %>
+<% end %>
--- 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 %>
    <div class="sub-con color-grey">
      <div class="head-top">
 		    <span class="count">
@ -26,7 +26,11 @@
        </ul>
      </div>
      <ul class="mr20 ml30">
-        <% 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} %>
      </ul>
    </div>
--- 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 %>
    <div class="sub-con color-grey">
      <div class="head-top">
 		        <span class="count">
@ -26,7 +26,11 @@
        </ul>
      </div>
      <ul class="mr20 ml30">
-        <% 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} %>
      </ul>
    </div>
--- a/app/views/syllabuses/index.html.erb
+++ b/app/views/syllabuses/index.html.erb
@ -23,16 +23,15 @@
        <i class="fa fa-caret-down font-12" style="display:none;" aria-hidden="true"></i>
      </p>
    </div>
-<!--   <p class="state mt20">
-      <a href="javascript:void(0)" class="edu-filter-cir-grey mr5 active" id="syllabuses_processing">正在进行</a>
-      <a href="javascript:void(0)" class="edu-filter-cir-grey mr5" id="syllabuses_end">已结束</a>
-    </p>-->
+    <p class="state mt20">
+      <a href="<%= syllabuses_path(:type => 1) %>" class="edu-filter-cir-grey mr5 active" data-remote="true" id="syllabuses_processing">正在进行</a>
+      <a href="<%= syllabuses_path(:type => 2) %>" class="edu-filter-cir-grey mr5" data-remote="true" id="syllabuses_end">已结束</a>
+    </p>
    <div class="con" style="min-height:740px;">
-      <div class="release">
+      <div class="release" id="my_syllabuses">
        <%= render :partial => "syllabuses/my_syllabuses" %>
      </div>
-
-      <div class="partic" style="display:none;">
+      <div class="partic undis" id="join_syllabuses" >
        <%= render :partial => "syllabuses/join_syllabuses" %>
      </div>
    </div>
@ -40,58 +39,60 @@
 </div>
 <script>
    $(function() {
-        console.log($(".con .handle"));
-        $(".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();
-            }
-        });
+            console.log($(".con .handle"));
+            $(".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();
+                }
+            });

-/*        // type: 1表示正在进行 2表示一结束
+        // type: 1表示正在进行 2表示一结束
        $("#syllabuses_processing").live("click", function(){
-            if($(".bold").attr("id") == "my_publish"){
-                var type = 1;
-            }else if($(".bold").attr("id") == "my_join"){
-                var type = 2;
-            }
-            console.log(type);
            $(this).addClass("active");
            $(this).next().removeClass("active");
-            $.ajax({
-                url: "<%#= syllabuses_path() %>",
+          /*  $.ajax({
                dateType: "script",
-                data: { type: type }
-
-            })
-        });*/
+                url: "<%#= syllabuses_path() %>",
+                data: { type: 1 }
+            })*/
+        });
+        $("#syllabuses_end").live("click", function(){
+            $(this).addClass("active");
+            $(this).prev().removeClass("active");
+           /* $.ajax({
+                dateType: "script",
+                url: "<%#= syllabuses_path() %>",
+                data: { type: 2 }
+            })*/
+        });
    });
 </script>
--- a/app/views/syllabuses/index.js.erb
+++ 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();
+    }
+});
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@ -28,7 +28,7 @@
      <% end %>
      <span class="mr15 <%= @syllabus.syllabus_type_str ? '' : 'none' %>"><%= @syllabus.syllabus_type_str %></span></li>
  </ul>
-
+<!--
  <div class="edu-class-top-img fr edu-position" >
    <img src="../images/bigdata/edu-class/edu-class-img.jpg" width="260" height="140">
    <% if @is_syllabus_member %>
@ -37,10 +37,12 @@
      </a>
    <% end %>
  </div>
+  -->
  <% 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 %>
 </div>
+
 <div class="edu-class-inner mb20">
 <div class="with75 fl">
 <div class="edu-tab clearfix mb20">
--- a/public/images/bigdata/bigdata-logo.png
+++ b/public/images/bigdata/bigdata-logo.png
--- a/public/images/bigdata/edu-footer-logo.png
+++ b/public/images/bigdata/edu-footer-logo.png
--- 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;}
--- 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{

--- 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;}
--- 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;}