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

app/controllers/users_controller.rb

@@ -768,7 +768,7 @@ class UsersController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     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')"
+    course_types = "('Message','News','HomeworkCommon','Poll')"
     project_types = "('Message','Issue')"
     if params[:type].present?
       case params[:type]

app/views/users/_course_poll.html.erb

@@ -1,5 +1,6 @@
 <% has_commit = has_commit_poll?(activity.id ,User.current)%>
 <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+<% if has_commit || activity.user_id == User.current %>
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
@@ -43,4 +44,5 @@
     </div>
     <div class="cl"></div>
   </div>
-</div>
+</div>
+<% end %>

app/views/users/_user_activities.html.erb

@@ -23,7 +23,7 @@
                     target.show();
                 }else{
                     btn.data('init',0);
-                    btn.html('点击展开更多回复('+btn.data('count')+')');
+                    btn.html('展开更多('+btn.data('count')+')');
                     target.hide();
                     target.eq(0).show();
                     target.eq(1).show();