-
- <% @subfield_content.each do |field| %>
- <% if field.status.to_i == 1 %>
- <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
- <% elsif field.status.to_i == 2 %>
- <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
-
+
+
+
+
+
<%= h html_title %>
+
+
+ <%= csrf_meta_tag %>
+ <%= favicon %>
+ <%= javascript_heads %>
+ <%= heads_for_theme %>
+ <%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %>
+ <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+ <%= javascript_include_tag 'attachments' %>
+ <%#= call_hook :view_layouts_base_html_head %>
+
+ <%#= yield :header_tags -%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%# 更新访问数,刷新的时候更新访问次数 %>
+<% update_visiti_count @organization %>
+<%# over %>
+
+
+
+ <% @subfield_content.each do |field| %>
+ <% if field.status.to_i == 1 %>
+ <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
+ <% elsif field.status.to_i == 2 %>
+ <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
+
<%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
<% elsif field.status.to_i == 3 %>
<%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
-
+
+
+ <% elsif field.status.to_i == 4 %>
+ <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
+ <% elsif field.status.to_i == 5 %>
+
- <% elsif field.status.to_i == 4 %>
- <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
- <% elsif field.status.to_i == 5 %>
- <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
- <% end %>
- <% end %>
-
-
-
- <% @subfield_content.each do |field| %>
- <% if field.status.to_i == 6 %>
+ <% end %>
+ <% end %>
+
+
+
+ <% @subfield_content.each do |field| %>
+ <% if field.status.to_i == 6 %>
<%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
- <% elsif field.status.to_i == 7 %>
- <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
- <% elsif field.status.to_i == 8 %>
- <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
- <% end %>
- <% end %>
-
-
-
-
-
-
-
- <%= l(:label_loading) %>
-
-<%#= call_hook :view_layouts_base_body_bottom %>
-
-
-
+ <% elsif field.status.to_i == 7 %>
+ <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
+ <% elsif field.status.to_i == 8 %>
+ <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
+ <% end %>
+ <% end %>
+
+
+
+
+
+
+
+ <%= l(:label_loading) %>
+
+<%#= call_hook :view_layouts_base_body_bottom %>
+
+
+
diff --git a/app/views/organizations/_org_subfield_leftD.html.erb b/app/views/organizations/_org_subfield_leftD.html.erb
index 676d5d1c3..60895ad81 100644
--- a/app/views/organizations/_org_subfield_leftD.html.erb
+++ b/app/views/organizations/_org_subfield_leftD.html.erb
@@ -1,117 +1,117 @@
-
-
-<% 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? %>
- <% org_acts.each do |activity| %>
-
-
-
- <% 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) %>
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
- <% end %>
- <% elsif 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) %>
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
- <% end %>
- <% else %>
- <% iamge_path = get_image_path_from_content(message.content) %>
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
- <% end %>
- <% 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) %>
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
- <% end %>
- <% end %>
- <% end %>
-
-
- <% end %>
- <% else %>
-
- <% 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 => "369", :height => "169"), 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 => "369", :height => "169"), 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 => "369", :height => "169"), 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? %>
+ <% org_acts.each do |activity| %>
+
+
+
+ <% 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) %>
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+ <% end %>
+ <% elsif 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) %>
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+ <% end %>
+ <% else %>
+ <% iamge_path = get_image_path_from_content(message.content) %>
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+ <% end %>
+ <% 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) %>
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+ <% end %>
+ <% end %>
+ <% end %>
+
+
+ <% end %>
+ <% else %>
+
+ <% 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 => "369", :height => "169"), 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 => "369", :height => "169"), 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 => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %>
+ <% end %>
+
+ <% end %>
+<% end %>
diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb
index a987e23cb..0069b4e49 100644
--- a/app/views/organizations/_org_subfield_leftM1.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1.html.erb
@@ -1,256 +1,256 @@
-
<%= field.name %>更多
-
-<% if is_default_field?(field) %>
- <% case field.name %>
- <% when 'course' %>
- <% if @course_acts.blank? %>
- <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
- <% else %>
- <% @course_acts.first(1).each do |act| %>
- <% if act.org_act_type == "HomeworkCommon" %>
- <% activity = HomeworkCommon.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.description) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% end %>
-
- <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-
-
<%= format_date activity.updated_at %>
-
-
<%= activity.description.to_s.html_safe %>
-
-
- <% elsif act.org_act_type == "Message" %>
- <% activity = Message.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.content) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% 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" %>
- <% 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 %>
-
-
<%= format_date activity.updated_on %>
-
-
<%= activity.content.to_s.html_safe %>
-
-
- <% elsif act.org_act_type == "News" %>
- <% activity = News.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.description) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% end %>
-
- <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-
-
<%= format_date activity.created_on %>
-
-
<%= activity.description.to_s.html_safe %>
-
-
- <% elsif act.org_act_type == "Poll" %>
- <% activity = Poll.find(act.org_act_id) %>
- <% has_commit = has_commit_poll?(activity.id ,User.current)%>
- <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
- <% iamge_path = get_image_path_from_content(activity.polls_description) %>
- <% if ( activity.polls_status==2) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
- <% end %>
-
- <% if has_commit %>
- <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title" %>
- <% else %>
- <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title" %>
- <% end %>
-
-
<%= format_date activity.published_at %>
-
-
<%= activity.polls_description.to_s.html_safe %>
-
-
- <% end %>
- <% end %>
- <% end %>
- <% end %>
- <% when 'project' %>
- <% if @project_acts.blank? %>
- <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
- <% else %>
- <% @project_acts.first(4).each do |act| %>
- <% if act.org_act_type == "Issue" %>
- <% activity = Issue.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.description) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% end %>
-
- <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-
-
<%= format_date activity.updated_on %>
-
-
<%= activity.description.to_s.html_safe %>
-
-
- <% elsif act.org_act_type == "Message" %>
- <% activity = Message.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.content) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% 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" %>
- <% 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 %>
-
-
<%= format_date activity.updated_on %>
-
-
<%= activity.content.to_s.html_safe %>
-
-
- <% elsif act.org_act_type == "News" %>
- <% activity = News.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.description) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% 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" %>
- <% end %>
-
- <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
-
-
2016-04-08
-
-
<%= activity.description.to_s.html_safe %>
-
-
- <% end %>
- <% end %>
- <% end %>
- <% end %>
-<% else %>
- <% if field.field_type == "Post" %>
- <% org_acts = get_subfield_acts field %>
- <% if org_acts.blank? %>
- <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
- <% else %>
- <% org_acts.first(4).each do |activity| %>
- <% 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) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% end %>
-
- <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %>
-
-
<%= format_date document.created_at %>
-
-
<%= document.content.to_s.html_safe %>
-
-
- <% 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.parent_id.nil? %>
- <% content = message.content%>
- <% else %>
- <% content = message.parent.content%>
- <% end %>
- <% iamge_path = get_image_path_from_content(content) %>
- <% if message.board.org_subfield_id %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% 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" %>
- <% 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 %>
-
-
<%= format_date message.created_on %>
-
-
<%= content.to_s.html_safe %>
-
-
- <% else %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% end %>
-
- <% if message.parent_id.nil? %>
- <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h3-title" %>
- <% else %>
- <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h3-title" %>
- <% end %>
-
-
<%= format_date message.created_on %>
-
-
<%= content.to_s.html_safe %>
-
-
- <% 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) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
- <% end %>
-
- <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %>
-
-
<%= format_date news.created_on %>
-
-
<%= news.description.to_s.html_safe %>
-
-
- <% end %>
- <% end %>
- <% end %>
- <% end %>
- <% end %>
-<% end %>
-
-
+
<%= field.name %>更多
+
+<% if is_default_field?(field) %>
+ <% case field.name %>
+ <% when 'course' %>
+ <% if @course_acts.blank? %>
+ <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+ <% else %>
+ <% @course_acts.first(1).each do |act| %>
+ <% if act.org_act_type == "HomeworkCommon" %>
+ <% activity = HomeworkCommon.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.description) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% end %>
+
+ <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+
+
<%= format_date activity.updated_at %>
+
+
<%= activity.description.to_s.html_safe %>
+
+
+ <% elsif act.org_act_type == "Message" %>
+ <% activity = Message.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.content) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% 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" %>
+ <% 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 %>
+
+
<%= format_date activity.updated_on %>
+
+
<%= activity.content.to_s.html_safe %>
+
+
+ <% elsif act.org_act_type == "News" %>
+ <% activity = News.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.description) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% end %>
+
+ <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+
+
<%= format_date activity.created_on %>
+
+
<%= activity.description.to_s.html_safe %>
+
+
+ <% elsif act.org_act_type == "Poll" %>
+ <% activity = Poll.find(act.org_act_id) %>
+ <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+ <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+ <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+ <% if ( activity.polls_status==2) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% end %>
+
+ <% if has_commit %>
+ <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title" %>
+ <% else %>
+ <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title" %>
+ <% end %>
+
+
<%= format_date activity.published_at %>
+
+
<%= activity.polls_description.to_s.html_safe %>
+
+
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% when 'project' %>
+ <% if @project_acts.blank? %>
+ <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+ <% else %>
+ <% @project_acts.first(4).each do |act| %>
+ <% if act.org_act_type == "Issue" %>
+ <% activity = Issue.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.description) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% end %>
+
+ <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+
+
<%= format_date activity.updated_on %>
+
+
<%= activity.description.to_s.html_safe %>
+
+
+ <% elsif act.org_act_type == "Message" %>
+ <% activity = Message.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.content) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% 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" %>
+ <% 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 %>
+
+
<%= format_date activity.updated_on %>
+
+
<%= activity.content.to_s.html_safe %>
+
+
+ <% elsif act.org_act_type == "News" %>
+ <% activity = News.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.description) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% 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" %>
+ <% end %>
+
+ <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+
+
2016-04-08
+
+
<%= activity.description.to_s.html_safe %>
+
+
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+<% else %>
+ <% if field.field_type == "Post" %>
+ <% org_acts = get_subfield_acts field %>
+ <% if org_acts.blank? %>
+ <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+ <% else %>
+ <% org_acts.first(4).each do |activity| %>
+ <% 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) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% end %>
+
+ <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %>
+
+
<%= format_date document.created_at %>
+
+
<%= document.content.to_s.html_safe %>
+
+
+ <% 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.parent_id.nil? %>
+ <% content = message.content%>
+ <% else %>
+ <% content = message.parent.content%>
+ <% end %>
+ <% iamge_path = get_image_path_from_content(content) %>
+ <% if message.board.org_subfield_id %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% 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" %>
+ <% 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 %>
+
+
<%= format_date message.created_on %>
+
+
<%= content.to_s.html_safe %>
+
+
+ <% else %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% end %>
+
+ <% if message.parent_id.nil? %>
+ <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h3-title" %>
+ <% else %>
+ <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h3-title" %>
+ <% end %>
+
+
<%= format_date message.created_on %>
+
+
<%= content.to_s.html_safe %>
+
+
+ <% 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) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
+ <% end %>
+
+ <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %>
+
+
<%= format_date news.created_on %>
+
+
<%= news.description.to_s.html_safe %>
+
+
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+<% end %>
+
+
diff --git a/app/views/organizations/_org_subfield_leftM1_default.html.erb b/app/views/organizations/_org_subfield_leftM1_default.html.erb
index 919d76363..8806fcc1b 100644
--- a/app/views/organizations/_org_subfield_leftM1_default.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1_default.html.erb
@@ -1,8 +1,8 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/app/views/organizations/_org_subfield_leftM2_default.html.erb b/app/views/organizations/_org_subfield_leftM2_default.html.erb
index 1b47d9d5c..aaf98d7d6 100644
--- a/app/views/organizations/_org_subfield_leftM2_default.html.erb
+++ b/app/views/organizations/_org_subfield_leftM2_default.html.erb
@@ -1,26 +1,26 @@
-
-
-
-
-
2016-04-08
-
-
-
-
-
-
2016-04-08
-
-
-
-
-
-
2016-04-08
-
-
-
-
-
-
2016-04-08
-
-
+
+
+
+
+
2016-04-08
+
+
+
+
+
+
2016-04-08
+
+
+
+
+
+
2016-04-08
+
+
+
+
+
+
2016-04-08
+
+
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_rightT.html.erb b/app/views/organizations/_org_subfield_rightT.html.erb
index e93031991..f29980371 100644
--- a/app/views/organizations/_org_subfield_rightT.html.erb
+++ b/app/views/organizations/_org_subfield_rightT.html.erb
@@ -1,223 +1,223 @@
-
-
<%= field.name %>更多
-<% if is_default_field?(field) %>
- <% case field.name %>
- <% when 'course' %>
- <% if @course_acts.blank? %>
- <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
- <% else %>
- <% @course_acts.first(4).each do |act| %>
- <% if act.org_act_type == "HomeworkCommon" %>
- <% activity = HomeworkCommon.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.description) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% end %>
-
- <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
-
- <%= format_date activity.updated_at %>
-
- <% elsif act.org_act_type == "Message" %>
- <% activity = Message.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.content) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% 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 => "active-title" %>
- <% else %>
- <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
- <% end %>
-
- <%= format_date activity.updated_on %>
-
- <% elsif act.org_act_type == "News" %>
- <% activity = News.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.description) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% end %>
-
- <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
-
- <%= format_date activity.created_on %>
-
- <% elsif act.org_act_type == "Poll" %>
- <% activity = Poll.find(act.org_act_id) %>
- <% has_commit = has_commit_poll?(activity.id ,User.current)%>
- <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
- <% iamge_path = get_image_path_from_content(activity.polls_description) %>
- <% if ( activity.polls_status==2) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
- <% end %>
-
- <% if has_commit %>
- <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title" %>
- <% else %>
- <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title" %>
- <% end %>
-
- <%= format_date activity.published_at %>
-
- <% end %>
- <% end %>
- <% end %>
- <% end %>
- <% when 'project' %>
- <% if @project_acts.blank? %>
- <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
- <% else %>
- <% @project_acts.first(4).each do |act| %>
- <% if act.org_act_type == "Issue" %>
- <% activity = Issue.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.description) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% end %>
-
- <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
-
- <%= format_date activity.updated_on %>
-
- <% elsif act.org_act_type == "Message" %>
- <% activity = Message.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.content) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% 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 => "active-title" %>
- <% else %>
- <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
- <% end %>
-
- <%= format_date activity.updated_on %>
-
- <% elsif act.org_act_type == "News" %>
- <% activity = News.find(act.org_act_id) %>
- <% iamge_path = get_image_path_from_content(activity.description) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% end %>
-
- <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
-
- <%= format_date activity.created_on %>
-
- <% end %>
- <% end %>
- <% end %>
- <% end %>
-<% else %>
- <% if field.field_type == "Post" %>
- <% org_acts = get_subfield_acts field %>
- <% if org_acts.blank? %>
- <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
- <% else %>
- <% org_acts.first(4).each do |activity| %>
- <% 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) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% end %>
-
- <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "active-title" %>
-
- <%= format_date document.created_at %>
-
- <% 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.parent_id.nil? %>
- <% content = message.content%>
- <% else %>
- <% content = message.parent.content%>
- <% end %>
- <% iamge_path = get_image_path_from_content(content) %>
- <% if message.board.org_subfield_id %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
- <% 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 => "active-title" %>
- <% else %>
- <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %>
- <% end %>
-
- <%= format_date message.created_on %>
-
- <% else %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
- <% end %>
-
- <% if message.parent_id.nil? %>
- <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "active-title" %>
- <% else %>
- <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "active-title" %>
- <% end %>
-
- <%= format_date message.created_on %>
-
- <% 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) %>
-
- <% if iamge_path.nil? %>
- <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
- <% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
- <% end %>
-
- <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "active-title" %>
-
- <%= format_date news.created_on %>
-
- <% end %>
- <% end %>
- <% end %>
- <% end %>
- <% end %>
-<% end %>
-
+
+
<%= field.name %>更多
+<% if is_default_field?(field) %>
+ <% case field.name %>
+ <% when 'course' %>
+ <% if @course_acts.blank? %>
+ <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+ <% else %>
+ <% @course_acts.first(4).each do |act| %>
+ <% if act.org_act_type == "HomeworkCommon" %>
+ <% activity = HomeworkCommon.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.description) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% end %>
+
+ <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+
+ <%= format_date activity.updated_at %>
+
+ <% elsif act.org_act_type == "Message" %>
+ <% activity = Message.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.content) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% 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 => "active-title" %>
+ <% else %>
+ <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+ <% end %>
+
+ <%= format_date activity.updated_on %>
+
+ <% elsif act.org_act_type == "News" %>
+ <% activity = News.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.description) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% end %>
+
+ <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+
+ <%= format_date activity.created_on %>
+
+ <% elsif act.org_act_type == "Poll" %>
+ <% activity = Poll.find(act.org_act_id) %>
+ <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+ <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+ <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+ <% if ( activity.polls_status==2) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
+ <% end %>
+
+ <% if has_commit %>
+ <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title" %>
+ <% else %>
+ <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title" %>
+ <% end %>
+
+ <%= format_date activity.published_at %>
+
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% when 'project' %>
+ <% if @project_acts.blank? %>
+ <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+ <% else %>
+ <% @project_acts.first(4).each do |act| %>
+ <% if act.org_act_type == "Issue" %>
+ <% activity = Issue.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.description) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% end %>
+
+ <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+
+ <%= format_date activity.updated_on %>
+
+ <% elsif act.org_act_type == "Message" %>
+ <% activity = Message.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.content) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% 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 => "active-title" %>
+ <% else %>
+ <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+ <% end %>
+
+ <%= format_date activity.updated_on %>
+
+ <% elsif act.org_act_type == "News" %>
+ <% activity = News.find(act.org_act_id) %>
+ <% iamge_path = get_image_path_from_content(activity.description) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% end %>
+
+ <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+
+ <%= format_date activity.created_on %>
+
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+<% else %>
+ <% if field.field_type == "Post" %>
+ <% org_acts = get_subfield_acts field %>
+ <% if org_acts.blank? %>
+ <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+ <% else %>
+ <% org_acts.first(4).each do |activity| %>
+ <% 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) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% end %>
+
+ <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "active-title" %>
+
+ <%= format_date document.created_at %>
+
+ <% 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.parent_id.nil? %>
+ <% content = message.content%>
+ <% else %>
+ <% content = message.parent.content%>
+ <% end %>
+ <% iamge_path = get_image_path_from_content(content) %>
+ <% if message.board.org_subfield_id %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
+ <% 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 => "active-title" %>
+ <% else %>
+ <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %>
+ <% end %>
+
+ <%= format_date message.created_on %>
+
+ <% else %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
+ <% end %>
+
+ <% if message.parent_id.nil? %>
+ <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "active-title" %>
+ <% else %>
+ <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "active-title" %>
+ <% end %>
+
+ <%= format_date message.created_on %>
+
+ <% 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) %>
+
+ <% if iamge_path.nil? %>
+ <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
+ <% end %>
+
+ <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "active-title" %>
+
+ <%= format_date news.created_on %>
+
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+ <% end %>
+<% end %>
+
\ No newline at end of file
diff --git a/app/views/organizations/org_subfield_rightT_default.html.erb b/app/views/organizations/org_subfield_rightT_default.html.erb
index ecdc7fba0..5708da1da 100644
--- a/app/views/organizations/org_subfield_rightT_default.html.erb
+++ b/app/views/organizations/org_subfield_rightT_default.html.erb
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4558437a2..9906b55fc 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -704,7 +704,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
.homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
.homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
-.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: 微软雅黑, 宋体;}
+.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: "微软雅黑", "宋体";}
.table_maxWidth table {max-width: 642px;}
.homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index 7c0b9f84a..695241c64 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -136,10 +136,9 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:
.resources-tagbox img {max-width: 100%;}
a.more-btn{ display:block; width:185px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;}
/* index-partner */
-.sn-index-partnerbox{ padding:25px 30px; }
-.sn-index-partnerbox{ width:775px;}
+.sn-index-partnerbox{width:760px; padding:25px 30px;}
.sn-index-partnerbox ul li{ height:55px;}
-.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:370px; height:43px; float:left;}
+.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:368px; height:43px; float:left;}
.partner-btnbox{ width:90px; margin:0 auto;}
.partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;}
.partner-btn:hover{ background-color:#172b65;}
