# HG changeset patch
# User Chris Cannam
# Date 1322054631 0
# Node ID 7429d10cc491623513608f8cf491d5eebe7bac7b
# Parent  548e23d4cd71e435048ea695d8f9803c439c8eb5# Parent  0a5bc55527a6e69f0b4e41edfffdcd8c4c576930
Merge from branch "cannam"

diff -r 548e23d4cd71 -r 7429d10cc491 vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb
--- a/vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb	Wed Nov 23 11:15:54 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb	Wed Nov 23 13:23:51 2011 +0000
@@ -1,13 +1,12 @@
 <p class='tag'>
-  <% fields_for @project, :builder => TabularFormBuilder do |f| -%>
+  <%- fields_for @project, :builder => TabularFormBuilder do |f| -%>
     <div>
       <p id="project_tags">
-        <%= f.text_field :tag_list, :label => :label_tags_search, :size => 60, :class => 'hol' %>
+        <%= f.text_field :tag_list, :label => :label_tags_search, :size => 60, :class => 'hol' -%>
       </p>
       <div id="project_tag_candidates" class="autocomplete"></div>
-      <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %>
-
-      <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_search_tags', :project_id => Project.first.id)}', true)" %>
+      <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' -%>
+      <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_search_tags', :project_id => Project.first.id)}', true)" -%>
     </div>
-  <% end -%>
+  <%- end -%>
 </p>
diff -r 548e23d4cd71 -r 7429d10cc491 vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml
--- a/vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml	Wed Nov 23 11:15:54 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml	Wed Nov 23 13:23:51 2011 +0000
@@ -1,3 +1,4 @@
+<% if !@user_projects.empty? %>
 <% if @myproj_status=="true" %>
 <fieldset id="my_projects_fieldset" class="collapsible">
     <legend onclick="toggleFieldsetWithState(this);"><h2><%= l(:label_my_project_plural) %></h2></legend>
@@ -5,10 +6,12 @@
 <fieldset id="my_projects_fieldset" class="collapsible collapsed">
     <legend onclick="toggleFieldsetWithState(this);"><h2><%= l(:label_my_project_plural) %></h2></legend>
     <div style="display: none;">    
-<%  end%>
-    <% if @user_projects %>  
+<% end %>
     <div>
       <%= render_my_project_hierarchy_with_tags(@user_projects)%>
     </div>
-  <% end %>
+  <% unless @myproj_status=="true" %>
+    </div>
+  <%- end -%>
 </fieldset>
+<% end %>
diff -r 548e23d4cd71 -r 7429d10cc491 vendor/plugins/redmine_tags/app/views/projects/index.rhtml
--- a/vendor/plugins/redmine_tags/app/views/projects/index.rhtml	Wed Nov 23 11:15:54 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/index.rhtml	Wed Nov 23 13:23:51 2011 +0000
@@ -1,5 +1,6 @@
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
+    <%= stylesheet_link_tag 'redmine_tags', :plugin => 'redmine_tags' %>
 <% end %>
 <%= javascript_include_tag 'projects_index', :plugin => 'redmine_tags' %>
 
@@ -22,33 +23,39 @@
 </h2>
 
 <div style="clear:both;"></div>
-<% form_remote_tag(:controller => :projects, :action => :index, :method => :get, :html => {:id => :project_filtering_form}) do %>
+  <%- form_remote_tag(:controller => :projects, :action => :index, :method => :get, :html => {:id => :project_filtering_form}) do -%>
 
-<% if @filter_status=="true" %>
-<fieldset id="filters_fieldset" class="collapsible">
-  <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_filter_plural) %></legend>
-<% else %>
-  <fieldset id="filters_fieldset" class="collapsible collapsed">
-    <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_filter_plural) %></legend>
+    <% if @filter_status=="true" %>
+      <fieldset id="filters_fieldset" class="collapsible">
+      <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_filter_plural) %></legend>
+    <%- else -%>
+      <fieldset id="filters_fieldset" class="collapsible collapsed">
+      <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_filter_plural) %></legend>
       <div style="display: none;">
-<% end %>
-    <div>
+    <%- end -%>
 
-      <div id='filter_tags'>
-        <%= render :partial => 'filter_search_tags' %>
+  <div>
+    <div id='filter_tags'>
+      <%= render :partial => 'filter_search_tags' -%>
+    </div>
+
+    <p class='q'>
+      <%= label_tag 'q', l('project_filtering_q_label') %>
+      <%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>
+    </p>
+
+    <p style="display: none;"><%= submit_tag( l('button_filter'), :id => 'submitButton') -%></p>
+    <%= link_to l(:button_apply), {}, :onclick => "$('submitButton').click(); return false;", :class => 'icon icon-checked' -%>
+    <%= link_to l(:button_clear), {}, :class => 'icon icon-reload'  %>                         
+  </div>
+  
+    <% unless @filter_status=="true" %>
       </div>
+    <%- end -%>
 
-      <p class='q'>
-        <%= label_tag 'q', l('project_filtering_q_label') %>
-        <%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>
-      </p>
 
-      <p style="display: none;"><%= submit_tag( l('button_filter'), :id => 'submitButton') -%></p>
-      <%= link_to l(:button_apply), {}, :onclick => "$('submitButton').click(); return false;", :class => 'icon icon-checked' %>      
-      <%= link_to l(:button_clear), {}, :class => 'icon icon-reload'  %>                         
-    </div>
-  </fieldset>
-<% end %>
+<%- end -%>
+</fieldset>
 
 <div id="projects">
   <%= render :partial => 'filtered_projects' %>
diff -r 548e23d4cd71 -r 7429d10cc491 vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css
--- a/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Wed Nov 23 11:15:54 2011 +0000
+++ b/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Wed Nov 23 13:23:51 2011 +0000
@@ -33,3 +33,7 @@
 div.tags .tag-nube-8 { font-size: 1.5em; }
 
 .tag-count { font-size: .75em; margin-left: .5em; }
+
+ul.projects .tags, ul.projects .no-tags { padding-left: 0.5em; color: #3e442c; font-size: 0.95em }
+table.projects th.tags { color: #3e442c; }
+
diff -r 548e23d4cd71 -r 7429d10cc491 vendor/plugins/redmine_tags/config/locales/en.yml
--- a/vendor/plugins/redmine_tags/config/locales/en.yml	Wed Nov 23 11:15:54 2011 +0000
+++ b/vendor/plugins/redmine_tags/config/locales/en.yml	Wed Nov 23 13:23:51 2011 +0000
@@ -23,6 +23,7 @@
   tags: Tags
   field_tags: Tags
   field_tag_list: Tags
+  field_no_tags: "No tags"
   label_tags_search: "Tags: "
   setting_issue_tags: Issues Tags
   issues_sidebar: Display tags on sidebar as
@@ -35,6 +36,6 @@
 
   auto_complete_new_tag: Add new...
   
-  project_filtering_q_label: "Textual search"
+  project_filtering_q_label: "Search for text:"
   project_filter_no_results: "No matching projects found"
   button_filter: "Filter"
diff -r 548e23d4cd71 -r 7429d10cc491 vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb	Wed Nov 23 11:15:54 2011 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_helper_patch.rb	Wed Nov 23 13:23:51 2011 +0000
@@ -29,8 +29,8 @@
             s << "<thead><tr>"
         
             s << sort_header_tag('name', :caption => l("field_name"))
+            s << "<th class='tags'>" << l("tags") << "</th>"
             s << "<th class='managers'>" << l("label_managers") << "</th>"
-            s << "<th class='tags'>" << l("tags") << "</th>"
             s << sort_header_tag('created_on', :default_order => 'desc')
             s << sort_header_tag('updated_on', :default_order => 'desc')
         
@@ -65,6 +65,11 @@
           s << "'>" << link_to( highlight_tokens(project.name, tokens), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
           s << "</div>"
           s << highlight_tokens(render_project_short_description(project), tokens)
+          s << "</td>"
+
+          # taglist
+          s << "<td class='tags' align=top>" << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') << "</td>"
+
           s << "<td class='managers' align=top>"
            
           u = project.users_by_role
@@ -86,8 +91,6 @@
 
           s << "</td>"
           
-          # taglist
-          s << "<td class='tags' align=top>" << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ') << "</td>"
           s << "<td class='created_on' align=top>" << format_date(project.created_on) << "</td>"
           s << "<td class='updated_on' align=top>" << format_date(project.updated_on) << "</td>"
 
@@ -207,20 +210,25 @@
             s << "<li class='#{classes}'><div class='#{classes}'>" +
               link_to_project(project, {}, :class => "project my-project")
             if project.is_public?
-              s << " <span class='public'>" << l("field_is_public") << "</span>"
+              s << " <span class='public'>" << l(:field_is_public) << "</span>"
             else
-              s << " <span class='private'>" << l("field_is_private") << "</span>"
+              s << " <span class='private'>" << l(:field_is_private) << "</span>"
             end
+           
+            tc = project.tag_counts
+            if tc.empty?
+              s << " <span class='no-tags'>" << l(:field_no_tags) << "</span>"
+            else
+              s << " <span class='tags'>" << tc.collect{ |t| render_project_tag_link(t) }.join(', ') << "</span>"
+            end
+
             s << render_project_short_description(project)
 
-            s << l(:tags) << ":&nbsp"
-            s << project.tag_counts.collect{ |t| render_project_tag_link(t) }.join(', ')
-
             s << "</div>\n"
 
             cs = ''
             project.children.each do |child|
-              cs << render_my_project_in_hierarchy(child)
+              cs << render_my_project_in_hierarchy_with_tags(child)
             end
 
             if cs != ''