changeset 930:027cc0f5d4a2 cannam_integration

Merge from branch "luisf"

--- a/vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb	Tue Mar 13 16:34:52 2012 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb	Wed Jun 27 14:56:14 2012 +0100
@@ -1,8 +1,11 @@
 <% fields_for :project, project, :builder => TabularFormBuilder do |f| -%>
 <div>
-  <p id="project_tags"><%= f.text_field :tag_list, :label => :tags, :size => 60, :class => 'hol' %></p>
+  <p id="project_tags"><%= f.text_field :tag_list, :label => :tags, :size => 60, :class => 'hol' %>
+    <br />
+    <em><%= l(:text_tags_info) %></em>
+  </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_tags', :project_id => Project.first.id)}', false)" %>
+  <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}', false)" %>  
 </div>
 <% end -%>
\ No newline at end of file

--- a/vendor/plugins/redmine_tags/config/locales/en.yml	Tue Mar 13 16:34:52 2012 +0000
+++ b/vendor/plugins/redmine_tags/config/locales/en.yml	Wed Jun 27 14:56:14 2012 +0100
@@ -39,3 +39,7 @@
   project_filtering_q_label: "Search for text:"
   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!"
+
+