[designfix] move watchers from sidebar to content area

look and feel from related issues

app/views/issues/show.rhtml

@@ -93,7 +93,12 @@
 <%= render :partial => 'relations' %>
 </div>
 <% end %>
-
+  <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
+    (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
+    <div id="watchers">
+      <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
+    </div>
+  <% end %>
 </div>
 
 <% if @changesets.present? %>
@@ -133,13 +138,6 @@
 
 <% content_for :sidebar do %>
   <%= render :partial => 'issues/sidebar' %>
-
-  <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
-    (@issue.watchers.present? && 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

@@ -1,15 +1,11 @@
-<div class="contextual">
-<%= link_to_remote(l(:button_add),
+<strong><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</strong>
+(<%= link_to_remote(l(:button_add_watcher),
                    :url => {:controller => 'watchers',
                             :action => 'new',
                             :object_type => watched.class.name.underscore,
                             :object_id => watched},
                             :method => :get) if User.current.allowed_to?(:add_issue_watchers, @project)
-%>
-</div>
-
-<h3><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</h3>
-
+%>)
 <% unless @watcher.nil? %>
 	<% remote_form_for(:watcher, @watcher,
                 	   :url => {:controller => 'watchers',

config/locales/de.yml

@@ -787,6 +787,7 @@ de:
   label_incoming_emails: Eingehende E-Mails
   label_generate_key: Generieren
   label_issue_watchers: Beobachter
+  button_add_watcher: Beobatcher hinzufügen
   label_example: Beispiel
   label_display: Anzeige
   label_sort: Sortierung

config/locales/en.yml

@@ -792,6 +792,7 @@ en:
   label_incoming_emails: Incoming emails
   label_generate_key: Generate a key
   label_issue_watchers: Watchers
+  button_add_watcher: Add watcher
   label_example: Example
   label_display: Display
   label_sort: Sort

public/stylesheets/application.css

@@ -209,8 +209,8 @@ div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left
 div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
 
 #watchers ul {margin: 0;  padding: 0;}
-#watchers li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
-#watchers select {width: 95%; display: block;}
+#watchers li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;float:left;}
+#watchers select {width: 200px; display: block;float:left;margin-right:10px;}
 #watchers a.delete {opacity: 0.4;}
 #watchers a.delete:hover {opacity: 1;}
 #watchers img.gravatar {vertical-align: middle;margin: 0 4px 2px 0;}
@@ -1812,6 +1812,7 @@ table.files {
 }
 #history {
 	margin:20px 0;
+  margin-bottom:0px;
 }
 #history h3 {
 	border-bottom:1px solid #ddd;
@@ -2691,6 +2692,7 @@ fieldset#attachments input, fieldset#attachments span.add_another_file {
   margin-top: -8px;
 }
 #lower-title-bar {
+  margin-top: 30px;
   margin-left: 10px;
 }
 #watchers .contextual {
@@ -2839,3 +2841,9 @@ ul.breadcrumb {
 #breadcrumb li.cutme {
   width: 50px;
 }
+div#watchers{
+  margin-top:25px;
+}
+div#watchers > form > p {
+  margin-top:5px;
+}