Move issue watchers to the sidebar.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3579 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/issues/show.rhtml

@@ -77,14 +77,6 @@
 </div>
 <% end %>
 
-<% if User.current.allowed_to?(:add_issue_watchers, @project) ||
-        (@issue.watchers.any? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
-<hr />
-<div id="watchers">
-<%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
-</div>
-<% end %>
-
 </div>
 
 <% if @changesets.any? %>
@@ -121,7 +113,14 @@
 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
 
 <% content_for :sidebar do %>
-    <%= render :partial => 'issues/sidebar' %>
+  <%= render :partial => 'issues/sidebar' %>
+
+  <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
+    (@issue.watchers.any? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
+    <div id="watchers">
+      <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
+    </div>
+  <% end %>
 <% end %>
 
 <% content_for :header_tags do %>

app/views/watchers/_watchers.rhtml

@@ -6,20 +6,21 @@
                             :object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>
 </div>
 
-<p><strong><%= l(:label_issue_watchers) %></strong></p>
-<%= watchers_list(watched) %>
+<h3><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</h3>
 
 <% unless @watcher.nil? %>
-<% remote_form_for(:watcher, @watcher, 
-                   :url => {:controller => 'watchers',
-                            :action => 'new',
-                            :object_type => watched.class.name.underscore,
-                            :object_id => watched},
-                   :method => :post,
-                   :html => {:id => 'new-watcher-form'}) do |f| %>
-<p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
+	<% remote_form_for(:watcher, @watcher, 
+                	   :url => {:controller => 'watchers',
+              	              :action => 'new',
+            	                :object_type => watched.class.name.underscore,
+         	                    :object_id => watched},
+       	             :method => :post,
+      	             :html => {:id => 'new-watcher-form'}) do |f| %>
+		<p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
 
-<%= submit_tag l(:button_add) %>
-<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
-<% end %>
+		<%= submit_tag l(:button_add) %>
+		<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
+	<% end %>
 <% end %>
+
+<%= watchers_list(watched) %>