Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

db/migrate/20151020021234_update_course_activity.rb

@@ -0,0 +1,23 @@
+class UpdateCourseActivity < ActiveRecord::Migration
+  def up
+    count = CourseActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      CourseActivity.page(i).per(30).each do |activity|
+        if activity.course_act
+          if activity.course_act_type == 'Poll'
+            if activity.course_act.polls_status == 1
+              activity.destroy
+            end
+          end
+        else
+          activity.destroy
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151020014759) do
+ActiveRecord::Schema.define(:version => 20151020021234) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

public/javascripts/feedback.js

@@ -19,12 +19,12 @@
             if(options.minStatue == "true"){
                 show_btn.css("float", options.float);
                 sideContent.css('width', 0);
-                show_btn.css('width', 25);
+                show_btn.css('width', 28);
             }
             //close
             closeBtn.bind("click",function(){
                 sideContent.animate({width: '0px'},"fast");
-                show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
+                show_btn.stop(true, true).delay(300).animate({ width: '28px'},"fast");
                 cookiesave('minStatue','true','','','');
             });
             //show