From 7577f4cbbc6978dae7fb583b499007dd4f93c9b5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 11 Apr 2015 09:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=BA=E9=99=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_attributes.html.erb | 39 ++++++++++++++-------
 app/views/issues/_form.html.erb       | 49 ---------------------------
 2 files changed, 27 insertions(+), 61 deletions(-)

diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index ff32e99e4..413299b2d 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -5,32 +5,37 @@
         <ul class="fl" >
           <li>
             <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
-                <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true}, :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>
+                <%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}),
+                                { :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')"}, :class => "w150" %>
             <% else %>
                 <p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p>
             <% end %>
           </li>
           <div class="cl"></div>
-          <li><label class="label" ><span class="c_red f12">*</span>&nbsp;优先级&nbsp;&nbsp;:&nbsp;</label>
+          <li>
             <% if @issue.safe_attribute? 'priority_id' %>
-                <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p>
+                <%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf?, :class => "w150"  %>
             <% end %>
           </li>
           <div class="cl"></div>
           <li><% if @issue.safe_attribute? 'assigned_to_id' %>
-                <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
+                 <%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to),
+                           :include_blank => true, :required => @issue.required_attribute?('assigned_to_id'),
+                           :class => "w150" %>
             <% end %>
           </li>
           <div class="cl"></div>
           <li><% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
-                <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %>
-                  <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
+                <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true,
+                           :required => @issue.required_attribute?('fixed_version_id'),
+                           :class => "w150" %>
+                  <%#= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
                               new_project_version_path(@issue.project),
                               :remote => true,
                               :method => 'get',
                               :title => l(:label_version_new),
                               :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
-                </p>
+
             <% end %>
           </li>
           <div class="cl"></div>
@@ -38,17 +43,27 @@
         </ul>
         <ul class="fl ml90">
           <li><% if @issue.safe_attribute? 'start_date' %>
-                <p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('start_date') %><%= calendar_for('issue_start_date','start_date') if @issue.leaf? %></p>
-            <% end %>
+                <p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf?,
+                                 :class => "w150",
+                                 :required => @issue.required_attribute?('start_date') %>
+                   <%= calendar_for('issue_start_date','start_date') if @issue.leaf? %></p>
+              <% end %>
           </li>
           <div class="cl"></div>
           <li><% if @issue.safe_attribute? 'due_date' %>
-                <p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('due_date') %><%= calendar_for('issue_due_date','start_date') if @issue.leaf? %></p>
-            <% end %>
+                <p><%= f.text_field :due_date, :size => 10,
+                                 :class => "w150",
+                                 :disabled => !@issue.leaf?,
+                                 :required => @issue.required_attribute?('due_date') %>
+                   <%= calendar_for('issue_due_date','start_date') if @issue.leaf? %></p>
+                <% end %>
           </li>
           <div class="cl"></div>
           <li><% if @issue.safe_attribute? 'estimated_hours' %>
-                <p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
+                <p><%= f.text_field :estimated_hours, :size => 3,
+                                 :disabled => !@issue.leaf?,
+                                 :class => "w150",
+                                 :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
             <% end %>
           </li>
           <div class="cl"></div>
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 50c35f6a1..6816ed48b 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -6,55 +6,6 @@
       //issue_project_id
   }
 </script>
-
-<div class="newpro_box">
-    <ul >
-      <li ><label class="label" ><span class="c_red f12">*</span>&nbsp;跟踪&nbsp;&nbsp;:&nbsp;</label>
-        <select name="" class="w150">
-          <option value="0">缺陷</option>
-          <option value="0">功能</option>
-          <option value="0">支持</option>
-          <option value="0">任务</option>
-        </select>
-      </li>
-
-      <li ><input class="ml30" type="checkbox" /><label class="fl ml5 mt3" >私有</label></li>
-      <div class="cl"></div>
-      <li><label class="label"><span class="c_red f12">*</span>&nbsp;主题&nbsp;&nbsp;:&nbsp;</label>
-        <input  type="text" name="" class=" w583 " >
-      </li>
-      <div class="cl"></div>
-      <li><label class="label" ><span class="c_red f12">*</span>&nbsp;描述&nbsp;&nbsp;:&nbsp;</label>
-        <textarea  name="" placeholder="最多3000个汉字(或6000个英文字符)" class=" w583 "   ></textarea>
-      </li>
-      <div class="cl"></div>
-      <li><label class="label" ><span class="c_red f12">*</span>&nbsp;文件&nbsp;&nbsp;:&nbsp;</label>
-        <input type="file"  class="c_grey w150 no_border"/>
-        <label class="c_grey">(最大文件大小: 50 MB)</label>
-      </li>
-      <div class="cl"></div>
-    </ul>
-  </div><!--newpro_box end-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
   <div class="newpro_box">