From 3f559a04bb8e1d20ba3b076bf722f67be33fdcbe Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 28 Sep 2016 15:20:42 +0800
Subject: [PATCH] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=E8=BE=B9=E6=A1=86?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=9B=B4=E6=94=B9=EF=BC=9Bissue=E9=A2=98?=
 =?UTF-8?q?=E7=9B=AE=E5=AE=BD=E5=BA=A6=E5=A2=9E=E9=95=BF=EF=BC=9B=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E6=95=B0=E5=92=8C=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4=E5=8F=8A=E6=98=BE=E9=9A=90?=
 =?UTF-8?q?js=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_project_issue.html.erb | 35 ++++++++++++++++++++----
 public/stylesheets/css/project.css       |  8 +++---
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb
index cf04baa14..bbe16e413 100644
--- a/app/views/issues/_project_issue.html.erb
+++ b/app/views/issues/_project_issue.html.erb
@@ -10,10 +10,6 @@
       <div class=" fl ml5">
         <div class="issues_list_titlebox clear">
           <a href="<%= issue_path(activity) %>"  class="issues_list_title fl" target="_blank" title="<%= activity.subject.to_s %>"><%= activity.subject.to_s %></a>
-          <% if activity.journals.count > 0%>
-          <span class="issues_icons_mes fl mr5 ml5"></span>
-          <span class="fl mr5 mt3"><%= activity.journals.count %></span>
-          <% end %>
           <div class="cl"></div>
         </div>
         <div class="issues_list_small">
@@ -58,7 +54,12 @@
         <li class="c_grey" style="width: 60px; padding-right: 10px" title="<%= activity.fixed_version %>"><%= activity.fixed_version %></li>
         <li class="issues_list_min c_grey" ><%= activity.status.name%></li>
         <li class="<%=(activity.done_ratio == 100 ? 'c_red' : 'c_green') %>"><%= activity.done_ratio %>%</li>
-        <li class="issues_list_min">
+        <li class="issues_list_min pr">
+        <% if activity.journals.count > 0%>
+          <span class="issues_icons_mes fl mr5" style="margin-top:13px;"></span>
+          <span class="fl mr5"><%= activity.journals.count %></span>
+        <% end %>
+          <div class="undis" style="position: absolute; <%= activity.journals.count >0 ? 'top:15px;' : '' %>">
           <%= link_to "", issue_path(activity.id, :edit => 'true'), :class => 'sy_icons_edit fl mt15', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
         <% if !defined?(project_id) && !defined?(user_id) %>
             <%= link_to "", issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15' if User.current.allowed_to?(:delete_issues, activity.project) %>
@@ -67,8 +68,32 @@
         <% elsif defined?(user_id) %>
             <%= link_to "", issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'sy_icons_del fl mt15' if User.current.allowed_to?(:delete_issues, activity.project) %>
         <% end %>
+          </div>
         </li>
       </ul>
     </div>
 <% end %>
 
+<script>
+  $(".issues_list_box").mouseover(function(){
+    var iconOrder;
+    var iconSize = $(this).children().eq(2).children().eq(5).children().size();
+    if(iconSize > 1){
+        iconOrder = 2;
+    } else{
+        iconOrder = 0;
+    }
+    $(this).children().eq(2).children().eq(5).children().eq(iconOrder).show();
+  });
+  $(".issues_list_box").mouseout(function(){
+    var iconOrder;
+    var iconSize = $(this).children().eq(2).children().eq(5).children().size();
+    if(iconSize > 1){
+        iconOrder = 2;
+    } else{
+        iconOrder = 0;
+    }
+    $(this).children().eq(2).children().eq(5).children().eq(iconOrder).hide();
+  });
+</script>
+
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 7da1e671b..81a20b6b1 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -798,8 +798,8 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
 input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
 .issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -29px 9px no-repeat; }
 /* 缺陷Tab */
-.issues_con_list{border:1px solid #c8c8c8; }
-#issues_list_nav {border-bottom:1px solid #d0d0d0;}
+.issues_con_list{border:1px solid #e5e3da; }
+#issues_list_nav {border-bottom:1px solid #e5e3da;}
 #issues_list_nav li {float:left; padding:10px 15px; text-align:center; }
 #issues_list_nav li a{font-size:12px; color:#444;}
 .issues_nav_hover{border-bottom:3px solid #3498db; font-weight:bold; }
@@ -816,9 +816,9 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
 input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
 .issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -29px 9px no-repeat; }
 
-.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #c8c8c8;}
+.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #e5e3da;}
 .issues_list_titlebox{ font-size:14px; font-weight:bold; margin-bottom:8px;}
-a.issues_list_title{ color:#444; max-width:260px;  overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; }
+a.issues_list_title{ color:#444; max-width:300px;  overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; }
 a:hover.issues_list_title{color:#3b94d6;}
 .issues_list_titlebox span{ font-size: 12px;color: #888; font-weight: normal; }
 .issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 0 no-repeat;}