Mercurial > hg > soundsoftware-site
changeset 754:51d6290d3027 feature_14
added a button to submit filters; removed some unnecessary code; removes ajax observe functionality on filtering.
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Thu, 10 Nov 2011 17:45:08 +0000 |
parents | 7877f25a19d6 |
children | bde9c5bfb559 |
files | vendor/plugins/redmine_tags/app/views/projects/_filter_tags.rhtml vendor/plugins/redmine_tags/app/views/projects/index.rhtml |
diffstat | 2 files changed, 9 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/vendor/plugins/redmine_tags/app/views/projects/_filter_tags.rhtml Thu Nov 10 15:49:00 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_tags.rhtml Thu Nov 10 17:45:08 2011 +0000 @@ -6,6 +6,7 @@ </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')}')" %> </div> <% end -%>
--- a/vendor/plugins/redmine_tags/app/views/projects/index.rhtml Thu Nov 10 15:49:00 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/index.rhtml Thu Nov 10 17:45:08 2011 +0000 @@ -15,27 +15,19 @@ <%= label_tag 'q', l('project_filtering_q_label') %> <%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %> </p> - <%= render :partial => 'custom_field', :collection => @custom_fields_used_for_project_filtering %> + <p class='buttons'><%= submit_tag( l(:button_send), :id => 'filter_button') -%></p> + + <div id='filter_tags'> + <%= render :partial => 'filter_tags' %> + </div> + + <%= link_to_remote('Submit', :url => { :controller => :projects, :action => :index, :format => :js }, :method => :get, :class => 'buttons') %> + </div> - - <div id='filter_tags'> - <%= render :partial => 'filter_tags' %> - </div> - </fieldset> <% end %> - -<%= javascript_tag "Field.focus('search-input');" %> -<%= javascript_tag "$('filter_button').hide();" %> -<%= observe_form( :project_filtering, - :frequency => 0.5, - :url => { :controller => :projects, :action => :index, :format => :js }, - :method => :get - ) -%> - <div id="projects"> <%= render :partial => 'filtered_projects' %> </div>