From b1e58f3fd5950942c9c53b82b031e9a4bdcdaee6 Mon Sep 17 00:00:00 2001
From: zhuhao <zh13964069093@163.com>
Date: Fri, 14 Nov 2014 16:38:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=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 | 93 +++++++++++++++++++++++++++
 app/views/courses/show.html.erb       |  1 +
 2 files changed, 94 insertions(+)
 create mode 100644 app/views/courses/_course_ad.html.erb

diff --git a/app/views/courses/_course_ad.html.erb b/app/views/courses/_course_ad.html.erb
new file mode 100644
index 000000000..0db7cb4ec
--- /dev/null
+++ b/app/views/courses/_course_ad.html.erb
@@ -0,0 +1,93 @@
+
+<div id="floatpoint"  STYLE="position:absolute;visibility:visible;"  >
+  <table  border=0   bordercolor="#FFFFFF" bgcolor="#faebd7">
+    <tr>
+      <td align=center bgcolor=#E3E3E3 >
+        联系我们
+      </td>
+    </tr>
+    <tr>
+      <td align=center bgcolor="orange" >
+        <a href="/" target="_blank" >QQ:1234566</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td align=center bgcolor="orange" >
+        <a href="/" target="_blank" >Email:1234566@qq.com</a><br>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<script type="text/javascript">
+    var XX=800;			// 浮动层的X坐标,即左边距
+    var xstep=1;			// 移动步长，此参数越小，移动越平滑，最小值为1
+    var delay_time=60;		// 每步的时间间隔，此参数越小，移动速度越快
+    var YY=0;
+    var ch=0;
+    var oh=0;
+    var yon=0;
+    var ns4=document.layers?1:0
+    var ie=document.all?1:0
+    var ns6=document.getElementById&&!document.all?1:0
+
+    if(ie){
+        YY=document.body.clientHeight;				//由clientHeight取得页面的高度
+        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	//将浮动层位置调整到页面底部
+    }
+
+    function reloc1(){
+        if(yon==0){YY=YY-xstep;}				//如果当前应该上移，则减小YY值
+        else{YY=YY+xstep;}					//否则增加YY值下移
+        if (ie){
+            ch=document.body.clientHeight;
+            oh=floatpoint.offsetHeight;
+        }
+        else if (ns4){
+            ch=window.innerHeight;
+            oh=document.floatpoint.clip.height;
+        }
+        else if (ns6){						//如果是NS6
+            ch=window.innerHeight					//取页面高度
+            oh=document.getElementById("floatpoint").offsetHeight	//取浮动层的高度
+        }
+
+        if(YY<0){yon=1;YY=0;}					//如果浮动层超出了上界，则设定移动方向为向下；并设定层的位置为正好在上界处
+        if(YY>=(ch-oh)){yon=0;YY=(ch-oh);}			//如果浮动层超出了下界，则设定移动方向为向上；并设定层的位置为正好在下界处
+        if(ie){							//如果是IE
+            floatpoint.style.left=XX;				//用style.left设定浮动层左边距
+            floatpoint.style.top=YY+document.body.scrollTop;	//用style.top设定浮动层上边距
+        }
+        else if (ns4){						//如果是NS4
+            document.floatpoint.pageX=XX;				//用.pageX设定浮动层左边距
+            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
+        }
+    }
+
+    function onad(){
+
+        if(ns4)			//如果是NS4
+            document.floatpoint.visibility="visible";		//设定浮动层为可见
+        loopfunc();						//开始主循环，以不断改变浮动层位置
+    }
+    function loopfunc(){
+        reloc1();						//调整浮动层位置
+        setTimeout('loopfunc()',delay_time);			//设定下一次调整的延时
+    }
+    if (ie||ns4||ns6)
+        //window.onload=onad					//初始化事件触发器
+        $(document).ready(onad());
+</script>
\ No newline at end of file
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index ee7d995e7..ed83a3085 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -1,3 +1,4 @@
+<%= render 'course_ad' %>
 <% if @events_by_day != nil && @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
       <p class="subtitle">

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 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=AE=E5=8A=A9?=
 =?UTF-8?q?=E7=9A=84=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"

From 096b0e271f4431f79f12454aaa0b4895b8164ee0 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 17 Nov 2014 09:54:21 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=A1=B5=E8=84=9A=E5=81=8F=E7=A7=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/show.html.erb         |  2 --
 app/views/layouts/_base_footer.html.erb | 45 ++++++++++++-------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index f85a27801..629cac072 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -99,8 +99,6 @@
             </table>
           </div>
       <% end %>
-
-
     </div>
  <%else%>
     <div class="font_description">
diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index 063c24cdf..fcf38f5d2 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -38,7 +38,6 @@
 </div>
 </div>
 </div>
-</div>
 <div class="debug">
   <%= debug(params) if Rails.env.development? %>
   <div class="hidden">
@@ -61,33 +60,31 @@
 <% cache "footer" do %>
 <div class="clearfix"></div>
 <div id="footer" style="margin-left:-5px;padding-top: 20px;clear: both;font-size: 12px;">
-	<div style="border-top:solid 1px #C6E9F1;"></div>
- <div class="base_footer">
-  <div align="center">
+  <div style="border-top:solid 1px #C6E9F1;"></div>
+  <div class="base_footer">
+    <div align="center">
 
    <!--gcm-->
-   <p>
-    <span><%=l(:label_organizers)%></span>
-    <span class="footer_text_link"><%= link_to l(:label_organizers_information),"http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
-    <span class="footer_text_link"><%= link_to l(:label_organizers_information_institute), "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
-    <span id="copyright"><%=l(:label_copyright)%>©2007~2014</span>
-    <span id="contact_us" class="footer_text_link"><%= link_to l(:label_contact_us),"http://" + Setting.host_name + "/projects/2/member", :target=>"_blank" %></span>
-    <span id="record"class="footer_text_link"><%= link_to l(:label_record),"http://www.miibeian.gov.cn/", :target => "_blank" %></span>
-
-  </p>
-  <div id="logo_link">
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank" %></span>
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn", :target => "_blank" %></span>
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/", :target => "_blank" %></span>
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn", :target => "_blank" %></span>
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com", :target => "_blank" %></span>		
- </div>
+      <p>
+        <span><%=l(:label_organizers)%></span>
+        <span class="footer_text_link"><%= link_to l(:label_organizers_information),"http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
+        <span class="footer_text_link"><%= link_to l(:label_organizers_information_institute), "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
+        <span id="copyright"><%=l(:label_copyright)%>©2007~2014</span>
+        <span id="contact_us" class="footer_text_link"><%= link_to l(:label_contact_us),"http://" + Setting.host_name + "/projects/2/member", :target=>"_blank" %></span>
+        <span id="record"class="footer_text_link"><%= link_to l(:label_record),"http://www.miibeian.gov.cn/", :target => "_blank" %></span>
+      </p>
+      <div id="logo_link">
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn", :target => "_blank" %></span>
+        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com", :target => "_blank" %></span>
+      </div>
  <!--gcm-->
-
-</div>
-</div>
-</div>
+    </div>
+  </div>
 </div>
+
 <div class="debug hidden">
   <%= debug(params) if Rails.env.development? %>
 </div>

From 46e97b7ae477df5d1074aeb02d65fc6fd4faf1d9 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 17 Nov 2014 10:31:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=A1=B5=E8=84=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb | 51 -------------------------
 1 file changed, 51 deletions(-)

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index fcf38f5d2..4050de3b7 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -55,54 +55,3 @@
   </div>
 </div>
 
-
-<!--add by huang-->
-<% cache "footer" do %>
-<div class="clearfix"></div>
-<div id="footer" style="margin-left:-5px;padding-top: 20px;clear: both;font-size: 12px;">
-  <div style="border-top:solid 1px #C6E9F1;"></div>
-  <div class="base_footer">
-    <div align="center">
-
-   <!--gcm-->
-      <p>
-        <span><%=l(:label_organizers)%></span>
-        <span class="footer_text_link"><%= link_to l(:label_organizers_information),"http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
-        <span class="footer_text_link"><%= link_to l(:label_organizers_information_institute), "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
-        <span id="copyright"><%=l(:label_copyright)%>©2007~2014</span>
-        <span id="contact_us" class="footer_text_link"><%= link_to l(:label_contact_us),"http://" + Setting.host_name + "/projects/2/member", :target=>"_blank" %></span>
-        <span id="record"class="footer_text_link"><%= link_to l(:label_record),"http://www.miibeian.gov.cn/", :target => "_blank" %></span>
-      </p>
-      <div id="logo_link">
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn", :target => "_blank" %></span>
-        <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com", :target => "_blank" %></span>
-      </div>
- <!--gcm-->
-    </div>
-  </div>
-</div>
-
-<div class="debug hidden">
-  <%= debug(params) if Rails.env.development? %>
-</div>
-<div class="hidden">
-  <script src="http://s4.cnzz.com/z_stat.php?id=1000482288&web_id=1000482288" language="JavaScript">
-  </script>
-  <script>
-
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-46523987-1', 'trustie.net');
-  ga('send', 'pageview');
-
-  </script>
-  
-</div>
-<% end %>
-