From 8fb440c59309d267b76f2ee0be3dc49857aecc6c Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 27 Sep 2016 17:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_project_issue.html.erb | 11 ++++++++--
 app/views/issues/index.html.erb          | 26 +++++++++++++++---------
 public/stylesheets/css/project.css       |  5 +++--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb
index 4f1f6c097..cf04baa14 100644
--- a/app/views/issues/_project_issue.html.erb
+++ b/app/views/issues/_project_issue.html.erb
@@ -40,6 +40,13 @@
               周报
           <% end %>
         </li>
+        <!--li class="c_grey">
+          <#% if activity.try(:author).try(:realname) == ' ' %>
+              <%#= link_to activity.try(:author), user_path(activity.author_id), :class => "c_grey" %>
+          <#% else %>
+              <%#= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "c_grey" %>
+          <%# end %>
+        </li-->
         <li class="c_grey">
         <% unless activity.assigned_to_id.nil? %>
             <% if activity.try(:assigned_to).try(:realname).empty? %>
@@ -48,8 +55,8 @@
                 <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "c_grey" %>
             <% end %>
         <% end %></li>
-        <li class="c_grey" title="<%= activity.fixed_version %>"><%= activity.fixed_version %></li>
-        <li class="issues_list_min c_grey"><%= activity.status.name%></li>
+        <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">
           <%= 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)  %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 271fb16c6..256ea3378 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -4,7 +4,7 @@
 
 <script>
     //issues列表
-    function g(o){
+    /*function g(o){
         return document.getElementById(o);
     }
     function HoverLi(n){
@@ -15,7 +15,7 @@
         }
 
         g('issues_list_nav_'+n).className='issues_nav_hover';
-    }
+    }*/
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
@@ -107,7 +107,7 @@
                 <input class="hw_search-input" placeholder="请输入问题名称" type="text" id="v_subject"  name="subject" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
                 <a href="javascript:void(0);" class="hw_btn_search" onclick="remote_function();" ></a>
               </div>
-              <a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="HoverLi(1);all_reset_form();">清除</a>
+              <a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="all_reset_form();">清除</a>
 
                 <div class="calendar_div fr">
                   <input name="issue_create_date_end" nhname="date_val" type="hidden"/>
@@ -125,19 +125,19 @@
 
             <div class="issues_con_list" style="position: relative;">
               <ul id="issues_list_nav" >
-                <li id="issues_list_nav_1" class="issues_nav_hover" onclick="HoverLi(1);all_reset_form();">
+                <li id="issues_list_nav_1" onclick="HoverLi(1);all_reset_form();">
                   <a href="javascript:void(0);" onclick="all_reset_form();" id="issues_type_1" >所有<span class="issues_nav_tag ml5"><%= @project.project_score.issue_num %></span></a>
                 </li>
-                <li id="issues_list_nav_2" onclick="HoverLi(2);">
-                  <a href="javascript:void(0);" onclick="switch_assign_to(<%= User.current.id %>)" id="issues_type_2" >指派给我
-                    <span id="issue_assigned_count"><%= render :partial => "issues/issue_filter" %></span>
+                <!--li id="issues_list_nav_2" onclick="HoverLi(2);">
+                  <a href="javascript:void(0);" onclick="switch_assign_to(<%#= User.current.id %>)" id="issues_type_2" >指派给我
+                    <span id="issue_assigned_count"><%#= render :partial => "issues/issue_filter" %></span>
                   </a>
                 </li>
                 <li id="issues_list_nav_3" onclick="HoverLi(3);">
-                  <a href="javascript:void(0);" onclick="createByMe(<%= User.current.id %>)" id="issues_type_3" >我的发布
-                    <span id="issue_author_count"><%= render :partial => "issues/issue_filter_author" %></span>
+                  <a href="javascript:void(0);" onclick="createByMe(<%#= User.current.id %>)" id="issues_type_3" >我的发布
+                    <span id="issue_author_count"><%#= render :partial => "issues/issue_filter_author" %></span>
                     </a>
-                </li>
+                </li-->
                 <div class="cl"></div>
 
 
@@ -151,6 +151,12 @@
                              {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0},
                              {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %>
 
+                  <%#= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
+                              { :include_blank => false,:selected=>@author_id ? @author_id : 0},
+                              {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"fl "}
+                      )
+                  %>
+
                   <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
                               { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
                               },
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 4a2ec5683..175a20395 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -793,9 +793,10 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
 .issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8;  border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;}
 .issues_form_filter input{ height:33px;width:91px;  border:1px solid #c8c8c8;background-color:#fff;}
 .issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;}
-.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none;  background: url("../images/project/arrow.png") no-repeat scroll right center transparent;}
+.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none;  background: url("/images/project/arrow.png") no-repeat scroll right center transparent;}
+.issues_form_filter select:focus {outline:none; border:none;}
 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; }
+.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;}