From a0f722837b06d929f0c72a41c78065d08e63ea29 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 3 Jun 2016 10:47:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E5=93=81=E8=AF=BE=E7=A8=8B=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=88=B0=E5=B7=A6=E6=A8=A1=E5=BC=8F=E4=BA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizations/_org_custom_left2.html.erb | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb index 82e923147..3e4651d8c 100644 --- a/app/views/organizations/_org_custom_left2.html.erb +++ b/app/views/organizations/_org_custom_left2.html.erb @@ -71,7 +71,7 @@ <% end %> <% end %> <% when 'project' %> -

项目动态

+

项目动态

<% if @project_acts.blank? %>

该模块暂时没有相关内容

<% else %> @@ -119,24 +119,15 @@ <% end %> <% end %> <% end %> - <% when 'Compcou' %> - <% @excellent_courses.first(4).each do |course| %> -
- <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title link-black", :title => course.name %> - <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), user_path(attach.author), :target => "_blank", :class => "fl" %> - <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %> - <%= time_from_now course.updated_at %> -
- <% end %> <% end %> <% else %> <% if field.field_type == "Post" %> <% org_acts = get_subfield_acts field %> <% if org_acts.blank? %> -

<%= field.name %>

+

<%= field.name %>

该模块暂时没有相关内容

<% else %> -

<%= field.name %> +

<%= field.name %> <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>

<% org_acts.first(4).each do |activity| %> @@ -201,6 +192,20 @@ <% end %> <% end %> <% end %> + <% elsif 'Compcou' %> +

<%= field.name %>

+ <% if @excellent_courses.blank? %> +

该模块暂时没有相关内容

+ <% else %> + <% @excellent_courses.first(4).each do |course| %> +
+ <%= link_to course.name, course_path(course.id), :target => '_blank', :class => "por_course_title link-black", :title => course.name %> + <%= link_to image_tag(url_to_avatar(course),:width => "140", :height => "100"), course_path(course), :target => "_blank", :class => "fl" %> + <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => course.id, :content=> course.description, :maxheight => 80, :maxwordsnum => 56, :maxwidth => 0, :cl => "por_course_txt fl"} %> + <%= time_from_now course.updated_at %> +
+ <% end %> + <% end %> <% end %> <% end %>