From fcb4289c5b26df5f4f3229abe5263c27de0191f9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 13 Jun 2017 10:14:11 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E6=9F=A5=E7=9C=8B?=
=?UTF-8?q?=E9=A1=B5=E7=9A=84=E7=BC=96=E8=BE=91=E5=85=A5=E5=8F=A3=E8=AF=B7?=
=?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E9=86=92=E7=9B=AE=E7=9A=84=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/challenges/show.html.erb | 3 ++-
public/editormd/editormd.js | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/views/challenges/show.html.erb b/app/views/challenges/show.html.erb
index 9541a0b60..92d1a2b01 100644
--- a/app/views/challenges/show.html.erb
+++ b/app/views/challenges/show.html.erb
@@ -27,7 +27,8 @@
第<%= @challenge.position %>关<%= @challenge.subject %>
-
+
+ 编辑
diff --git a/public/editormd/editormd.js b/public/editormd/editormd.js
index ffd7e8b73..d9c3443a2 100644
--- a/public/editormd/editormd.js
+++ b/public/editormd/editormd.js
@@ -1502,7 +1502,7 @@
var tex = $(this);
editormd.$katex.render(tex.text(), tex[0]);
- tex.find(".katex").css("font-size", "1.6em");
+ tex.find(".katex").css("font-size", "1.0em");
});
return this;
@@ -4015,7 +4015,7 @@
div.find("." + editormd.classNames.tex).each(function(){
var tex = $(this);
katex.render(tex.html().replace(/</g, "<").replace(/>/g, ">"), tex[0]);
- tex.find(".katex").css("font-size", "1.6em");
+ tex.find(".katex").css("font-size", "1.0em");
});
};
From 841c334c33d77fa373014bdc5ec504f0423c703f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 13 Jun 2017 10:22:09 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
=?UTF-8?q?=E7=9A=84tab=E6=A0=B7=E5=BC=8F=E4=B8=8E=E2=80=9C=E6=88=91?=
=?UTF-8?q?=E7=9A=84=E5=AE=9E=E8=AE=AD=E2=80=9D=E4=BF=9D=E6=8C=81=E4=B8=80?=
=?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/_edu_user_watch_fan_list.html.erb | 4 ++--
app/views/users/show.html.erb | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/views/users/_edu_user_watch_fan_list.html.erb b/app/views/users/_edu_user_watch_fan_list.html.erb
index 9249dd3af..1fa49861a 100644
--- a/app/views/users/_edu_user_watch_fan_list.html.erb
+++ b/app/views/users/_edu_user_watch_fan_list.html.erb
@@ -4,12 +4,12 @@
<%= str %>的关注
<%= @user_watchlist_count %>
-
+
<%= str %>的粉丝
<%= @user_fanlist_count %>
-
+
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index f58a167d8..ea2ee1b82 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -194,12 +194,12 @@
<% str = current_user ? '' : 'TA的' %>
<% if @courses_count == 0 %>
- 实训<%= @shixuns_count %>
+ 实训<%= @shixuns_count %>
<% elsif @shixuns_count == 0 %>
- 课堂<%= @courses_count %>
+ 课堂<%= @courses_count %>
<% else %>
- 课堂<%= @courses_count %>
- 实训<%= @shixuns_count %>
+ 课堂<%= @courses_count %>
+ 实训<%= @shixuns_count %>
<% end %>
From 7e8eb7eae529a334cca046ecc6f914a52387cc7a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 13 Jun 2017 14:45:11 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=95=99=E8=A8=80?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89=E5=B7=A6=E4=BE=A7=E6=A0=8F?=
=?UTF-8?q?=EF=BC=8C=E6=8A=8A=E7=95=99=E8=A8=80=E6=8F=90=E4=B8=8A=E6=9D=A5?=
=?UTF-8?q?=EF=BC=8C1200=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/users_controller.rb | 2 +-
app/views/layouts/edu_new_base_user.html.erb | 139 +++++++
app/views/layouts/new_base_user.html.erb | 370 +++++++++---------
app/views/users/_message_replies.html.erb | 4 +-
.../users/_user_journal_post_reply.html.erb | 6 +-
.../users/_user_journalsformessage.html.erb | 10 +-
app/views/users/_wide_reply_banner.html.erb | 32 ++
app/views/users/user_newfeedback.html.erb | 4 +-
public/stylesheets/css/public.css | 1 +
public/stylesheets/css/structure.css | 9 +
10 files changed, 380 insertions(+), 197 deletions(-)
create mode 100644 app/views/layouts/edu_new_base_user.html.erb
create mode 100644 app/views/users/_wide_reply_banner.html.erb
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d7e4af7ab..ee6a276da 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1729,7 +1729,7 @@ class UsersController < ApplicationController
# end
# end
@state = false
- render :layout=>'new_base_user'
+ render :layout => 'edu_new_base_user'
end
#给某人留言
diff --git a/app/views/layouts/edu_new_base_user.html.erb b/app/views/layouts/edu_new_base_user.html.erb
new file mode 100644
index 000000000..747eb70b4
--- /dev/null
+++ b/app/views/layouts/edu_new_base_user.html.erb
@@ -0,0 +1,139 @@
+
+
+
+
+
<%= h html_title %>
+
+
+ <%= csrf_meta_tag %>
+ <%= favicon %>
+ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/edu-popup','css/edu-common', "css/edu-public",'css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user','css/font-awesome', :media => 'all' %>
+ <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+ <%= javascript_heads %>
+ <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
+ <%= heads_for_theme %>
+ <%= call_hook :view_layouts_base_html_head %>
+ <%= yield :header_tags -%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%= render :partial => 'layouts/footer' %>
+
+
+
+
+ <%= l(:label_loading) %>
+
+
+ <%= render :partial => 'layouts/upload_avatar', :locals => {:source => @user} %>
+
+
+
+
+
\ 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 91ca49038..1bd24ce86 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -77,198 +77,200 @@
-
-
-
- <% if User.current.logged? && User.current == @user %>
+ <% if params[:action] != "user_newfeedback" %>
+
+
+
+ <% if User.current.logged? && User.current == @user %>
<%= link_to image_tag(url_to_avatar(@user),width:"238", height: "200", :id => 'nh_source_tx'),
my_clear_user_avatar_temp_path, :remote => true %>
- <% else %>
+ <% else %>
<%=image_tag(url_to_avatar(@user),width:"238", height: "200", :id=>'nh_source_tx') %>
- <% end %>
-
-
-
- <%= link_to @user.show_name, user_path(@user), :class => "mb5 fontGrey3" %>
- <% if @user.user_extensions && @user.user_extensions.identity %>
- (<%= get_user_roll @user %>)
- <% end%>
- <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
-
- <% end %>
-
-
<%= @user.login %>
-
- <% if !@user.user_extensions.school_id.blank? %>
- <%= @user.user_extensions.school.name %>
- <% end %>
-
-
-
- -
- 博客
- <%= @user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %>
-
- -
- 关注
- <%= User.watched_by(@user).count %>
-
- -
- 粉丝
- <%= @user.watcher_users.count %>
-
-
-
- <% if User.current.logged?%>
- <% if User.current == @user %>
- <%= link_to '个人主页', homepage_user_path(@user), :class => "home-big-btn-grey", :target => '_blank' %>
- <% else %>
- <% if(@user.watched_by?(User.current)) %>
- <%= link_to "取消关注",
- watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
- :class => "home-btn-grey fl mr12",
- :method => "delete",
- :remote => "true",
- :title => "取消关注" %>
- <% else %>
- <%= link_to "添加关注",
- watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
- :class => "home-btn-grey fl mr12",
- :method => "post",
- :remote => "true",
- :title => "添加关注" %>
- <% end %>
- <% if @user.base_homepage.nil? %>
-
TA的主页
- <% else %>
- <%= link_to "TA的主页", homepage_user_path(@user.login), :class => 'home-btn-grey fl', :target => '_blank' %>
- <% end %>
- <% end %>
<% end %>
-
- <% if is_current_user %>
- <% if hidden_unproject_infos && user_course_count > 0 %>
-
-
- <%= link_to "课程社区", user_course_community_path(User.current), :class => "fl" , :target => "_blank", :style => "color:#666" %>
-
- <%# if hidden_unproject_infos %>
-
- -
- <%= link_to user_course_count > 0 ? "课程#{user_course_count}".html_safe : "课程",
- user_course_community_path(User.current), :id => "user_course_list", :target => "_blank" %>
-
- <% if user_manage_homework_count > 0 %>
- -
- <%= link_to user_manage_homework_count > 0 ? "我发布的作业#{user_manage_homework_count}".html_safe : "我发布的作业",
- user_manage_homeworks_user_path(@user), :target => "_blank" %>
-
- <% end %>
- <% if user_receive_homework_count > 0 %>
- -
- <%= link_to "我收到的作业#{user_receive_homework_count}".html_safe,
- user_receive_homeworks_user_path(@user), :target => "_blank" %>
-
- <% end %>
- -
- <%= link_to "题库", user_homeworks_user_path(User.current), :target => "_blank", :class => "fl", :style => "color:#666" %>
-
- -
- <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank", :class => "fl", :style => "color:#666" %>
-
-
- <%# end %>
-
- <% end %>
- <% if user_project_count > 0%>
-
-
- <%= link_to "项目社区", user_project_community_path(User.current), :class => "fl", :target => "_blank", :style => "color:#666" %>
-
-
- -
- <%= link_to user_project_count > 0 ? "项目#{user_project_count}".html_safe : "项目",
- user_project_community_path(User.current), :id => 'user_project_list', :target => "_blank" %>
-
- <% if issues_author_is_self_count > 0 %>
- -
- <%= link_to issues_author_is_self_count > 0 ? "我发布的issue#{issues_author_is_self_count}".html_safe : "我发布的issue",
- user_manage_issues_user_path(@user), :target => "_blank" %>
-
- <% end %>
- <% if issues_assigned_is_self_count > 0 %>
- -
- <%= link_to issues_assigned_is_self_count > 0 ? "我收到的issue#{issues_assigned_is_self_count}".html_safe : "我收到的issue",
- user_receive_issues_user_path(@user), :target => "_blank" %>
-
- <% end %>
-
-
- <% end %>
- <% if hidden_unproject_infos && user_contest_count > 0 %>
-
-
- <%= link_to "竞赛社区", user_contest_community_path(User.current), :class => "fl" , :target => "_blank"%>
-
-
- -
- <%= link_to user_contest_count > 0 ? "竞赛#{user_contest_count}".html_safe : "竞赛",
- user_contest_community_path(User.current), :id => "user_contest_list", :target => "_blank" %>
-
-
- <%# end %>
-
- <% end %>
- <% else %>
-
-
Ta在确实
- <%= time_tag(@user.created_on).html_safe %>
-
-
- <% if hidden_unproject_infos && user_course_count > 0 %>
- -
- <%= link_to user_course_count > 0 ? "课程#{user_course_count}".html_safe : "课程",
- user_course_community_path(@user), :id => "user_course_list", :class => "fl", :target => "_blank" %>
-
- <% end %>
- <% if user_project_count > 0 %>
- -
- <%= link_to user_project_count > 0 ? "项目#{user_project_count}".html_safe : "项目",
- user_project_community_path(@user), :id => 'user_project_list', :class => "fl", :target => "_blank" %>
-
- <% end %>
- <% if hidden_unproject_infos && user_contest_count > 0 %>
- -
- <%= link_to user_contest_count > 0 ? "竞赛#{user_contest_count}".html_safe : "竞赛",
- user_contest_community_path(@user), :id => 'user_contest_list', :class => "fl", :target => "_blank" %>
-
- <% end %>
-
+
+
+ <%= link_to @user.show_name, user_path(@user), :class => "mb5 fontGrey3" %>
+ <% if @user.user_extensions && @user.user_extensions.identity %>
+ (<%= get_user_roll @user %>)
+ <% end%>
+ <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
+
+ <% end %>
+
+
<%= @user.login %>
+
+ <% if !@user.user_extensions.school_id.blank? %>
+ <%= @user.user_extensions.school.name %>
+ <% end %>
+
+
+
+ -
+ 博客
+ <%= @user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %>
+
+ -
+ 关注
+ <%= User.watched_by(@user).count %>
+
+ -
+ 粉丝
+ <%= @user.watcher_users.count %>
+
+
+
+ <% if User.current.logged?%>
+ <% if User.current == @user %>
+ <%= link_to '个人主页', homepage_user_path(@user), :class => "home-big-btn-grey", :target => '_blank' %>
+ <% else %>
+ <% if(@user.watched_by?(User.current)) %>
+ <%= link_to "取消关注",
+ watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
+ :class => "home-btn-grey fl mr12",
+ :method => "delete",
+ :remote => "true",
+ :title => "取消关注" %>
+ <% else %>
+ <%= link_to "添加关注",
+ watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
+ :class => "home-btn-grey fl mr12",
+ :method => "post",
+ :remote => "true",
+ :title => "添加关注" %>
+ <% end %>
+ <% if @user.base_homepage.nil? %>
+
TA的主页
+ <% else %>
+ <%= link_to "TA的主页", homepage_user_path(@user.login), :class => 'home-btn-grey fl', :target => '_blank' %>
+ <% end %>
+ <% end %>
+ <% end %>
- <% end %>
-
-
- -
- <%= link_to "留言", feedback_path(@user, :host=> Setting.host_user)%>
-
-
-
+
+ <% if is_current_user %>
+ <% if hidden_unproject_infos && user_course_count > 0 %>
+
+
+ <%= link_to "课程社区", user_course_community_path(User.current), :class => "fl" , :target => "_blank", :style => "color:#666" %>
+
+ <%# if hidden_unproject_infos %>
+
+ -
+ <%= link_to user_course_count > 0 ? "课程#{user_course_count}".html_safe : "课程",
+ user_course_community_path(User.current), :id => "user_course_list", :target => "_blank" %>
+
+ <% if user_manage_homework_count > 0 %>
+ -
+ <%= link_to user_manage_homework_count > 0 ? "我发布的作业#{user_manage_homework_count}".html_safe : "我发布的作业",
+ user_manage_homeworks_user_path(@user), :target => "_blank" %>
+
+ <% end %>
+ <% if user_receive_homework_count > 0 %>
+ -
+ <%= link_to "我收到的作业#{user_receive_homework_count}".html_safe,
+ user_receive_homeworks_user_path(@user), :target => "_blank" %>
+
+ <% end %>
+ -
+ <%= link_to "题库", user_homeworks_user_path(User.current), :target => "_blank", :class => "fl", :style => "color:#666" %>
+
+ -
+ <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank", :class => "fl", :style => "color:#666" %>
+
+
+ <%# end %>
+
+ <% end %>
+ <% if user_project_count > 0%>
+
+
+ <%= link_to "项目社区", user_project_community_path(User.current), :class => "fl", :target => "_blank", :style => "color:#666" %>
+
+
+ -
+ <%= link_to user_project_count > 0 ? "项目#{user_project_count}".html_safe : "项目",
+ user_project_community_path(User.current), :id => 'user_project_list', :target => "_blank" %>
+
+ <% if issues_author_is_self_count > 0 %>
+ -
+ <%= link_to issues_author_is_self_count > 0 ? "我发布的issue#{issues_author_is_self_count}".html_safe : "我发布的issue",
+ user_manage_issues_user_path(@user), :target => "_blank" %>
+
+ <% end %>
+ <% if issues_assigned_is_self_count > 0 %>
+ -
+ <%= link_to issues_assigned_is_self_count > 0 ? "我收到的issue#{issues_assigned_is_self_count}".html_safe : "我收到的issue",
+ user_receive_issues_user_path(@user), :target => "_blank" %>
+
+ <% end %>
+
+
+ <% end %>
+ <% if hidden_unproject_infos && user_contest_count > 0 %>
+
+
+ <%= link_to "竞赛社区", user_contest_community_path(User.current), :class => "fl" , :target => "_blank"%>
+
+
+ -
+ <%= link_to user_contest_count > 0 ? "竞赛#{user_contest_count}".html_safe : "竞赛",
+ user_contest_community_path(User.current), :id => "user_contest_list", :target => "_blank" %>
+
+
+ <%# end %>
+
+ <% end %>
+ <% else %>
+
+
Ta在确实
+ <%= time_tag(@user.created_on).html_safe %>
+
+
+ <% if hidden_unproject_infos && user_course_count > 0 %>
+ -
+ <%= link_to user_course_count > 0 ? "课程#{user_course_count}".html_safe : "课程",
+ user_course_community_path(@user), :id => "user_course_list", :class => "fl", :target => "_blank" %>
+
+ <% end %>
+ <% if user_project_count > 0 %>
+ -
+ <%= link_to user_project_count > 0 ? "项目#{user_project_count}".html_safe : "项目",
+ user_project_community_path(@user), :id => 'user_project_list', :class => "fl", :target => "_blank" %>
+
+ <% end %>
+ <% if hidden_unproject_infos && user_contest_count > 0 %>
+ -
+ <%= link_to user_contest_count > 0 ? "竞赛#{user_contest_count}".html_safe : "竞赛",
+ user_contest_community_path(@user), :id => 'user_contest_list', :class => "fl", :target => "_blank" %>
+
+ <% end %>
+
+
+ <% end %>
+
+
+ -
+ <%= link_to "留言", feedback_path(@user, :host=> Setting.host_user)%>
+
+
+
- <%# 更新访问数,刷新的时候更新访问次数 %>
- <% update_visiti_count @user %>
-
-
+ <%# 更新访问数,刷新的时候更新访问次数 %>
+ <% update_visiti_count @user %>
+
+
+
-
+<% end %>
diff --git a/app/views/users/_message_replies.html.erb b/app/views/users/_message_replies.html.erb
index 78f05a40e..56a962e1b 100644
--- a/app/views/users/_message_replies.html.erb
+++ b/app/views/users/_message_replies.html.erb
@@ -6,11 +6,11 @@
autoUrl('reply_content_<%= comment.id %>');
});
-
+
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user) %>
-
+
<%= render :partial => 'users/message_contents', :locals => {:comment => comment, :type => type, :user_activity_id => user_activity_id}%>
<% if !comment.content_detail.blank? %>
diff --git a/app/views/users/_user_journal_post_reply.html.erb b/app/views/users/_user_journal_post_reply.html.erb
index 07bfc9ad1..3484d75a8 100644
--- a/app/views/users/_user_journal_post_reply.html.erb
+++ b/app/views/users/_user_journal_post_reply.html.erb
@@ -1,7 +1,7 @@
<% all_replies = JournalsForMessage.where("root_id = #{activity.id}").reorder("created_on desc") %>
<% count = all_replies.count %>
<% no_children_comments = get_no_children_comments all_replies %>
-<%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :expand_more =>no_children_comments[:three_more]} %>
+<%= render :partial => 'users/wide_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :expand_more =>no_children_comments[:three_more]} %>
<% if count > 0 %>
@@ -9,9 +9,9 @@
<% end %>
-
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
-
+
<% if User.current.logged? %>
<%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index e200a275d..a00601f81 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -1,10 +1,10 @@
-
-
+
+
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
-
+
<%= link_to activity.user.show_name, user_path(activity.user), :class => "newsBlue mr15" %>
TO
@@ -30,7 +30,7 @@
<% else %>
<% content = activity.notes %>
<% end %>
- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+ <%= render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
@@ -63,7 +63,7 @@
-
+
<%=render :partial => 'users/user_journal_post_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
diff --git a/app/views/users/_wide_reply_banner.html.erb b/app/views/users/_wide_reply_banner.html.erb
new file mode 100644
index 000000000..6cf13e118
--- /dev/null
+++ b/app/views/users/_wide_reply_banner.html.erb
@@ -0,0 +1,32 @@
+
+
+ 回复
+ ︿
+ <%= count>0 ? "(#{count})" : "" %>▪
+
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+
+
+
<%#= format_date(activity.updated_on) %>
+ <%if expand_more %>
+
+ <% if activity.class.to_s == 'HomeworkCommon' || activity.class.to_s == 'Work' %>
+
+ 展开更多
+
+ <% elsif activity.class.to_s == 'Message' %>
+
+ 展开更多
+
+ <% elsif activity.class.to_s == 'BlogComment' %>
+
+ 展开更多
+
+ <% else %>
+
+ 展开更多
+
+ <% end %>
+
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index f5f6bf382..77433df02 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -1,5 +1,5 @@
-