# HG changeset patch
# User Chris Cannam
# Date 1322054375 0
# Node ID 42129b521bdab4a1c47dea2dce3c58d7265661c9
# Parent  a42dcc01dfee01f890417d821c55c59f881bcf00# Parent  0b1b94ffb30f28f45378923add78e6e47ad44098
Merge from branch "feature_14"

diff -r a42dcc01dfee -r 42129b521bda 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 13:18:11 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb	Wed Nov 23 13:19:35 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 a42dcc01dfee -r 42129b521bda vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml
--- a/vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml	Wed Nov 23 13:18:11 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml	Wed Nov 23 13:19:35 2011 +0000
@@ -10,5 +10,8 @@
     <div>
       <%= render_my_project_hierarchy_with_tags(@user_projects)%>
     </div>
+  <% unless @myproj_status=="true" %>
+    </div>
+  <%- end -%>
 </fieldset>
 <% end %>
diff -r a42dcc01dfee -r 42129b521bda vendor/plugins/redmine_tags/app/views/projects/index.rhtml
--- a/vendor/plugins/redmine_tags/app/views/projects/index.rhtml	Wed Nov 23 13:18:11 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/index.rhtml	Wed Nov 23 13:19:35 2011 +0000
@@ -23,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' %>