From ae195326012d1fb5a64cecacf88784d6e1376787 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 14 Nov 2014 17:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=AE=E5=8A=A9=E7=9A=84?=
 =?UTF-8?q?=E6=B5=AE=E5=8A=A8=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_ad.html.erb   | 25 ++++++++++++++++++-------
 app/views/courses/show.html.erb         |  2 +-
 app/views/layouts/base_courses.html.erb |  1 +
 db/schema.rb                            | 19 ++++++++++++++-----
 4 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/app/views/courses/_course_ad.html.erb b/app/views/courses/_course_ad.html.erb
index 0db7cb4ec..8df3c3c31 100644
--- a/app/views/courses/_course_ad.html.erb
+++ b/app/views/courses/_course_ad.html.erb
@@ -20,13 +20,13 @@
 </div>
 
 <script type="text/javascript">
-    var XX=800;			// 浮动层的X坐标,即左边距
+    var XX=1300;			// 浮动层的X坐标,即左边距
     var xstep=1;			// 移动步长，此参数越小，移动越平滑，最小值为1
     var delay_time=60;		// 每步的时间间隔，此参数越小，移动速度越快
     var YY=0;
     var ch=0;
     var oh=0;
-    var yon=0;
+    var yon=1;
     var ns4=document.layers?1:0
     var ie=document.all?1:0
     var ns6=document.getElementById&&!document.all?1:0
@@ -36,18 +36,18 @@
         floatpoint.style.top=YY;				//将浮动层位置调整到页面底部
     }
     else if (ns4){
+
         YY=window.innerHeight;					//由innerHeight取得页面的高度
         document.floatpoint.pageY=YY;				//将浮动层位置调整到页面底部
         document.floatpoint.visibility="hidden";		//将浮动层隐藏。
     }
     else if (ns6){
+
         YY=window.innerHeight					//由innerHeight取得页面的高度
         document.getElementById('floatpoint').style.top=YY	//将浮动层位置调整到页面底部
     }
-
+    YY = 0;
     function reloc1(){
-        if(yon==0){YY=YY-xstep;}				//如果当前应该上移，则减小YY值
-        else{YY=YY+xstep;}					//否则增加YY值下移
         if (ie){
             ch=document.body.clientHeight;
             oh=floatpoint.offsetHeight;
@@ -61,6 +61,14 @@
             oh=document.getElementById("floatpoint").offsetHeight	//取浮动层的高度
         }
 
+        if(yon==0)
+        {
+            YY=YY-xstep;
+        }				//如果当前应该上移，则减小YY值
+        else
+        {
+            YY=YY+xstep;
+        }					//否则增加YY值下移
         if(YY<0){yon=1;YY=0;}					//如果浮动层超出了上界，则设定移动方向为向下；并设定层的位置为正好在上界处
         if(YY>=(ch-oh)){yon=0;YY=(ch-oh);}			//如果浮动层超出了下界，则设定移动方向为向上；并设定层的位置为正好在下界处
         if(ie){							//如果是IE
@@ -72,9 +80,12 @@
             document.floatpoint.pageY=YY+window.pageYOffset;	//用.pageY设定浮动层上边距
         }
         else if (ns6){						//如果是NS6
-            document.getElementById("floatpoint").style.left=XX
-            document.getElementById("floatpoint").style.top=YY+window.pageYOffset
+//            document.getElementById("floatpoint").style.left=XX
+//            document.getElementById("floatpoint").style.top=YY+window.pageYOffset
+            $("#floatpoint").offset({left:XX});
+            $("#floatpoint").offset({top:YY+window.pageYOffset});
         }
+
     }
 
     function onad(){
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index ed83a3085..f85a27801 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -1,4 +1,4 @@
-<%= render 'course_ad' %>
+
 <% if @events_by_day != nil && @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
       <p class="subtitle">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 55c5615fb..a9114a157 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -24,6 +24,7 @@
 </head>
 <!--add by huang-->
 <body class="<%= h body_css_classes %>">
+<%= render 'course_ad' %>
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
diff --git a/db/schema.rb b/db/schema.rb
index c257fa97a..f6fc138af 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141103065703) do
+ActiveRecord::Schema.define(:version => 20141105012624) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -95,19 +95,21 @@ ActiveRecord::Schema.define(:version => 20141103065703) do
 
   create_table "bids", :force => true do |t|
     t.string   "name"
-    t.string   "budget",                        :null => false
+    t.string   "budget",                         :null => false
     t.integer  "author_id"
     t.date     "deadline"
     t.text     "description"
-    t.datetime "created_on",                    :null => false
-    t.datetime "updated_on",                    :null => false
+    t.datetime "created_on",                     :null => false
+    t.datetime "updated_on",                     :null => false
     t.integer  "commit"
     t.integer  "reward_type"
     t.integer  "homework_type"
     t.integer  "parent_id"
     t.string   "password"
     t.integer  "is_evaluation"
-    t.integer  "proportion",    :default => 60
+    t.integer  "proportion",     :default => 60
+    t.integer  "comment_status", :default => 0
+    t.integer  "evaluation_num", :default => 3
   end
 
   create_table "boards", :force => true do |t|
@@ -480,6 +482,13 @@ ActiveRecord::Schema.define(:version => 20141103065703) do
     t.integer  "project_id",  :default => 0
   end
 
+  create_table "homework_evaluations", :force => true do |t|
+    t.string   "user_id"
+    t.string   "homework_attach_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
   create_table "homework_for_courses", :force => true do |t|
     t.integer "course_id"
     t.integer "bid_id"
