# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1321636486 0
# Node ID c2357075c5c9ee9ffe4be95049d0431354eaa64a
# Parent  b5e8049ded56eeee57734165ac7aa2bbca6b0e45# Parent  dc15818e132e3384d4caa177ae76111f17749f89
Merge from 791:dc15818e132e

diff -r b5e8049ded56 -r c2357075c5c9 app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb	Fri Nov 18 17:14:07 2011 +0000
+++ b/app/helpers/projects_helper.rb	Fri Nov 18 17:14:46 2011 +0000
@@ -150,9 +150,6 @@
 
     if s != ''
       a = ''
-      a << "<h2>"
-      a <<  l("label_my_project_plural")
-      a << "</h2>"
       a << "<ul class='projects root'>\n"
       a << s
       a << "</ul>\n"
diff -r b5e8049ded56 -r c2357075c5c9 vendor/plugins/redmine_tags/app/views/projects/_filtered_projects.rhtml
--- a/vendor/plugins/redmine_tags/app/views/projects/_filtered_projects.rhtml	Fri Nov 18 17:14:07 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_filtered_projects.rhtml	Fri Nov 18 17:14:46 2011 +0000
@@ -1,1 +1,5 @@
-<%= render_project_table_with_filtering(@projects, @question) %>
\ No newline at end of file
+<% if @projects.empty? %>
+<p><b><%= l(:project_filter_no_results) %></b></p>
+<% else %>
+<%= render_project_table_with_filtering(@projects, @question) %>
+<% end %>
diff -r b5e8049ded56 -r c2357075c5c9 vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml
--- a/vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml	Fri Nov 18 17:14:07 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml	Fri Nov 18 17:14:46 2011 +0000
@@ -1,9 +1,9 @@
 <% if @myproj_status=="true" %>
 <fieldset id="my_projects_fieldset" class="collapsible">
-    <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_my_projects) %></legend>
+    <legend onclick="toggleFieldsetWithState(this);"><h2><%= l(:label_my_project_plural) %></h2></legend>
 <% else %>
 <fieldset id="my_projects_fieldset" class="collapsible collapsed">
-    <legend onclick="toggleFieldsetWithState(this);"><%= l(:label_my_projects) %></legend>
+    <legend onclick="toggleFieldsetWithState(this);"><h2><%= l(:label_my_project_plural) %></h2></legend>
     <div style="display: none;">    
 <%  end%>
     <% if @user_projects %>  
@@ -11,4 +11,4 @@
       <%= render_my_project_hierarchy(@user_projects)%>
     </div>
   <% end %>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff -r b5e8049ded56 -r c2357075c5c9 vendor/plugins/redmine_tags/app/views/projects/index.rhtml
--- a/vendor/plugins/redmine_tags/app/views/projects/index.rhtml	Fri Nov 18 17:14:07 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/index.rhtml	Fri Nov 18 17:14:46 2011 +0000
@@ -33,15 +33,16 @@
       <div style="display: none;">
 <% end %>
     <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>
 
-      <div id='filter_tags'>
-        <%= render :partial => 'filter_search_tags' %>
-      </div>
-
       <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'  %>                         
diff -r b5e8049ded56 -r c2357075c5c9 vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css
--- a/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Fri Nov 18 17:14:07 2011 +0000
+++ b/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Fri Nov 18 17:14:46 2011 +0000
@@ -33,5 +33,3 @@
 div.tags .tag-nube-8 { font-size: 1.5em; }
 
 .tag-count { font-size: .75em; margin-left: .5em; }
-
-#project_tags label { padding-right: .5em; }
diff -r b5e8049ded56 -r c2357075c5c9 vendor/plugins/redmine_tags/config/locales/en.yml
--- a/vendor/plugins/redmine_tags/config/locales/en.yml	Fri Nov 18 17:14:07 2011 +0000
+++ b/vendor/plugins/redmine_tags/config/locales/en.yml	Fri Nov 18 17:14:46 2011 +0000
@@ -36,4 +36,5 @@
   auto_complete_new_tag: Add new...
   
   project_filtering_q_label: "Textual search"
+  project_filter_no_results: "No matching projects found"
   button_filter: "Filter"