jro_apps/redmine Commit - r3465:e605973ec4f5

Move issue watchers to the sidebar....

Jean-Philippe Lang -

r3465:e605973ec4f5

parent child

Context file:

r3465:e605973ec4f5

app/helpers/watchers_helper.rb +7 -5

               # Returns a comma separated list of users watching the given object
               def watchers_list(object)
                 remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project)
-                object.watcher_users.collect do |user|
+                lis = object.watcher_users.collect do |user|
-                  s = content_tag('span', link_to_user(user), :class => 'user')
+                  s = avatar(user, :size => "16").to_s + link_to_user(user, :class => 'user').to_s
                   if remove_allowed
                     url = {:controller => 'watchers',
                            :action => 'destroy',
                     s += ' ' + link_to_remote(image_tag('delete.png'),
                                               {:url => url},
                                               :href => url_for(url),
-                                              :style => "vertical-align: middle")
+                                              :style => "vertical-align: middle",
+                                              :class => "delete")
                   end
+                  "<li>#{ s }</li>"
-                end.join(",\n")
+                end
+                lis.empty? ? "" : "<ul>#{ lis.join("\n") }</ul>"
               end
             end

app/views/issues/show.rhtml +8 -9

             </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? %>
             <% 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 +14 -13

@@ -6,20 +6,21
6	:object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>	6	:object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>
7	</div>	7	</div>
8		8
9	<p><strong><%= l(:label_issue_watchers) %></strong></p>	9	<h3><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</h3>
10	<%= watchers_list(watched) %>
11		10
12	<% unless @watcher.nil? %>	11	<% unless @watcher.nil? %>
13	<% remote_form_for(:watcher, @watcher,	12	<% remote_form_for(:watcher, @watcher,
14	:url => {:controller => 'watchers',	13	:url => {:controller => 'watchers',
15	:action => 'new',	14	:action => 'new',
16	:object_type => watched.class.name.underscore,	15	:object_type => watched.class.name.underscore,
17	:object_id => watched},	16	:object_id => watched},
18	:method => :post,	17	:method => :post,
19	:html => {:id => 'new-watcher-form'}) do \|f\| %>	18	:html => {:id => 'new-watcher-form'}) do \|f\| %>
20	<p><%= f.select :user_id, (watched.addable_watcher_users.collect {\|m\| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>	19	<p><%= f.select :user_id, (watched.addable_watcher_users.collect {\|m\| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
21		20
22	<%= submit_tag l(:button_add) %>	21	<%= submit_tag l(:button_add) %>
23	<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>	22	<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
24	<% end %>	23	<% end %>
25	<% end %>	24	<% end %>
		25
		26	<%= watchers_list(watched) %>

public/stylesheets/application.css +7 0

             div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
             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 a.delete {opacity: 0.4;}
+            #watchers a.delete:hover {opacity: 1;}
+            #watchers img.gravatar {vertical-align: middle;margin-right: 4px;}
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages