- <% 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" %>
+
+
+
+
+
+ <% org_acts.first.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 => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg" %>
+ <% else %>
+ - <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg" %>
+ <% 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 => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
+ <% end %>
<% 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" %>
+ <% 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", :class => "partnerimg" %>
+ <% else %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
+ <% end %>
<% end %>
- <% else %>
- <% iamge_path = get_image_path_from_content(message.content) %>
+ <% 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 => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
<% else %>
- <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
<% 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 %>
-
+ <% else %>
+ <%= render :partial => 'organizations/org_subfield_leftD_default', :locals => {:field => field} %>
<% 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" %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), 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" %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), 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" %>
+ <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %>
<% end %>
<% end %>
diff --git a/app/views/organizations/_org_subfield_leftD_default.html.erb b/app/views/organizations/_org_subfield_leftD_default.html.erb
new file mode 100644
index 000000000..b284a8543
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftD_default.html.erb
@@ -0,0 +1,19 @@
+
diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb
index 0069b4e49..35f20edf1 100644
--- a/app/views/organizations/_org_subfield_leftM1.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1.html.erb
@@ -94,7 +94,7 @@
<% if @project_acts.blank? %>
<%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
<% else %>
- <% @project_acts.first(4).each do |act| %>
+ <% @project_acts.first(1).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) %>
diff --git a/public/images/default_blank/ad-default.jpg b/public/images/default_blank/ad-default.jpg
deleted file mode 100644
index 7707775d6..000000000
Binary files a/public/images/default_blank/ad-default.jpg and /dev/null differ
diff --git a/public/images/default_blank/banner-default.jpg b/public/images/default_blank/banner-default.jpg
deleted file mode 100644
index 1debf41a8..000000000
Binary files a/public/images/default_blank/banner-default.jpg and /dev/null differ
diff --git a/public/images/default_blank/default-img2.jpg b/public/images/default_blank/default-img2.jpg
deleted file mode 100644
index 8d194d605..000000000
Binary files a/public/images/default_blank/default-img2.jpg and /dev/null differ
diff --git a/public/images/default_blank/files-default.jpg b/public/images/default_blank/files-default.jpg
deleted file mode 100644
index 5da308927..000000000
Binary files a/public/images/default_blank/files-default.jpg and /dev/null differ
diff --git a/public/images/default_blank/inner-01.jpg b/public/images/default_blank/inner-01.jpg
new file mode 100644
index 000000000..8c79ee009
Binary files /dev/null and b/public/images/default_blank/inner-01.jpg differ
diff --git a/public/images/default_blank/left-02.jpg b/public/images/default_blank/left-02.jpg
new file mode 100644
index 000000000..aee126ad3
Binary files /dev/null and b/public/images/default_blank/left-02.jpg differ
diff --git a/public/images/default_blank/left-03.jpg b/public/images/default_blank/left-03.jpg
new file mode 100644
index 000000000..4ff9bfa05
Binary files /dev/null and b/public/images/default_blank/left-03.jpg differ
diff --git a/public/images/default_blank/left-04.jpg b/public/images/default_blank/left-04.jpg
new file mode 100644
index 000000000..bdfcd485c
Binary files /dev/null and b/public/images/default_blank/left-04.jpg differ
diff --git a/public/images/default_blank/left-05.jpg b/public/images/default_blank/left-05.jpg
new file mode 100644
index 000000000..240780a62
Binary files /dev/null and b/public/images/default_blank/left-05.jpg differ
diff --git a/public/images/default_blank/left-act.jpg b/public/images/default_blank/left-act.jpg
deleted file mode 100644
index 19259035d..000000000
Binary files a/public/images/default_blank/left-act.jpg and /dev/null differ
diff --git a/public/images/default_blank/left-act2.jpg b/public/images/default_blank/left-act2.jpg
deleted file mode 100644
index 7f105cb1c..000000000
Binary files a/public/images/default_blank/left-act2.jpg and /dev/null differ
diff --git a/public/images/default_blank/left_01.jpg b/public/images/default_blank/left_01.jpg
new file mode 100644
index 000000000..9bbb96afc
Binary files /dev/null and b/public/images/default_blank/left_01.jpg differ
diff --git a/public/images/default_blank/right-01.jpg b/public/images/default_blank/right-01.jpg
new file mode 100644
index 000000000..8b71c8ae4
Binary files /dev/null and b/public/images/default_blank/right-01.jpg differ
diff --git a/public/images/default_blank/right-02.jpg b/public/images/default_blank/right-02.jpg
new file mode 100644
index 000000000..a28f9a41d
Binary files /dev/null and b/public/images/default_blank/right-02.jpg differ
diff --git a/public/images/default_blank/right-03.jpg b/public/images/default_blank/right-03.jpg
new file mode 100644
index 000000000..746de9eb9
Binary files /dev/null and b/public/images/default_blank/right-03.jpg differ
diff --git a/public/images/default_blank/right-top.jpg b/public/images/default_blank/right-top.jpg
deleted file mode 100644
index 591819248..000000000
Binary files a/public/images/default_blank/right-top.jpg and /dev/null differ