# HG changeset patch
# User Chris Cannam
# Date 1322056688 0
# Node ID b4e59a60b447ed0c9fecc5b50a54941d9d3ca21a
# Parent  7429d10cc491623513608f8cf491d5eebe7bac7b# Parent  aaa26ccafb00bb7d889b7f23067c0dc61681f3eb
Merge from branch "cannam"

diff -r 7429d10cc491 -r b4e59a60b447 app/views/projects/show.rhtml
--- a/app/views/projects/show.rhtml	Wed Nov 23 13:23:51 2011 +0000
+++ b/app/views/projects/show.rhtml	Wed Nov 23 13:58:08 2011 +0000
@@ -98,6 +98,7 @@
 </div>
 
 <% content_for :sidebar do %>
+    <%= call_hook(:view_projects_show_sidebar_top, :project => @project) %>
     <% if @total_hours.present? %>
     <h3><%= l(:label_spent_time) %></h3>
     <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
diff -r 7429d10cc491 -r b4e59a60b447 vendor/plugins/redmine_bibliography/app/views/projects/show.rhtml
--- a/vendor/plugins/redmine_bibliography/app/views/projects/show.rhtml	Wed Nov 23 13:23:51 2011 +0000
+++ b/vendor/plugins/redmine_bibliography/app/views/projects/show.rhtml	Wed Nov 23 13:58:08 2011 +0000
@@ -101,6 +101,7 @@
 </div>
 
 <% content_for :sidebar do %>
+    <%= call_hook(:view_projects_show_sidebar_top, :project => @project) %>
     <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
     <h3><%= l(:label_spent_time) %></h3>
     <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
diff -r 7429d10cc491 -r b4e59a60b447 vendor/plugins/redmine_tags/app/views/projects/_tags.html.erb
--- a/vendor/plugins/redmine_tags/app/views/projects/_tags.html.erb	Wed Nov 23 13:23:51 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_tags.html.erb	Wed Nov 23 13:58:08 2011 +0000
@@ -1,6 +1,7 @@
 <% unless @project.tag_list.empty? %>
-  <tr>
-    <td><b><%=l(:tags)%>:</b></td>
-    <td><%= @project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') %></td>
-  </tr>
+  <%= stylesheet_link_tag 'redmine_tags', :plugin => 'redmine_tags' %>
+  <dl class="tags">
+    <dt class="tags-title"><%=l(:tags)%></dt>
+    <dd class="tags"><%= @project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') %></dd>
+  </dl>
 <% end %>
diff -r 7429d10cc491 -r b4e59a60b447 vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css
--- a/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Wed Nov 23 13:23:51 2011 +0000
+++ b/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Wed Nov 23 13:58:08 2011 +0000
@@ -37,3 +37,7 @@
 ul.projects .tags, ul.projects .no-tags { padding-left: 0.5em; color: #3e442c; font-size: 0.95em }
 table.projects th.tags { color: #3e442c; }
 
+dl.tags { margin-top: 1.5em; margin-left: 0; padding-bottom: 1em; overflow: hidden; margin-bottom: 1em; border-bottom: 1px dotted #bbbbbb; }
+dt.tags-title { float: left; font-weight: bold; color: #3e442c; } 
+dd.tags { margin-left: .5em; float: left; color: #3e442c; }
+ 
diff -r 7429d10cc491 -r b4e59a60b447 vendor/plugins/redmine_tags/lib/redmine_tags/hooks/views_projects_hook.rb
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/hooks/views_projects_hook.rb	Wed Nov 23 13:23:51 2011 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/hooks/views_projects_hook.rb	Wed Nov 23 13:58:08 2011 +0000
@@ -2,7 +2,7 @@
   module Hooks
     class ViewsProjectsHook < Redmine::Hook::ViewListener
       render_on :view_projects_form, :partial => 'projects/tags_form'
-      render_on :view_projects_show_left, :partial => 'projects/tags'
+      render_on :view_projects_show_sidebar_top, :partial => 'projects/tags'
 #      render_on :view_issues_sidebar_planning_bottom, :partial => 'issues/tags_sidebar'
     end
   end