From c718cb2144c60ca016f8f16f45fd5232af3f3452 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 21 Sep 2016 15:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BAissue=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E5=AE=A1=EF=BC=8C=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_attributes.html.erb | 16 +++++++++++++++-
 app/views/issues/_form.html.erb       |  4 ++++
 config/locales/projects/zh.yml        |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 9dba6a6c8..80c8ad185 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -25,6 +25,14 @@
           </li>
           <div class="cl"></div>
           <li>
+            <label class="label">来源：</label>
+            <select class="w150">
+              <option>客户</option>
+              <option>用户</option>
+              <option>其他</option>
+            </select>
+          </li>
+          <div class="cl"></div>
           <li>
             <label class="label"><%= l(:field_assigned_to) %>：</label>
             <% if @issue.safe_attribute? 'assigned_to_id' %>
@@ -74,7 +82,13 @@
             <label class="label02"><%= l(:field_estimated_hours) %>：</label>
             <% if @issue.safe_attribute? 'estimated_hours' %>
                 <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true, :required => @issue.required_attribute?('estimated_hours') %>
-                <span class="mt3 ml5"><%= l(:field_hours) %></span>
+            <% end %>
+          </li>
+          <div class="cl"></div>
+          <li>
+            <label class="label02">实际工时 (H)：</label>
+            <% if @issue.safe_attribute? 'estimated_hours' %>
+                <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true %>
             <% end %>
           </li>
           <div class="cl"></div>
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 1be21cbc1..d58c4fb6f 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -18,6 +18,10 @@
               <label class="fl ml5 mt3" for="issue_is_private" id="issue_is_private_tips"><%= l(:field_is_private_tips)%></label>
           <% end %>
         </li>
+        <li>
+              <input type="checkbox" class="ml30">
+              <label class="fl ml5 mt3">不需要评审</label>
+        </li>
         <div class="cl"></div>
         <!--<li>-->
         <!--<%# if @issue.safe_attribute? 'project_id' %>-->
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 906ae4243..2b63c45cf 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -232,7 +232,7 @@ zh:
   field_closed_on: 已关闭
   field_start_date: 开始日期
   field_due_date: 计划完成日期
-  field_estimated_hours: 预期时间
+  field_estimated_hours: 预计工时 (H)
   field_assigned_to: 指派给
   field_priority: 优先级
   field_done_ratio: "% 完成"