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

app/views/courses/_course_ad.html.erb

@@ -0,0 +1,104 @@
+
+<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=1300;			// 浮动层的X坐标,即左边距
+    var xstep=1;			// 移动步长，此参数越小，移动越平滑，最小值为1
+    var delay_time=60;		// 每步的时间间隔，此参数越小，移动速度越快
+    var YY=0;
+    var ch=0;
+    var oh=0;
+    var yon=1;
+    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	//将浮动层位置调整到页面底部
+    }
+    YY = 0;
+    function reloc1(){
+        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(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
+            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
+            $("#floatpoint").offset({left:XX});
+            $("#floatpoint").offset({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>

app/views/courses/show.html.erb

@@ -1,3 +1,4 @@
+
 <% if @events_by_day != nil && @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
       <p class="subtitle">
@@ -98,8 +99,6 @@
             </table>
           </div>
       <% end %>
-
-
     </div>
  <%else%>
     <div class="font_description">

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">
@@ -56,56 +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>
-<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 %>
-

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">

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
@@ -108,6 +108,8 @@ ActiveRecord::Schema.define(:version => 20141103065703) do
     t.string   "password"
     t.integer  "is_evaluation"
     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"