diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb
index f293b1ea8..d75b9f20f 100644
--- a/app/views/organizations/_org_subfield_rightM.html.erb
+++ b/app/views/organizations/_org_subfield_rightM.html.erb
@@ -1,98 +1,98 @@
-<% if is_default_field?(field) %>
- <% case field.name %>
-<% when 'course' %>
-
暂无内容!
- <% when 'project' %>
- 暂无内容!
- <% end %>
-<% else %>
- <% if field.field_type == "Post" %> <%# 讨论类型 %>
- <% org_acts = get_subfield_acts field %>
- <% unless org_acts.blank? %>
- <% activity = org_acts.first %>
-
- <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
- <% document = activity.org_act %>
- <% org_subfield_id = params[:org_subfield_id] %>
- <% flag = 2 %>
- <% iamge_path = get_image_path_from_content(document.content) %>
-
<%= field.name %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
- <% 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) %>
-
-
- <% 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 %>
- <% message = Message.find(activity.org_act_id) %>
- <% if message.board.org_subfield_id %>
- <% iamge_path = get_image_path_from_content(message.content) %>
-
<%= field.name %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
- <% else %>
- <%= 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" %>
-
-
- <% else %>
- <% iamge_path = get_image_path_from_content(message.content) %>
-
<%= field.name %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
- <% else %>
- <%= 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" %>
-
-
- <% end %>
- <% end %>
- <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
- <% news = News.find(activity.org_act_id) %>
- <% iamge_path = get_image_path_from_content(news.description) %>
-
<%= field.name %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
- <% else %>
- <%= 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" %>
-
-
- <% end %>
- <% end %>
-
- <% else %>
-
-
<%= field.name %>
-
-

-
暂无内容!
-
-
-
- <% end %>
- <% elsif field.field_type == "Resource" %>
- <% org_attachs = get_attach_org2(field) %>
-
- <% if !field.subfield_subdomain_dir.nil? %>
- <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
- <% else %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
- <% end %>
- <% else %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %>
- <% end %>
-
- <% end %>
-<% end %>
+<% if is_default_field?(field) %>
+ <% case field.name %>
+<% when 'course' %>
+ 暂无内容!
+ <% when 'project' %>
+ 暂无内容!
+ <% end %>
+<% else %>
+ <% if field.field_type == "Post" %> <%# 讨论类型 %>
+ <% org_acts = get_subfield_acts field %>
+ <% unless org_acts.blank? %>
+ <% activity = org_acts.first %>
+
+ <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+ <% document = activity.org_act %>
+ <% org_subfield_id = params[:org_subfield_id] %>
+ <% flag = 2 %>
+ <% iamge_path = get_image_path_from_content(document.content) %>
+
<%= field.name %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+ <% 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) %>
+
+
+ <% 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 %>
+ <% message = Message.find(activity.org_act_id) %>
+ <% if message.board.org_subfield_id %>
+ <% iamge_path = get_image_path_from_content(message.content) %>
+
<%= field.name %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+ <% else %>
+ <%= 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" %>
+
+
+ <% else %>
+ <% iamge_path = get_image_path_from_content(message.content) %>
+
<%= field.name %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
+ <% else %>
+ <%= 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" %>
+
+
+ <% end %>
+ <% end %>
+ <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+ <% news = News.find(activity.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(news.description) %>
+
<%= field.name %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
+ <% else %>
+ <%= 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" %>
+
+
+ <% end %>
+ <% end %>
+
+ <% else %>
+
+
<%= field.name %>
+
+

+
暂无内容!
+
+
+
+ <% end %>
+ <% elsif field.field_type == "Resource" %>
+ <% org_attachs = get_attach_org2(field) %>
+
+ <% if !field.subfield_subdomain_dir.nil? %>
+ <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+ <% else %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+ <% end %>
+ <% else %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %>
+ <% end %>
+
+ <% end %>
+<% end %>
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index 7e6e2e1ea..7c0b9f84a 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -39,7 +39,7 @@ a.sn-link-select {color:#809df9;}
.sn-f12 {font-size:12px;}
.sn-f14 {font-size:14px;}
.sn-f18 {font-size:18px;}
-/*padding&margin*/
+/*padding&margin&width*/
.sn-mt-10 {margin-left:-10px;}
.sn-mt4 {margin-top:4px;}
.sn-mt10 {margin-top:10px;}
@@ -51,6 +51,7 @@ a.sn-link-select {color:#809df9;}
.sn-ml55 {margin-left:55px;}
.sn-mr0 {margin-right:0px !important;}
.sn-mr50 {margin-right:50px;}
+.sn-w229 {width:229px;}
/*头部样式*/
.sn-header {}
.sn-row {width:100%;}