From 85400616f13e89ecc347e0b6593d4549a24159a9 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 9 Apr 2015 18:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=BC=BA=E9=99=B7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_form.html.erb | 99 ++++++++++++++++++++-------------
 app/views/issues/new.html.erb   |  4 +-
 2 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 0f86f466e..185b45444 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -9,54 +9,76 @@
 
 <%= labelled_fields_for :issue, @issue do |f| %>
 <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
+  <ul>
+    <li>
+    <% if @issue.safe_attribute? 'tracker_id' %>
+      <label class="label"><span class="c_red f12">*</span>&nbsp;跟踪&nbsp;&nbsp;:&nbsp;</label>
+      <%= f.select  :tracker_id,
+                   @issue.project.trackers.collect {|t| [t.name, t.id]},
+                   {:required => true, :no_label => true},
+                   :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+                   :class=> "w150"
+      %>
+    <% end %>
+    </li>
 
-<% if @issue.safe_attribute? 'is_private' %>
-<p style="float:right; margin-right:1em;">
-  <%= f.check_box :is_private, :no_label => true %><label class="inline" for="issue_is_private" id="issue_is_private_label"><%= l(:field_is_private) %></label>
-</p>
-<% end %>
+    <li>
+    <% if @issue.safe_attribute? 'is_private' %>
+      <%= f.check_box :is_private, :no_label => true ,:class=> "ml30"%><label class="fl ml5 mt3" for="issue_is_private" id="issue_is_private_label"><%= l(:field_is_private) %></label>
 
-<% if @issue.safe_attribute? 'project_id' %>
-<p><%= f.select :project_id, project_tree_options_for_select(@issue.allowed_target_projects, :selected => @issue.project), {:required => true},
+
+    <% end %>
+    </li>
+    <div class="cl"></div>
+    <li>
+      <% if @issue.safe_attribute? 'project_id' %>
+      <p><%= f.select :project_id, project_tree_options_for_select(@issue.allowed_target_projects, :selected => @issue.project), {:required => true},
                 :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>
-<% end %>
+      <% end %>
+    </li>
 
-<% if @issue.safe_attribute? 'tracker_id' %>
-<p><%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, {:required => true},
-                :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>
-
-<% end %>
-
-
-<% if @issue.safe_attribute? 'subject' %>
-<p><%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true, :style => "font-size:small" %></p>
-<!--Added by young-->
-<%= javascript_tag  do %>
-   observeAutocompleteField('issue_subject', '<%= escape_javascript auto_complete_issues_path(:project_id => @project,:scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>',
+    <li>
+      <% if @issue.safe_attribute? 'subject' %>
+        <label class="label"><span class="c_red f12">*</span>&nbsp;主题&nbsp;&nbsp;:&nbsp;</label>
+        <%= f.text_field :subject,
+                       :size => 80,
+                       :maxlength => 255,
+                       :required => true,
+                       :style => "font-size:small",
+                       :no_label => true
+       %>
+          <!--Added by young-->
+        <%= javascript_tag  do %>
+          observeAutocompleteField('issue_subject', '<%= escape_javascript auto_complete_issues_path(:project_id => @project,:scope => (Setting.cross_project_issue_relations? ? 'all' : nil)) %>',
             { select: function(event, ui) {
             $('input#issue_subject').val(ui.item.value);
             }
             });
-<% end %>
+        <% end %>
 
-<% end %>
+      <% end %>
+    </li>
+    <div class="cl"></div>
+
+    <li>
+      <% if @issue.safe_attribute? 'description' %>
+        <label class="label"><span class="c_red f12">*</span>&nbsp;描述&nbsp;&nbsp;:&nbsp;</label>
+        <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label=>true , :class=> "label"  %>
+        <%= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
+        <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
+          <%= f.text_area :description,
+                       :cols => 60,
+                       :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+                       :accesskey => accesskey(:edit),
+                       :class => "w583",
+                       :no_label => true %>
+        <% end %>
+
+        <%= wikitoolbar_for 'issue_description' %>
+      <% end %>
+    </li>
+    <div class="cl"></div>
 
-<% if @issue.safe_attribute? 'description' %>
-<p>
-  <%= f.label_for_field :description, :required => @issue.required_attribute?('description') %>
-  <%= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
-  <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
-  <%= f.text_area :description,
-                   :cols => 60,
-                   :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
-                   :accesskey => accesskey(:edit),
-                   :class => 'wiki-edit',
-                   :style => "font-size:small;width:520px;",
-                   :no_label => true %>
-  <% end %>
-</p>
-<%= wikitoolbar_for 'issue_description' %>
-<% end %>
 
 <div id="attributes" class="attributes">
   <%= render :partial => 'issues/attributes' %>
@@ -64,3 +86,4 @@
 
 <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
 <% end %>
+</ul>
\ No newline at end of file
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index a2facd5ab..a12d6d335 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -7,10 +7,8 @@
                              :html => {:id => 'issue-form', :multipart => true} do |f| %>
   <%= error_messages_for 'issue' %>
   <%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
-  <div class="box tabular">
-    <div id="all_attributes">
+  <div class="newpro_box">
     <%= render :partial => 'issues/form', :locals => {:f => f} %>
-    </div>
 
     <% if @copy_from && @copy_from.attachments.any? %>
     <p>