From a10ced61ec9c35e2ab168a6ef136ffb377545867 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Wed, 15 Apr 2015 17:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E8=B7=9F=E8=B8=AA=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_form.html.erb | 33 +++++++++++++++++++++++++++++++++
 app/views/issues/new.html.erb   | 33 +--------------------------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 022d77f28..230fad3c8 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -96,5 +96,38 @@
     <div id="attributes">
       <%= render :partial => 'issues/attributes' %>
     </div>
+    <div class="newpro_box02 ">
+      <% if @issue.safe_attribute? 'watcher_user_ids' -%>
+          <div>
+            <label class="label" > <%= l(:label_issue_watchers) %>：</label>
+            <input id="" name="" size="22" class="fl mb10 h26"  type="text" placeholder="搜索添加跟踪者" >
+          <span class="search_for_watchers">
+          <%= link_to   "",
+                        {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
+                        :remote => true,
+                        :method => 'get',
+                        :class=>"pic_sch mt5 ml5" %>
+          </span>
+          </div>
+          <%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user=> @available_watchers, :format => 'js',:flag => 'ture')  }')" %>
+          <div class="cl"></div>
+          <span id="watchers_inputs">
+          <%= watchers_checkboxes(@issue, @available_watchers) %>
+          </span>
+          <div class="cl"></div>
+          <div id="watchers_inputs">
+
+          </div>
+          <div class="cl"></div>
+
+          </ul>
+          <div class="cl"></div>
+      <% end %>
+      <a href="#" class="blue_btn fl ml80" onclick="$('#issue-form').submit();">
+        <%= l(:button_create)%>
+      </a>
+      <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form','preview',{:class => "blue_btn fl ml10"}%>
+    </div>
+
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 6846e9e53..5befcfccc 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -10,38 +10,7 @@
   <div>
     <%= render :partial => 'issues/form', :locals => {:f => f} %>
   </div>
-  <div class="newpro_box02 ">
-    <% if @issue.safe_attribute? 'watcher_user_ids' -%>
-        <div>
-          <label class="label" > <%= l(:label_issue_watchers) %>：</label>
-          <input id="" name="" size="22" class="fl mb10 h26"  type="text" placeholder="搜索添加跟踪者" >
-          <span class="search_for_watchers">
-          <%= link_to   "",
-                      {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
-                      :remote => true,
-                      :method => 'get',
-                      :class=>"pic_sch mt5 ml5" %>
-          </span>
-        </div>
-        <%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user=> @available_watchers, :format => 'js',:flag => 'ture')  }')" %>
-        <div class="cl"></div>
-          <span id="watchers_inputs">
-          <%= watchers_checkboxes(@issue, @available_watchers) %>
-          </span>
-        <div class="cl"></div>
-        <div id="watchers_inputs">
-
-        </div>
-        <div class="cl"></div>
-
-        </ul>
-        <div class="cl"></div>
-        <% end %>
-    <a href="#" class="blue_btn fl ml80" onclick="$('#issue-form').submit();">
-      <%= l(:button_create)%>
-    </a>
-    <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form','preview',{:class => "blue_btn fl ml10"}%>
-  </div>
+  
   <%= javascript_tag "$('#issue_subject').focus();" %>
 <% end %>