From dc4f927c3992373ddc9e03ebdddeaccd8ac2ea75 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 2 Jun 2016 21:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8F=B3=E4=BA=8C=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_right2.html.erb | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index 34e3682f6..7bb2cbf93 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -1,13 +1,22 @@
 <div class="por_projects">
-  <h2 class="por_h2_index clear">热点项目<a href="javascript:void(0);" target="_blank" class="por_more_index fr">更多></a></h2>
-  <ul>
-    <% cotainers.each do |container| %>
-        <li>
-          <%= link_to container.name, project_path(container) %>
-          <a href="javascript:void(0);" target="_blank" class=" por_hidden_w205 fl"><span class="post_icons_grey fl"></span>谷歌、Facebook等超过8ook等超过80%ook等超过80%ook等超过80%0%的企业都为开源做贡献贡献贡</a>
-          <p class="fr por_time">活跃度<a href="javascript:void(0);" target="_blank" class="ml5" >500</a></p>
-          <div class="cl"></div>
-        </li>
-    <% end %>
-  </ul>
-</div><!--por_projects end-->
\ No newline at end of file
+  <h2 class="por_h2_index clear">热点项目</h2>
+  <% if containers.blank? %>
+      <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
+  <% else %>
+      <% container = cotainers.first %>
+      <li class="por_project_li">
+        <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 fl", :title => container.name, :target => "_blank" %>
+        <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p>
+        <div class="cl"></div>
+        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %>
+      </li>
+
+      <% cotainers[1..4].each do |container| %>
+          <li>
+            <%= link_to "<span class='post_icons_grey fl'></span>#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 fl", :title => container.name, :target => "_blank" %>
+            <p class="fr por_time">活跃度<a class="ml5" ><%= static_project_score(@project.project_score) %></a></p>
+            <div class="cl"></div>
+          </li>
+      <% end %>
+  <% end %>
+</div><!--por_projects end-->