From e16b5b2f5d9dc4487cdece071f219a7409a0c9e7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 23 Sep 2016 09:27:34 +0800
Subject: [PATCH] =?UTF-8?q?issue=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_project_issue.html.erb | 29 ++++++++++++++++++++----
 public/stylesheets/css/project.css       | 17 ++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb
index 683b512f0..9c6e33630 100644
--- a/app/views/issues/_project_issue.html.erb
+++ b/app/views/issues/_project_issue.html.erb
@@ -10,8 +10,10 @@
       <div class=" fl ml5">
         <div class="issues_list_titlebox clear">
           <a href="<%= issue_path(activity) %>"  class="issues_list_title fl" target="_blank"><%= activity.subject.to_s %></a>
+          <% if activity.journals.count > 0%>
           <span class="issues_icons_mes "></span>
-          <span>3</span>
+          <span><%= activity.journals.count %></span>
+          <% end %>
           <div class="cl"></div>
         </div>
         <div class="issues_list_small">
@@ -20,12 +22,31 @@
           <% else %>
               <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "fl issues_list_name" %>
           <% end %>
-          <p class="fl ml10"> <span class="mr5">2016-05-15</span>发布</p>
+          <p class="fl ml10"> <span class="mr5"><%=format_time(activity.created_on) %></span>发布</p>
         </div>
       </div>
       <ul class="issues_list_txt fr">
-        <li class="issues_list_min c_grey">需求</li>
-        <li class="c_grey">hushashahushashahushasha</li>
+        <li class="issues_list_min c_grey">
+          <% case activity.tracker_id %>
+          <% when 1%>
+              缺陷
+          <% when 2%>
+              功能
+          <% when 3%>
+              支持
+          <% when 4%>
+              任务
+          <% when 5%>
+              周报
+          <% end %>
+        </li>
+        <% unless activity.assigned_to_id.nil? %>
+            <% if activity.try(:assigned_to).try(:realname) == ' ' %>
+                <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "c_grey" %>
+            <% else %>
+                <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "c_grey" %>
+            <% end %>
+        <% end %>
         <li class="c_grey"> 20161231 </li>
         <li class="issues_list_min c_grey">草稿</li>
         <li class="c_green">90%</li>
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index bf906a38b..33b309605 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -875,3 +875,20 @@ a.sy_cgrey{ color: #888;}
 .sy_corange{ color: #ee4a1f;}
 a.sy_corange{ color: #ee4a1f;}
 a.sy_cblue{ color: #3b94d6;}
+/* 新增粉色关注按钮*/
+a.sy_btn_pink{
+    display: inline-block;
+    color: #fff;
+    background: #ff7d7d;
+    text-align: center;
+    font-size: 12px;
+    padding:0 15px;
+    height: 30px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.sy_btn_pink{ background: #e64c4c;}
+