Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/views/issues/_form.html.erb

@@ -32,7 +32,6 @@
               <%= f.text_field :subject,
                                :class => "w583",
                                :maxlength => 255,
-                               :required => true,
                                :style => "font-size:small",
                                :no_label => true
               %>

app/views/issues/new.html.erb

@@ -13,21 +13,22 @@
     <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="搜索添加跟踪者" >
+            <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" %>
+                      :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')  }')" %>
+          <%= 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">
 
@@ -38,11 +39,11 @@
           <div class="cl"></div>
       <% end %>
       <a href="#" class="blue_btn fl ml80" onclick="$('#issue-form').submit();">
-      <%= l(:button_create)%>
+        <%= l(:button_create) %>
       </a>
-    <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form','preview',{:class => "blue_btn fl ml10"}%>
+      <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
     </div>
-
+    <!--<%= javascript_tag "$('#issue_subject').focus();" %>-->
 <% end %>
 
 <div id="preview" class="wiki"></div>