Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course

app/models/course_activity.rb

@@ -15,8 +15,8 @@ class CourseActivity < ActiveRecord::Base
       user_activity.save
     else
       user_activity = UserActivity.new
-      user_activity.act_id = self.id
-      user_activity.act_type = self.class.to_s
+      user_activity.act_id = self.course_act_id
+      user_activity.act_type = self.course_act_type
       user_activity.container_type = "Course"
       user_activity.container_id = self.course_id
       user_activity.save

app/models/forge_activity.rb

@@ -30,8 +30,8 @@ class ForgeActivity < ActiveRecord::Base
       user_activity.save
     else
       user_activity = UserActivity.new
-      user_activity.act_id = self.id
-      user_activity.act_type = self.class.to_s
+      user_activity.act_id = self.forge_act_id
+      user_activity.act_type = self.forge_act_type
       user_activity.container_type = "Project"
       user_activity.container_id = self.project_id
       user_activity.save

app/views/layouts/_logined_header.html.erb

@@ -13,7 +13,7 @@
         <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "homepageWhite f16"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="javascript:void(0);" class="homepageWhite f16">联系人</a>
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="homepageWhite f16">帮助中心</a>
       </li>
     </ul>
   </div>

app/views/layouts/_unlogin_header.html.erb

@@ -1,11 +1,11 @@
 <div class="navHomepage">
   <div class="navHomepageLogo fl">
-    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), "javascript:void(0);"%>
+    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), signin_path%>
   </div>
   <div class="fl">
     <ul>
       <li class="navHomepageMenu fl">
-        <a href="javascript:void(0);" class="c_white f16">帮助中心</a>
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16">帮助中心</a>
       </li>
     </ul>
   </div>

db/migrate/20150820025358_about_user_activities.rb

@@ -5,8 +5,8 @@ class AboutUserActivities < ActiveRecord::Migration
       for i in 1 ... forge_count do i
         ForgeActivity.page(i).per(30).each do |activity|
           user_activity = UserActivity.new
-          user_activity.act_id = activity.id
-          user_activity.act_type = activity.class.to_s
+          user_activity.act_id = activity.forge_act_id
+          user_activity.act_type = activity.forge_act_type
           user_activity.container_type = "Project"
           user_activity.container_id = activity.project_id
           user_activity.created_at = activity.created_at
@@ -20,8 +20,8 @@ class AboutUserActivities < ActiveRecord::Migration
       for i in 1 ... course_count do i
       CourseActivity.page(i).per(30).each do |activity|
         user_activity = UserActivity.new
-        user_activity.act_id = activity.id
-        user_activity.act_type = activity.class.to_s
+        user_activity.act_id = activity.course_act_id
+        user_activity.act_type = activity.course_act_type
         user_activity.container_type = "Course"
         user_activity.container_id = activity.course_id
         user_activity.created_at = activity.created_at

public/stylesheets/base.css

@@ -45,6 +45,8 @@ select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; pa
 .clearfix{clear:both;zoom:1}
 .break_word{ word-break:break-all; word-wrap: break-word;}
 .white_space{white-space:nowrap;}
+a.c_white{ color:#fff !important;}
+input.c_white { color:#fff !important;}
 
 /* Spacing */
 .ml2{ margin-left:2px;}

public/stylesheets/header.css

@@ -103,4 +103,11 @@ a.topnav_login_box:hover {color:#a1ebff;}
 .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
 .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
 a.f_grey {color:#666666;}
-a.f_grey:hover {color:#000000;}
+a.f_grey:hover {color:#000000;}
+
+
+/*注册登陆页面*/
+#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginSignButton:hover {background-color:#0ea6b7;}
+#loginInButton:hover {background-color:#0ea6b7;}