From c4c2da48db6e4955187d440abefa08e81891d711 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 23 May 2015 11:55:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2485:=E9=A1=B9=E7=9B=AE--?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=E7=9B=B8=E5=85=B3=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.html.erb | 54 +++++++++++++++------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index bb8ea1bef..d075ae301 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,16 +1,9 @@
 <script>
     $(function(){
-        $("input[nhtype='dateinput']").each(function(){
-            $(this).attr('readonly',true);
-            $(this).datepicker({
-                dateFormat: 'yy-mm-dd',
-                showButtonPanel: true,showClearButton: true,showTodayButton: true,
-                changeMonth: true,
-                changeYear: true
-            });
-            $(this).change(function(){
-                $("#issue_query_form").submit();
-            })
+        $("input[nhname='nhname']").change(function(){
+            if($(this).val()=='创建日期起始' || $(this).val()=='创建日期结束')return;
+            $("input[nhname='nhname']",$(this).parent('div')).val($(this).val());
+            remote_function();
         });
     });
     function remote_function() {
@@ -55,10 +48,15 @@
           <div class="problem_search" >
             <input class="problem_search_input fl" id="v_subject" type="text" name="subject" value="<%= @subject ? @subject : ""%>" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
             <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
-            <!--<a href="javascript:void(0)" class="problem_search_btn fl" onclick="nh_reset_form();" >清空</a>-->
+            <a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
           </div><!--problem_search end-->
+          <%= link_to '新建问题', new_project_issue_path(@project) , :class => "green_u_btn fr ml10" %>
+          <p class="problem_p fr" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
+            <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count  %> </a>
+          </p>
 
-          <div id="filter_form" class="fr" >
+          <div class="cl"></div>
+          <div id="filter_form" class="fl">
 
             <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
                         { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
@@ -85,24 +83,22 @@
                 )
             %>
           </div><!--filter_form end-->
+          <div>
+            <div class="fl">&nbsp;</div>
+            <div>
+              <input name="issue_create_date_start" nhname="date_val" type="hidden"/>
+              <%= text_field_tag 'issue_create_date_start_show', '创建日期起始',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
+              <%= calendar_for('issue_create_date_start_show') %>
+            </div>
+            <div style="float:left;">&nbsp;-&nbsp;</div>
+            <div>
+              <input name="issue_create_date_end" nhname="date_val" type="hidden"/>
+              <%= text_field_tag 'issue_create_date_end_show', '创建日期结束',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
+              <%= calendar_for('issue_create_date_end_show') %>
+            </div>
+          </div>
           <div class="cl"></div>
-          <!--<div>-->
-            <!--<div style="float:left;">创建时间&nbsp;:&nbsp;</div>-->
-            <!--<div>-->
-              <!--<%#= text_field_tag 'issue_create_date_start', '',:readonly=>true, :size=>15, :onchange => "remote_function()",:style=>'float:left;'%>-->
-              <!--<%#= calendar_for('issue_create_date_start') %>-->
-            <!--</div>-->
-            <!--<div style="float:left;">&nbsp;-&nbsp;</div>-->
-            <!--<div>-->
-              <!--<%#= text_field_tag 'issue_create_date_end', '',:readonly=>true, :size=>15, :onchange => "remote_function()",:style=>'float:left;'%>-->
-              <!--<%#= calendar_for('issue_create_date_end') %>-->
-            <!--</div>-->
-          <!--</div>-->
-          <!--<div class="cl"></div>-->
       <% end %>
-      <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
-        <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count  %> </a>
-      </p>
 
       <div class="cl"></div>
   <% end %>