From 498775b0a87d1a7fe85a383a66aaead01cf70d5a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:24:54 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AA<=20=E6=95=99=E6=8E=88?=
 =?UTF-8?q?=E8=81=8C=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/login.html.erb         | 1 -
 app/views/layouts/new_base_user.html.erb | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index e7810d45a..b5dc9e75a 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -15,7 +15,6 @@
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
 </head>
-<
 <script type="text/javascript" charset="utf-8">
     $(function() {
         $(document).keyup(function (e) {
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 777dd0da6..65323828e 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -54,7 +54,9 @@
               <span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>
           <% end %>
           <div class="cl"></div>
-          <p class="mb20 c_dark f14">教授</p>
+          <p class="mb20 c_dark f14">
+            <%= get_technical_title @user %>
+          </p>
           <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") if is_current_user%>
           <a href="javascript:void(0);" class="UsersAttBtn" style="display:none;">添加关注</a>
           <a href="javascript:void(0);" class="UsersApBtn" style="display:none;">取消关注</a>

From a2ec65a0c95d4f7235b053bd6a758fd0aeb23ee8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:34:59 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E4=B8=8E=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_user_watch_btn.html.erb | 14 +++++++++-----
 app/views/layouts/new_base_user.html.erb   |  8 +-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/views/layouts/_user_watch_btn.html.erb b/app/views/layouts/_user_watch_btn.html.erb
index 5f9c550b7..aeb8ee08f 100644
--- a/app/views/layouts/_user_watch_btn.html.erb
+++ b/app/views/layouts/_user_watch_btn.html.erb
@@ -1,7 +1,11 @@
 <% if User.current.logged?%>
-    <%if(target.watched_by?(User.current))%>
-        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollow", :method => "delete",:remote => "true", :title => "取消关注"%>
-    <% else %>
-        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollowCancel", :method => "post",:remote => "true", :title => "添加关注"%>
-    <% end %>
+    <% if User.current == target%>
+        <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn")%>
+    <% else%>
+        <%if(target.watched_by?(User.current))%>
+            <%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "UsersApBtn", :method => "delete",:remote => "true", :title => "取消关注"%>
+        <% else %>
+            <%= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "UsersAttBtn", :method => "post",:remote => "true", :title => "添加关注"%>
+        <% end %>
+    <% end%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 65323828e..6d049cee3 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -39,10 +39,6 @@
                   <a href="<%= url_for(:controller => 'my', :action => 'clear_user_avatar_temp') %>" data-remote="true" class="homepageEditProfileIcon"></a>
                 </div>
               </div>
-            <% else %>
-              <div id="watch_user_btn" class="none">
-                <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
-              </div>
             <% end %>
           <% end%>
         </div>
@@ -57,9 +53,7 @@
           <p class="mb20 c_dark f14">
             <%= get_technical_title @user %>
           </p>
-          <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") if is_current_user%>
-          <a href="javascript:void(0);" class="UsersAttBtn" style="display:none;">添加关注</a>
-          <a href="javascript:void(0);" class="UsersApBtn" style="display:none;">取消关注</a>
+          <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
         </div>
         <div class="cl"></div>
         <div>

From b65243ba6200de1c1758f11c04e1cff2b1504156 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:37:53 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E3=80=81=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8js=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 6d049cee3..5176032e5 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -53,7 +53,9 @@
           <p class="mb20 c_dark f14">
             <%= get_technical_title @user %>
           </p>
-          <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
+          <div id="watch_user_btn">
+            <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
+          </div>
         </div>
         <div class="cl"></div>
         <div>

From c0daebd75ccbba5383affa172dcf7967c403a995 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:46:30 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 2 +-
 app/views/my/save_user_avatar.js.erb     | 2 +-
 app/views/watchers/_set_watcher.js.erb   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 5176032e5..32813b58d 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -53,7 +53,7 @@
           <p class="mb20 c_dark f14">
             <%= get_technical_title @user %>
           </p>
-          <div id="watch_user_btn">
+          <div id="watch_user_btn_div">
             <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
           </div>
         </div>
diff --git a/app/views/my/save_user_avatar.js.erb b/app/views/my/save_user_avatar.js.erb
index fb3d94231..03608a768 100644
--- a/app/views/my/save_user_avatar.js.erb
+++ b/app/views/my/save_user_avatar.js.erb
@@ -1,3 +1,3 @@
-$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:214px;height:214px;overflow:hidden",:alt=>"头像") %>');
+$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:90px;height:90px;overflow:hidden",:alt=>"头像") %>');
 $("#nh_user_logo").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_logo',:width =>"40",:height => "40",:alt=>"头像") %>');
 hideModal();
\ No newline at end of file
diff --git a/app/views/watchers/_set_watcher.js.erb b/app/views/watchers/_set_watcher.js.erb
index 1365468cc..d875a38c4 100644
--- a/app/views/watchers/_set_watcher.js.erb
+++ b/app/views/watchers/_set_watcher.js.erb
@@ -1,7 +1,7 @@
 <% if( params[:object_type] == 'user') %>
   //点击头像下面的添加关注按钮
   <% if( params[:target_id] == params[:object_id] ) %>
-    $("#watch_user_btn").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
+    $("#watch_user_btn_div").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
     $("#user_fans_number").html("<%= watched.first.watcher_users.count.to_s%>");
   //在当前用户的粉丝、关注页面
   <% elsif( params[:target_id] == User.current.id.to_s )%>

From 17e9b2d29305788bd8f4de8d888fe68daf5cd742 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:48:47 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E6=96=87=E6=9C=AC=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 2fa219423..190cc7984 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -511,7 +511,7 @@ a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3;
 a:hover.UsersAttBtn{border:1px solid #888888; }
 a.UsersApBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
 a:hover.UsersApBtn{border:1px solid #888888; }
-.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
+.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 0px;}
 .homepageSignature {font-size:12px; color:#888888; margin:10px 0; width:208px;}
 .homepageImageBlock {margin:0 auto; width:68px; float:left; text-align:center; display:inline-block;}
 a.homepageImageNumber {font-size:12px; color:#484848; font-weight: bold;}

From 98d533e8f9df96ea7889f2013467b76ba87b6d7b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 15:34:18 +0800
Subject: [PATCH 6/9] =?UTF-8?q?1=E3=80=81=E6=95=B4=E7=90=86=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E6=96=87=E4=BB=B6=202=E3=80=81=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0=E4=B8=8E=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course_activity.rb                 |  4 +--
 app/models/forge_activity.rb                  |  4 +--
 ...0810064247_add_created_at_to_activities.rb |  2 +-
 .../20150811010817_update_activities_data.rb  | 28 ++++++++---------
 .../20150811065543_add_course_activities.rb   | 10 +++++++
 .../20150811080754_course_activities.rb       |  2 +-
 ...50814031258_update_course_activity_time.rb |  8 +++--
 .../20150820022416_create_user_activity.rb    |  9 +-----
 .../20150820025358_about_user_activities.rb   | 30 +++++++++----------
 db/schema.rb                                  |  1 -
 10 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index 1d0920c1c..284687870 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -10,7 +10,7 @@ class CourseActivity < ActiveRecord::Base
 
   #在个人动态里面增加当前动态
   def add_user_activity
-    user_activity = UserActivity.where("act_type = '#{self.class.to_s}' and act_id = '#{self.id}'").first
+    user_activity = UserActivity.where("act_type = '#{self.course_act_type.to_s}' and act_id = '#{self.course_act_id}'").first
     if user_activity
       user_activity.save
     else
@@ -24,7 +24,7 @@ class CourseActivity < ActiveRecord::Base
   end
 
   def destroy_user_activity
-    user_activity = UserActivity.where("act_type = '#{self.class.to_s}' and act_id = '#{self.id}'")
+    user_activity = UserActivity.where("act_type = '#{self.course_act_type.to_s}' and act_id = '#{self.course_act_id}'")
     user_activity.destroy_all
   end
 end
diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index b7fc5e4c2..9bc10bebf 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -25,7 +25,7 @@ class ForgeActivity < ActiveRecord::Base
 
   #在个人动态里面增加当前动态
   def add_user_activity
-    user_activity = UserActivity.where("act_type = '#{self.class.to_s}' and act_id = '#{self.id}'").first
+    user_activity = UserActivity.where("act_type = '#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'").first
     if user_activity
       user_activity.save
     else
@@ -39,7 +39,7 @@ class ForgeActivity < ActiveRecord::Base
   end
 
   def destroy_user_activity
-    user_activity = UserActivity.where("act_type = '#{self.class.to_s}' and act_id = '#{self.id}'")
+    user_activity = UserActivity.where("act_type = '#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'")
     user_activity.destroy_all
   end
 end
diff --git a/db/migrate/20150810064247_add_created_at_to_activities.rb b/db/migrate/20150810064247_add_created_at_to_activities.rb
index 864ed82d6..e2f35441f 100644
--- a/db/migrate/20150810064247_add_created_at_to_activities.rb
+++ b/db/migrate/20150810064247_add_created_at_to_activities.rb
@@ -3,6 +3,6 @@ class AddCreatedAtToActivities < ActiveRecord::Migration
   	add_column :activities, :created_at, :timestamp
   end
   def end
-  	remove_column :activities, :created_at	
+  	remove_column :activities, :created_at
   end
 end
diff --git a/db/migrate/20150811010817_update_activities_data.rb b/db/migrate/20150811010817_update_activities_data.rb
index 7ed19a607..374407cd3 100644
--- a/db/migrate/20150811010817_update_activities_data.rb
+++ b/db/migrate/20150811010817_update_activities_data.rb
@@ -1,19 +1,19 @@
 class UpdateActivitiesData < ActiveRecord::Migration
   def up 	
-  	count = Activity.all.count / 20 + 1
-    transaction do
-      for i in 1 ... count do i
-        Activity.page(i).per(20).each do |activity|
-          type = activity.act_type
-          if type=='Contest' || type=='Message' || type=='News'|| type=='Journal'|| type=='Issue'|| type=='Principal'||type=='JournalsForMessage'
-            activity.created_at = activity.act.created_on if activity.act
-          elsif type=='Contestnotification' || type=='HomeworkCommon' || type=='Poll'
-            activity.created_at = activity.act.created_at if activity.act
-          end
-          activity.save
-	  	  end
-      end
-    end
+    # count = Activity.all.count / 20 + 1
+    # transaction do
+    #   for i in 1 ... count do i
+    #     Activity.page(i).per(20).each do |activity|
+    #       type = activity.act_type
+    #       if type=='Contest' || type=='Message' || type=='News'|| type=='Journal'|| type=='Issue'|| type=='Principal'||type=='JournalsForMessage'
+    #         activity.created_at = activity.act.created_on if activity.act
+    #       elsif type=='Contestnotification' || type=='HomeworkCommon' || type=='Poll'
+    #         activity.created_at = activity.act.created_at if activity.act
+    #       end
+    #       activity.save
+	  	#   end
+    #   end
+    # end
   end
 
   def down
diff --git a/db/migrate/20150811065543_add_course_activities.rb b/db/migrate/20150811065543_add_course_activities.rb
index 03ec7e354..86b96bd44 100644
--- a/db/migrate/20150811065543_add_course_activities.rb
+++ b/db/migrate/20150811065543_add_course_activities.rb
@@ -1,5 +1,14 @@
 class AddCourseActivities < ActiveRecord::Migration
   def up
+    create_table :user_activities do |t|
+      t.string :act_type
+      t.integer :act_id
+      t.string :container_type
+      t.integer :container_id
+
+      t.timestamps
+    end
+
     create_table :course_activities do |t|
       t.integer :user_id
       t.integer :course_id
@@ -11,5 +20,6 @@ class AddCourseActivities < ActiveRecord::Migration
 
   def down
     drop_table :course_activities
+    drop_table :user_activities
   end
 end
diff --git a/db/migrate/20150811080754_course_activities.rb b/db/migrate/20150811080754_course_activities.rb
index a4cae915d..910cb4520 100644
--- a/db/migrate/20150811080754_course_activities.rb
+++ b/db/migrate/20150811080754_course_activities.rb
@@ -35,6 +35,6 @@ class CourseActivities < ActiveRecord::Migration
   end
 
   def down
-    CourseActivity.destroy_all
+    # CourseActivity.destroy_all
   end
 end
diff --git a/db/migrate/20150814031258_update_course_activity_time.rb b/db/migrate/20150814031258_update_course_activity_time.rb
index 155e212a3..26d0dc4bc 100644
--- a/db/migrate/20150814031258_update_course_activity_time.rb
+++ b/db/migrate/20150814031258_update_course_activity_time.rb
@@ -1,9 +1,9 @@
 class UpdateCourseActivityTime < ActiveRecord::Migration
   def up
-    count = CourseActivity.all.count / 10 + 1
+    count = CourseActivity.all.count / 30 + 1
     transaction do
       for i in 1 ... count do i
-      CourseActivity.page(i).per(10).each do |activity|
+      CourseActivity.page(i).per(30).each do |activity|
         if activity.course_act
           if activity.course_act.respond_to?("created_at")
             activity.created_at = activity.course_act.created_at
@@ -11,6 +11,10 @@ class UpdateCourseActivityTime < ActiveRecord::Migration
             activity.created_at = activity.course_act.created_on
           end
           activity.save
+
+          user_activity = UserActivity.where("act_type = '#{activity.course_act_type.to_s}' and act_id = '#{activity.course_act_id}'").first
+          user_activity.created_at = activity.created_at
+          user_activity.save
         end
       end
       end
diff --git a/db/migrate/20150820022416_create_user_activity.rb b/db/migrate/20150820022416_create_user_activity.rb
index 7d6a978d1..0ff64b1f3 100644
--- a/db/migrate/20150820022416_create_user_activity.rb
+++ b/db/migrate/20150820022416_create_user_activity.rb
@@ -1,16 +1,9 @@
 class CreateUserActivity < ActiveRecord::Migration
   def up
-    create_table :user_activities do |t|
-      t.string :act_type
-      t.integer :act_id
-      t.string :container_type
-      t.integer :container_id
 
-      t.timestamps
-    end
   end
 
   def down
-    drop_table :user_activities
+
   end
 end
diff --git a/db/migrate/20150820025358_about_user_activities.rb b/db/migrate/20150820025358_about_user_activities.rb
index 82b58a537..e02b4711f 100644
--- a/db/migrate/20150820025358_about_user_activities.rb
+++ b/db/migrate/20150820025358_about_user_activities.rb
@@ -15,23 +15,23 @@ class AboutUserActivities < ActiveRecord::Migration
       end
     end
 
-    course_count = CourseActivity.all.count / 30 + 2
-    transaction do
-      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.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
-        user_activity.save
-      end
-      end
-    end
+    # course_count = CourseActivity.all.count / 30 + 2
+    # transaction do
+    #   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.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
+    #     user_activity.save
+    #   end
+    #   end
+    # end
   end
 
   def down
-    UserActivity.destroy_all
+    # UserActivity.destroy_all
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 5b09c8f3d..3c43292e5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -913,7 +913,6 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"

From 5ddefe21b858a71e91a7f908b0704a1fca84a4c7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 29 Aug 2015 16:39:37 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B53080?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=8A=A8=E6=80=81=E5=BC=82=E5=B8=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 8 +++++---
 app/views/users/show.html.erb       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 900af0e77..0058e6e4c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -627,14 +627,15 @@ class UsersController < ApplicationController
   end
 
   def show
+
     @page = params[:page] ? params[:page].to_i + 1 : 0
-    @type = params[:type]
+
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','poll')"
     project_types = "('Message','Issue')"
-    if @type
-      case @type
+    if params[:type].present?
+      case params[:type]
         when "course_homework"
           @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('created_at desc').limit(10).offset(@page * 10)
         when "course_news"
@@ -654,6 +655,7 @@ class UsersController < ApplicationController
       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500
+    @type = params[:type]
     respond_to do |format|
       format.js
       format.html {render :layout => 'new_base_user'}
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 91a35e711..74ca48595 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -14,7 +14,7 @@
     $(window).scroll(scrollHandler);
 </script>
 
-<input type="hidden" value="<%= @type%>" id="user_activities_type">
+<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="resources">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>

From efe5c1e3f404078d6544e36bf71fc3605481d71c Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 16:52:10 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_history.html.erb  |  2 +-
 app/views/news/_course_form.html.erb |  2 +-
 app/views/poll/_poll.html.erb        |  2 +-
 public/stylesheets/courses.css       | 32 ++++++++++++++--------------
 public/stylesheets/header.css        |  4 ++--
 public/stylesheets/polls.css         | 16 +++++++-------
 public/stylesheets/public.css        |  4 ++--
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 864509546..70e943e99 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -5,7 +5,7 @@
           <div class="ping_dispic">
             <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
           </div>
-          <div class="ping_discon upload_img" style="width: 610px;">
+          <div class="ping_discon upload_img" style="width: 670px;">
             <div class="ping_distop f14">
               <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index 0a5488714..6d4e915ea 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -27,7 +27,7 @@
     <%= render :partial => 'attachments/new_form', :locals => {:container => @news} %>
     <div class="cl"></div>
   </li>
-  <li class="ml40" >
+  <li class="ml50" >
     <% if is_new %>
       <%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %>
       <%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %>
diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index 1828ede6d..1d5752a28 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -2,7 +2,7 @@
 <% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
 <% if @is_teacher%>
   <li title="<%= poll.polls_name %>">
-    <div style="width: 310px;float: left;">
+    <div style="width: 370px;float: left;">
       <% if has_commit %>
           <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
       <% else %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 1393431d7..1a18ca705 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1,7 +1,7 @@
 
 /*右侧内容--动态*/
-.project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
-.project_r_h02{ width:920px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_r_h{ width:730px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;}
 .project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
 .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
 .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
@@ -52,7 +52,7 @@ a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
 .problem_p span{ color:#ff3e00;}
 a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
 a:hover.problem_pic{border:1px solid #64bdd9;}
-.problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
+.problem_txt{ width:670px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;}
 a.problem_name{ color:#ff5722;max-width:60px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
 a:hover.problem_name{ color:#d33503;}
 a.problem_tit{ color:#0781b4; max-width:410px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;}
@@ -105,14 +105,14 @@ a:hover.grey_btn{ background:#717171; color:#fff;}
 .w90{width:90px;}
 .ml10{margin-left:10px;}
 .resource{  width:670px;}
-.re_top{width:660px; height:40px; background:#eaeaea; padding:5px;}
+.re_top{width:720px; height:40px; background:#eaeaea; padding:5px;}
 .re_top input{ float:left;}
 .re_search{ margin-top:7px; margin-left:5px;}
 .re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
 .re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px;padding-left: 0px;}
 a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
 a:hover.re_fabu{background:#55a1b9;}
-.re_con{ margin:5px; width:665px;}
+.re_con{ margin:5px; width:720px;}
 .re_con_top{color:#494949; }
 .re_con_top span{ color:#999999; font-weight:bold;}
 a.re_select{ display:block;  border:1px solid #ff9900; color:#ff9900;  margin-left:10px; padding:1px 5px;}
@@ -172,7 +172,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
 .wzan a{ display: block;}
 a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
 a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
-.msg_box{ width:670px;  border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box{ width:728px;  border-bottom:1px dashed #CCC; padding-top:10px;}
 .msg_box h4{ }
 .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666;  font-size:12px; }
 
@@ -212,7 +212,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_C{border-bottom:1px dashed #CCC; padding:10px 0 0px;}
 .ping_dispic a{ display:block; height:46px; width:46px; border:1px solid #CCC; padding:1px; float:left;}
 .ping_dispic a:hover{border:1px solid #15bccf;}
-.ping_discon{ float:left; width:610px; margin-left:10px; }
+.ping_discon{ float:left; width:670px; margin-left:10px; }
 /*.ping_distop span{ float:left;}*/
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
@@ -221,16 +221,16 @@ a:hover.ping_sub{ background:#14a8b9;}
 /* 创建作品 work */
 .Newwork{ width:668px; height:418px;}
 .N_top{ float:right; margin-left:390px; }
-.N_con{ color:#484747; font-weight:bold; width:660px; margin-top:10px; }
+.N_con{ color:#484747; font-weight:bold; width:710px; margin-top:10px; }
 .N_con p{ }
 .w430{ width:470px;}
 .w557{ width:557px;}
 .w350{ width:350px;}
 .h400{height: 400px !important;}
 .w620{ width:480px; height:160px; border:1px solid #CCC;}
-.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px;  }
+.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:530px;  }
 .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999;  }
-.hwork_txt{ width:560px; padding-left:5px; background:#fff;}
+.hwork_txt{ width:610px; padding-left:5px; background:#fff;}
 a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;}
 a:hover.tijiao{ background:#0f99a9;}
 .members_left{ float:left; width:410px;  margin-right:20px; text-align:center;}
@@ -556,7 +556,7 @@ a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; pa
 
 /* 20150423作业评分*/
 .ml14{ margin-left:14px;}
-.w548{ width:552px;}
+.w548{ width:600px;}
 .w547{ width:544px;}
 .w196{ width:182px;}
 .w459{ width:459px;}
@@ -572,18 +572,18 @@ a:hover.icon_add{background:url(../stylesheets/images/icons.png) -20px -310px no
 .w664{ width:664px;}
 .w140{ width:140px;}
 .talklist_box{  }
-.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9;  margin-bottom:20px; margin-top: 10px;}
+.talkmain_box{ width:730px; border-bottom:1px dashed #d9d9d9;  margin-bottom:20px; margin-top: 10px;}
 .talkmain_pic{}
 a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
 a:hover.talkmain_pic{border:1px solid #64bdd9;}
-.talkmain_txt{ width:610px; margin-left:10px; color:#333;}
+.talkmain_txt{ width:670px; margin-left:10px; color:#333;}
 a.talkmain_name{ color:#ff5722;}
 a:hover.talkmain_name{ color:#d33503;}
 .talkmain_tit{ color:#0781b4; width:450px; display:block; }
 .talklist_main{   }
 /*.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}*/
 .talkConIpt{ background:#f2f2f2; }
-.talkWrapBox{ width:610px; margin-left:60px; }
+.talkWrapBox{ width:660px; margin-left:60px; }
 .inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px;  margin-bottom:5px;color:#666;}
 .inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px;  margin:5px 0 5px 50px; color:#666;}
 .inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px;  margin:5px 0 5px 0px; color:#666;}
@@ -592,7 +592,7 @@ a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid
 a:hover.Msg_pic{border:1px solid #64bdd9;}
 a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;}
 a:hover.Reply_pic{border:1px solid #64bdd9;}
-.Msg_txt{ float:left; width:540px; margin-left:10px;}
+.Msg_txt{ float:left; width:630px; margin-left:10px;}
 .Msg_txt p{ }
 .talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
 .talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
@@ -604,7 +604,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 
 /* 20150423作业评分*/
 .ml14{ margin-left:14px;}
-.w548{ width:552px;}
+.w548{ width:600px;}
 .w547{ width:544px;}
 .w196{ width:196px;}
 .w186{ width:186px;}
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 6b7aa209e..28caa2639 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -90,8 +90,8 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
 a.topnav_login_box:hover {color:#a1ebff;}
 .navRow1 {margin:0; padding:0;}
 .navRow2 {margin:0; padding:0;}
-.topnav_login_list{ border:1px solid #15bccf; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -5px;}
-.topnav_login_list a{color:#15bccf;}
+.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;margin-top: -4px;}
+.topnav_login_list a{color:#269ac9;}
 .topnav_login_list li{ }
 
 /*底部*/
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 9f7b2d021..5ab4fab81 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -7,8 +7,8 @@
 
 /*问卷列表*/
 .polls_content{ width:609px;}
-.polls_content02{ width:670px;}
-.polls_head{ width:670px; height:48px; background:#eaeaea;}
+.polls_content02{ width:730px;}
+.polls_head{ width:730px; height:48px; background:#eaeaea;}
 .polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;}
 .polls_head span{ font-weight:normal; color:#15bccf;}
 a.newbtn{ float:right; display:block; width:80px; height:27px; padding-top:3px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;}
@@ -61,7 +61,7 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 /*问卷编辑*/
 .polls_edit{ color:#767676;}
 a:hover{ text-decoration:none; cursor:pointer;}
-.tabs{ width:658px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
+.tabs{ width:718px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
 .tab_item { float:left; height:30px; background:#eeeeee; margin-right:4px; padding:0 8px; margin-bottom:10px;}
 .icon_delete{ font-size:16px;}
 a:hover.icon_delete{ font-weight: bold;}
@@ -69,7 +69,7 @@ a:hover.icon_delete{ font-weight: bold;}
 .tab_add{float:left;  width:22px; height:22px; border:1px solid #cbcbcb; margin-top:6px; }
 .icon_page_add{ background:url(images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;}
 a:hover.icon_page_add{ background:url(images/icons.png) -16px -314px no-repeat;}
-.tab_item02{ float:left; width:139px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;}
+.tab_item02{ float:left; width:154px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;}
 .tab_item02:hover{ background:#c9c9c9;}
 .tab_icon{padding-left:25px;}
 a:hover.tab_item02{ background:#fff;}
@@ -78,9 +78,9 @@ a:hover.tab_item02{ background:#fff;}
 .icon_text{background:url(images/icons.png) 0px -80px no-repeat; }
 .icon_textarea{background:url(images/icons.png) 0px -121px no-repeat; }
 
-.ur_editor {width:648px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
+.ur_editor {width:708px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
 .ur_title_editor_title{ margin-bottom:10px;}
-.input_title{ width:627px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;}
+.input_title{ width:688px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;}
 .textarea_editor{  width:627px; height:120px; padding:10px; margin-bottom:10px; background:#fff; border-style:solid; border:1px solid #CBCBCB;}
 .btn_submit{ width:56px; height:24px;  padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;}
 a:hover.btn_submit{background:#0fa9bb;}
@@ -98,7 +98,7 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
 a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 .ur_editor_toolbar{ margin-bottom:10px;}
 .ur_editor_toolbar input{ width:40px; height:20px; background:#fff;}
-.ur_editor02{width:648px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
+.ur_editor02{width:708px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
 a.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; }
 a:hover.ur_button_submit{ background:#0fa9bb; text-decoration:none;}
 
@@ -139,7 +139,7 @@ a:hover.btn_pu{ background:#3cb761;}
 .polls_n p{ margin-top:-4px;}
 
 /***新增20150123***/
-.ur_buttons{ width:275px; }
+.ur_buttons{ width:260px; }
 .ur_button_submit{ float:left;}
 .polls_cha{float:left; margin-left:15px; margin-top:10px;}
 
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4cc859721..f2155ca20 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -225,7 +225,7 @@ a:hover.blue_n_btn{ background:#329cbd;}
 
 
 /*框架主类容*/
-#Container{ width:940px; margin:0 auto; }
+#Container{ width:1000px; margin:0 auto; }
 
 /*头部导航*/
 #Header{ margin:10px 0; background:#15bccf; height:40px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; }
@@ -291,7 +291,7 @@ a:hover.search_btn{ background: #0fa9bb;}
 .search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
 /*主类容左右分栏*/
 #LSide{ width:240px;   }
-#RSide{ width:670px;  margin-left:10px;  background:#fff; padding:10px; margin-bottom:10px;}
+#RSide{ width:730px;  margin-left:10px;  background:#fff; padding:10px; margin-bottom:10px;}
 
 
 /*底部*/

From a7f161804eda4423a43f32e75ca4199deb8005e8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 29 Aug 2015 16:59:13 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=92=8C=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_homework.html.erb |  4 ++--
 app/views/users/_course_message.html.erb  |  6 +++---
 app/views/users/_course_news.html.erb     |  6 +++---
 app/views/users/_course_poll.html.erb     |  4 ++--
 app/views/users/_project_issue.html.erb   | 12 ++++++------
 app/views/users/_project_message.html.erb |  8 ++++----
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 10bbe4bdf..a3d4992c5 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mb8" style="word-break:break-all;">
+      <div class="homepagePostTo mb8 break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
       </div>
-      <div class="homepagePostTitle mb8" style="word-break:break-all;"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle mb8 break_word"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
       </div>
       <div class="homepagePostSubmitContainer">
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index f8b5c70a1..05caa1f91 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -4,7 +4,7 @@
           <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
         </div>
         <div class="homepagePostDes">
-          <div class="homepagePostTo mb12" style="word-break:break-all;">
+          <div class="homepagePostTo mb12 break_word">
             <% if activity.try(:author).try(:realname) == ' ' %>
                 <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
             <% else %>
@@ -14,7 +14,7 @@
             <%= link_to activity.course.name.to_s+" | 课程讨论区", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
             <%#= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
           </div>
-          <div class="homepagePostTitle mb12" style="word-break:break-all;">
+          <div class="homepagePostTitle mb12 break_word">
             <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
               <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
             <% else %>
@@ -106,7 +106,7 @@
                                     ) if reply.course_destroyable_by?(User.current) %>
                                 <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                               </div>
-                              <div class="homepagePostReplyContent"><%= reply.content.html_safe %></div>
+                              <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
                             </div>
                             <div class="cl"></div>
                           </li>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 15fc74386..dbeb8d450 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mb12" style="word-break:break-all;">
+      <div class="homepagePostTo mb12 break_word">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %> TO  <!--+"(课程名称)"-->
         <%= link_to activity.course.name.to_s+" | 课程通知", course_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %>
       </div>
-      <div class="homepagePostTitle mb12" style="word-break:break-all;"> <!--+"(通知标题)"-->
+      <div class="homepagePostTitle mb12 break_word"> <!--+"(通知标题)"-->
         <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %>
       </div>
       <div class="homepagePostSubmitContainer">
@@ -83,7 +83,7 @@
                                                        :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
                       <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
-                    <div class="homepagePostReplyContent"><%= comment.comments.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word"><%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index f0a2a8aba..97b3b759d 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -7,7 +7,7 @@
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo" style="word-break:break-all;">
+      <div class="homepagePostTo mb12 break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -17,7 +17,7 @@
         <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
         <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
-      <div class="homepagePostTitle" style="word-break:break-all;">
+      <div class="homepagePostTitle break_word" >
         <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %>
         <% if has_commit %>
             <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 0ee4f30fb..a56a4dd1f 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mb12"  style="word-break:break-all;">
+      <div class="homepagePostTo mb12 break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目缺陷", project_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
         </div>
-      <div class="homepagePostTitle mb12" style="word-break:break-all;">
+      <div class="homepagePostTitle mb12 break_word">
         <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %>
         <span class='<%= get_issue_priority(activity.priority_id)[0] %>'><%= get_issue_priority(activity.priority_id)[1] %></span>
       </div>
@@ -28,11 +28,11 @@
         </div>
         <div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div>
       </div>
-      <div class="homepagePostIntro" id="activity_description_<%= user_activity.id %>">缺陷描述：<%= activity.description.html_safe %></div>
+      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id %>">缺陷描述：<%= activity.description.html_safe %></div>
       <div class="mt10" style="font-weight:normal;">
         <% if activity.attachments.any? %>
             <% activity.attachments.each do |attachment| %>
-                  <div style="white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;">
+                  <div class="break_word">
                   <span title="<%= attachment.filename %>" id="attachment_">
                     <%= link_to_short_attachment attachment, :class => 'homepagePostFileAtt newsBlue', :download => true -%>
                   </span>
@@ -116,10 +116,10 @@
                     </div>
                     <% if reply.details.any? %>
                         <% details_to_strings(reply.details).each do |string| %>
-                            <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%= string %></div>
+                            <div class="homepagePostReplyContent break_word"><%= string %></div>
                         <% end %>
                     <% else %>
-                        <div class="homepagePostReplyContent"><%= reply.notes.html_safe %></div>
+                        <div class="homepagePostReplyContent break_word"><%= reply.notes.html_safe %></div>
                     <% end %>
                   </div>
                   <div class="cl"></div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 89f149303..16b003bd8 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mb12" style="word-break:break-all;">
+      <div class="homepagePostTo mb12 break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
             <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -14,7 +14,7 @@
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
       </div>
-      <div class="homepagePostTitle mb12" style="word-break:break-all;">
+      <div class="homepagePostTitle mb12 break_word">
         <% if activity.parent_id.nil? %>
             <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
         <% else %>
@@ -24,7 +24,7 @@
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
       </div>
-      <div class="homepagePostIntro" id="activity_description_<%= user_activity.id%>">帖子描述：
+      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">帖子描述：
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>
@@ -103,7 +103,7 @@
                           ) if reply.course_destroyable_by?(User.current) %>
                       <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
-                    <div class="homepagePostReplyContent"><%= reply.content.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>