Mercurial > hg > soundsoftware-site
changeset 805:0b1b94ffb30f feature_14
fixes unclosed div bug in projects index view.
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Wed, 23 Nov 2011 12:48:19 +0000 |
parents | c8aec937ea53 |
children | 42129b521bda 14058c37047a |
files | vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml vendor/plugins/redmine_tags/app/views/projects/index.rhtml |
diffstat | 3 files changed, 35 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb Mon Nov 21 17:51:34 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb Wed Nov 23 12:48:19 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>
--- a/vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml Mon Nov 21 17:51:34 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/_my_projects.rhtml Wed Nov 23 12:48:19 2011 +0000 @@ -10,5 +10,8 @@ <div> <%= render_my_project_hierarchy_with_tags(@user_projects)%> </div> + <% unless @myproj_status=="true" %> + </div> + <%- end -%> <% end %> </fieldset>
--- a/vendor/plugins/redmine_tags/app/views/projects/index.rhtml Mon Nov 21 17:51:34 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/index.rhtml Wed Nov 23 12:48:19 2011 +0000 @@ -22,33 +22,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' %>