From 521e000c741e78943626bdd30543a2fdfeeac27a Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Wed, 15 Apr 2015 17:17:03 +0800
Subject: [PATCH] commmit

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

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 230fad3c8..022d77f28 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -96,38 +96,5 @@
     <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 5befcfccc..c6b1e0dc8 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -10,8 +10,39 @@
   <div>
     <%= render :partial => 'issues/form', :locals => {:f => f} %>
   </div>
-  
-  <%= javascript_tag "$('#issue_subject').focus();" %>
+  <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>
+
 <% end %>
 
 <div id="preview" class="wiki"></div>