缺陷更新页面

app/helpers/application_helper.rb

@@ -728,7 +728,7 @@ module ApplicationHelper
   end
 
   def other_formats_links(&block)
-    concat('<p class="other-formats">'.html_safe + l(:label_export_to))
+    concat('<p class="other-formats fr">'.html_safe + l(:label_export_to))
     yield Redmine::Views::OtherFormatsBuilder.new(self)
     concat('</p>'.html_safe)
   end

app/views/issues/_edit.html.erb

@@ -28,31 +28,15 @@
     <p style="padding-top: 5px;"><%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
     <!--</fieldset>-->
 
-    <div class="box tabular" >
+    <div class="cl"></div>
-    <p id="watchers_form">
-      <label style="font-size: 15px;"><%= l(:label_issue_watchers) %></label>
-      <span id="watchers_inputs" style="font-size: 15px;">
-        <%= watchers_checkboxes(@issue, @available_watchers) %>
-      </span>
-      <span class="search_for_watchers" style="font-size: 15px;">
-      <%= link_to l(:label_search_for_watchers),
-                   {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
-                    :remote => true,
-                    :method => 'get' %>
-      </span>
-      </p>
-        </div>
-    </div>
-
     <%= f.hidden_field :lock_version %>
     <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
     <%= hidden_field_tag 'reference_user_id', params[:reference_user_id]%>
-    <a remote="true" href="javascript:void(0)" class="blue_btn fr" onclick="$('#issue-form').submit();">
+    <a remote="true" href="javascript:void(0)" class="blue_btn fl ml80" onclick="$('#issue-form').submit();">
       <%= l(:button_submit) %>
     </a>
-    </p></br></br>
     <%#= submit_tag l(:button_submit) %>
-    <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
+    <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fl ml10"}%>
 <% end %>
 
 <div id="preview" class="wiki"></div>

app/views/issues/_form.html.erb

@@ -95,5 +95,23 @@
     <div id="attributes">
       <%= render :partial => 'issues/attributes' %>
     </div>
+    <div class="cl"></div>
+    <div class="newpro_box02 ">
+      <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>
+    <%= 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>
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>

app/views/issues/new.html.erb

@@ -31,11 +31,8 @@
 
           <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();">

app/views/issues/show.html.erb

@@ -13,7 +13,10 @@
     </div>
     <div class="talk_txt fl">
       <p class="pro_page_tit" style="word-break:break-all;">
-      <%= @issue.subject %><span class='<%= "#{get_issue_type(@issue.tracker_id)}" %>'><%= get_issue_typevalue(@issue.tracker_id) %></span></p><br />
+        <%= @issue.subject %>
+        <span class='<%= "#{get_issue_type(@issue.tracker_id)}" %>'><%= get_issue_typevalue(@issue.tracker_id) %></span>
+      </p><br/>
+
       <div class="cl"></div>
       <p>由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>
         <% if @issue.created_on != @issue.updated_on %>
@@ -21,7 +24,8 @@
         <% else %>
             添加于 <%= format_time(@issue.updated_on).html_safe %>
         <% end %>
-  </div><!--talk_txt end-->
+    </div>
+    <!--talk_txt end-->
     <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
     <div class="cl"></div>
     <div class="talk_info mb10" style="word-break:break-all;">
@@ -44,40 +48,52 @@
         <%= issue_fields_rows do |rows| %>
             <ul class="fl">
 
-      <li><p class="label" ><span class="c_red f12">*</span>&nbsp;状态&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= @issue.status.name %></p>
+              <li><p class="label"><span class="c_red f12">*</span>&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
+
+                <p class="pro_info_p"><%= @issue.status.name %></p>
               </li>
               <div class="cl"></div>
-      <li><p class="label" ><span class="c_red f12">*</span>&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.priority.name %></span>
+              <li><p class="label"><span class="c_red f12">*</span>&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
+                <span class="pro_info_p"><%= @issue.priority.name %></span>
               </li>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
-            <li><p class="label" >&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "-" %></span></li>
+                  <li><p class="label">&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "-" %></span>
+                  </li>
               <% end %>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
-            <li><p class="label" >&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "-") %></span></li>
+                  <li><p class="label">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "-") %></span>
+                  </li>
               <% end %>
               <div class="cl"></div>
             </ul>
             <ul class="fl ml90">
               <% unless @issue.disabled_core_fields.include?('start_date') %>
-        <li><p class="label02" >&nbsp;开始日期&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= format_date(@issue.start_date) %></p></li>
+                  <li><p class="label02">&nbsp;开始日期&nbsp;&nbsp;:&nbsp;</p>
+
+                    <p class="pro_info_p"><%= format_date(@issue.start_date) %></p></li>
               <% end %>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('due_date') %>
-      <li><p class="label02" >&nbsp;计划完成日期&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= format_date(@issue.due_date) %></span>
+                  <li><p class="label02">&nbsp;计划完成日期&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= format_date(@issue.due_date) %></span>
                   </li>
               <% end %>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
 
-            <li><p class="label02" >&nbsp;预期时间&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
+                  <li><p class="label02">&nbsp;预期时间&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
                   </li>
 
               <% end %>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('done_ratio') %>
-      <li><p class="label02" >&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.done_ratio %>%</span>
+                  <li><p class="label02">&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= @issue.done_ratio %>%</span>
                   </li>
               <% end %>
               <div class="cl"></div>
@@ -85,11 +101,13 @@
         <% end %>
         <%#= render_custom_fields_rows(@issue) %>
         <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
-  </div><!--pro_info_box 属性 end-->
+      </div>
+      <!--pro_info_box 属性 end-->
       <div class="cl"></div>
       <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %></a>
       <div class="cl"></div>
-</div><!--problem_main end-->
+      </div>
+  <!--problem_main end-->
   <div style="clear: both;"></div>
   <% if @issue.editable? %>
       <div id="update">
@@ -111,7 +129,7 @@
 <!--<%#= render :partial => 'action_menu' %>-->
 
 
-
+<div class="cl"></div>
 <% other_formats_links do |f| %>
     <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
     <%= f.link_to 'PDF' %>
@@ -120,7 +138,7 @@
 
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>
-
+    <br>
     <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
             (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
         <div id="watchers">