changeset 1264:bc7baaca92a9 redmine-2.2-integration

Tag search/filtering implemented. Needs interface redesign.

--- a/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb	Thu Apr 11 15:14:06 2013 +0100
+++ b/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb	Thu Apr 11 15:14:44 2013 +0100
@@ -1,7 +1,8 @@
 <div>
-  <p id="project_tags"><%= text_field_tag 'tag_search', params[:tag_search] -%>
+  <p id="project_tags">
+    <%= label_tag 'tag_search', l(:tags_search).html_safe -%>
+    <%= text_field_tag 'tag_search', params[:tag_search] -%>
     <br />
-    <em class="info"><%= l(:text_tags_info).html_safe %></em>
   </p>
 
   <div id="project_tag_candidates" class="autocomplete" style="margin-top: 0;"></div>

--- a/plugins/redmine_tags/app/views/projects/index.html.erb	Thu Apr 11 15:14:06 2013 +0100
+++ b/plugins/redmine_tags/app/views/projects/index.html.erb	Thu Apr 11 15:14:44 2013 +0100
@@ -2,6 +2,7 @@
     <%= 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' %>
 
 <div class="contextual">
@@ -18,15 +19,16 @@
 
 <%= form_tag :projects, :method => :get do -%>
   <div>
+    <p class='q'>
+      <%= label_tag 'search', l('project_filtering_q_label') %>
+      <%= text_field_tag 'search', params[:search] -%>
+    </p>
+
     <div id='filter_tags'>
       <%= render :partial => 'filter_search_tags' -%>
     </div>
 
-    <p class='q'>
-      <%= label_tag 'search', l('project_filtering_q_label') %>
-      <%= text_field_tag 'search', params[:search] -%>
-      <%= submit_tag :search, :name => nil %>
-    </p>
+    <%= submit_tag :search, :name => "Search" %>
 
   </div>
 <%- end -%>

--- a/plugins/redmine_tags/config/locales/en.yml	Thu Apr 11 15:14:06 2013 +0100
+++ b/plugins/redmine_tags/config/locales/en.yml	Thu Apr 11 15:14:44 2013 +0100
@@ -28,7 +28,7 @@
   issues_show_count: Display amount of issues
   issues_open_only: Display open issues only
   issues_sort_by: Sort tags by
-  
+
   issue_tags_sidebar_none: None
   issue_tags_sidebar_list: List
   issue_tags_sidebar_cloud: Cloud
@@ -40,9 +40,11 @@
 
   auto_complete_new_tag: Add new...
 
-  project_filtering_q_label: "Search for text:"
+  project_filtering_q_label: "Filter by name:"
   project_filter_no_results: "No matching projects found"
   button_filter: "Filter"
-  
-  text_tags_info: "A tag can be any text you like, but they're most useful if you choose tags that are already being used for the same thing by other projects (where possible). <br />Some tag examples are: library, plugin, paper, c++, mir, alpha, stable, bsd, android, ...<br />Tags help others find your work: please don't forget to tag your projects!"
 
+  tags_search: "Filter by tag"
+
+  text_tags_search: "A tag can be any text you like, but they're most useful if you choose tags that are already being used for the same thing by other projects (where possible). <br />Some tag examples are: library, plugin, paper, c++, mir, alpha, stable, bsd, android, ...<br />Tags help others find your work: please don't forget to tag your projects!"
+