diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb
index 3858fcdf0..dc27b7e90 100644
--- a/app/views/organizations/_org_subfield_leftMD.html.erb
+++ b/app/views/organizations/_org_subfield_leftMD.html.erb
@@ -28,9 +28,10 @@
<%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54} %>
+ <%#= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
- <%= link_to "更多", student_work_index_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
+ <%#= link_to "更多", student_work_index_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
<% elsif act.org_act_type == "Message" %>
<% activity = Message.find(act.org_act_id) %>
@@ -49,13 +50,9 @@
<% end %>
- <%= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54} %>
+ <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
- <% if activity.parent_id.nil? %>
- <%= link_to "更多", board_message_url_in_org(activity.board_id, activity.id), :class => "more-btn", :target => "_blank" %>
- <% else %>
- <%= link_to "更多", board_message_url_in_org(activity.board_id, activity.id), :class => "more-btn", :target => "_blank" %>
- <% end %>
<% elsif act.org_act_type == "News" %>
<% activity = News.find(act.org_act_id) %>
@@ -70,9 +67,10 @@
<%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54} %>
+ <%#= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
- <%= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
+ <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
<% elsif act.org_act_type == "Poll" %>
<% activity = Poll.find(act.org_act_id) %>
@@ -94,13 +92,9 @@
<% end %>
- <%= link_to activity.polls_description.to_s.html_safe, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-tag" %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.polls_description, :maxheight=>54} %>
+ <%#= link_to activity.polls_description.to_s.html_safe, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-tag" %>
- <% if has_commit %>
- <%= link_to "更多", Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :class => "more-btn", :target => "_blank" %>
- <% else %>
- <%= link_to "更多", Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :class => "more-btn", :target => "_blank" %>
- <% end %>
<% end %>
<% end %>
@@ -136,9 +130,9 @@
<%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54} %>
+ <%#= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
- <%= link_to "更多", issue_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
<% elsif act.org_act_type == "Message" %>
<% activity = Message.find(act.org_act_id) %>
@@ -157,13 +151,9 @@
<% end %>
- <%= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54} %>
+ <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
- <% if activity.parent_id.nil? %>
- <%= link_to "更多", board_message_url_in_org(activity.board_id, activity.id), :class => "more-btn", :target => "_blank" %>
- <% else %>
- <%= link_to "更多", board_message_url_in_org(activity.board_id, activity.id), :class => "more-btn", :target => "_blank" %>
- <% end %>
<% elsif act.org_act_type == "News" %>
<% activity = News.find(act.org_act_id) %>
@@ -178,9 +168,10 @@
<%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54} %>
+ <%#= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
- <%= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
+ <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
<% end %>
<% end %>
@@ -223,9 +214,10 @@
<%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54} %>
+ <%#= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
- <%= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank" %>
+ <%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank" %>
<% else activity.container_type == 'OrgSubfield' %>
@@ -252,9 +244,10 @@
<% end %>
- <%= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+ <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> content, :maxheight=>54} %>
+ <%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
- <%= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
+ <%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
<% else %>
@@ -271,9 +264,10 @@
<% end %>
- <%= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
+ <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> content, :maxheight=>54} %>
+ <%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
- <%= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
+ <%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
<% end %>
<% end %>
@@ -290,7 +284,8 @@
<%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
+ <%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
+ <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> content, :maxheight=>54} %>
<%= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>