diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index cf356dc05..1d0920c1c 100644
--- a/app/models/course_activity.rb
+++ b/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
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index 5d8de8e3a..b7fc5e4c2 100644
--- a/app/models/forge_activity.rb
+++ b/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
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 40b65f9f9..6013fc453 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -13,7 +13,7 @@
<%= link_to "作业", user_homeworks_user_path(User.current.id), :class => "homepageWhite f16"%>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 446b4876c..d5a9aacad 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,11 +1,11 @@
- <%=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%>
diff --git a/db/migrate/20150820025358_about_user_activities.rb b/db/migrate/20150820025358_about_user_activities.rb
index f3916cff3..ea98e9a32 100644
--- a/db/migrate/20150820025358_about_user_activities.rb
+++ b/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
diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index ba87092c0..fa1bbdd4a 100644
--- a/public/stylesheets/base.css
+++ b/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;}
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 248284b11..eda554eaf 100644
--- a/public/stylesheets/header.css
+++ b/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;}
\ No newline at end of file
+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;}