diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb
index 4e1eebb94..ffe47972a 100644
--- a/app/views/organizations/_org_subfield_leftM1.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1.html.erb
@@ -24,8 +24,9 @@
<%= format_date activity.updated_at %>
-
<%= activity.description.to_s.html_safe %>
+
<%= activity.description.to_s.html_safe %>
+ <%=link_to "查看全文>>", activity.name.to_s, student_work_index_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% elsif act.org_act_type == "Message" %>
<% activity = Message.find(act.org_act_id) %>
@@ -37,16 +38,13 @@
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %>
- <% if activity.parent_id.nil? %>
- <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
- <% else %>
- <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
- <% end %>
+ <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
<%= format_date activity.updated_on %>
-
<%= activity.content.to_s.html_safe %>
+
<%= activity.content.to_s.html_safe %>
+ <%=link_to "查看全文>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% elsif act.org_act_type == "News" %>
<% activity = News.find(act.org_act_id) %>
@@ -62,8 +60,9 @@
<%= format_date activity.created_on %>
-
<%= activity.description.to_s.html_safe %>
+
<%= activity.description.to_s.html_safe %>
+ <%=link_to "查看全文>>", activity.title.to_s, news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% elsif act.org_act_type == "Poll" %>
<% activity = Poll.find(act.org_act_id) %>
@@ -86,8 +85,9 @@
<%= format_date activity.published_at %>
-
<%= activity.polls_description.to_s.html_safe %>
+
<%= activity.polls_description.to_s.html_safe %>
+ <%=link_to "查看全文>>", poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% end %>
<% end %>
@@ -116,8 +116,9 @@
<%= format_date activity.updated_on %>
-
<%= activity.description.to_s.html_safe %>
+
<%= activity.description.to_s.html_safe %>
+ <%=link_to "查看全文>>", activity.subject.to_s, issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% elsif act.org_act_type == "Message" %>
<% activity = Message.find(act.org_act_id) %>
@@ -128,17 +129,14 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %>
-
- <% if activity.parent_id.nil? %>
- <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
- <% else %>
- <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
- <% end %>
+
+ <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
<%= format_date activity.updated_on %>
-
<%= activity.content.to_s.html_safe %>
+
<%= activity.content.to_s.html_safe %>
+
<%=link_to "查看全文>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% elsif act.org_act_type == "News" %>
<% activity = News.find(act.org_act_id) %>
@@ -154,8 +152,9 @@
2016-04-08
-
<%= activity.description.to_s.html_safe %>
+
<%= activity.description.to_s.html_safe %>
+ <%=link_to "查看全文>>", activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% end %>
<% end %>
@@ -190,8 +189,9 @@
<%= format_date document.created_at %>
-
<%= document.content.to_s.html_safe %>
+
<%= document.content.to_s.html_safe %>
+ <%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% else activity.container_type == 'OrgSubfield' %>
<% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
@@ -209,17 +209,14 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %>
-
- <% if message.parent_id.nil? %>
- <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
- <% else %>
- <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
- <% end %>
+
+ <%= link_to message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
<%= format_date message.created_on %>
-
<%= content.to_s.html_safe %>
+
<%= content.to_s.html_safe %>
+
<%=link_to "查看全文>>", message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% else %>
@@ -237,7 +234,14 @@
<%= format_date message.created_on %>
-
<%= content.to_s.html_safe %>
+
<%= content.to_s.html_safe %>
+
+
+ <% if message.parent_id.nil? %>
+ <%=link_to "查看全文>>", message.subject.to_s.html_safe, board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+ <% else %>
+ <%=link_to "查看全文>>", message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+ <% end %>
<% end %>
@@ -256,8 +260,9 @@
<%= format_date news.created_on %>
-
<%= news.description.to_s.html_safe %>
+
<%= news.description.to_s.html_safe %>
+ <%=link_to "查看全文>>", news.title.to_s, news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
<% end %>
<% end %>
@@ -266,4 +271,14 @@
<% end %>
<% end %>
+
+
diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb
index e8dfa6b3f..d1b86f047 100644
--- a/app/views/organizations/_org_subfield_rightM.html.erb
+++ b/app/views/organizations/_org_subfield_rightM.html.erb
@@ -23,7 +23,8 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
<% end %>
- <%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %>
+ <%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+ <%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %>
<% else activity.container_type == 'OrgSubfield' %>
@@ -39,6 +40,7 @@
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
<% end %>
<%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
+ <%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %>
<% else %>
@@ -51,6 +53,7 @@
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
<% end %>
<%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %>
+ <%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %>
<% end %>
@@ -66,6 +69,7 @@
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
<% end %>
<%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %>
+ <%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %>
<% end %>
@@ -96,3 +100,12 @@
<% end %>
<% end %>
+
+
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index 6e2954bf4..f7be08e71 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -52,6 +52,7 @@ a.sn-link-select {color:#809df9;}
.sn-ml15 {margin-left:15px;}
.sn-ml55 {margin-left:55px;}
.sn-mr0 {margin-right:0px !important;}
+.sn-mr20 {margin-right:20px;}
.sn-mr50 {margin-right:50px;}
.sn-w229 {width:229px;}
/*头部样式*/