@@ -7,18 +7,6 @@ <h2>Results navigation</h2> <%= will_paginate @response.docs, :renderer => 'PrevNextLinks', :class => 'prev_next_links' %> <%= will_paginate @response.docs, :class => 'windowed_links' %> - <div class="list_gallery_toggle"> - <%= - link_to_unless(params[:view] == 'list', 'List', {:view => 'list'}, {:class => 'list_toggle'}) do |name| - content_tag(:span, name, {:class => 'list_toggle'}) - end - %> - <%= - link_to_unless(params[:view].blank?, 'Gallery', {:view => nil}, {:class => 'gallery_toggle'}) do |name| - content_tag(:span, name, {:class => 'gallery_toggle'}) - end - %> - </div> <% form_tag root_path, :method=>:get, :class=>'sort' do %> <label>Sort by:</label> <%= select_tag(:sort, options_for_select(Blacklight.config[:sort_fields], h(params[:sort])), :onchange => 'this.form.submit()') %> @@ -31,6 +19,18 @@ <%= submit_tag 'submit', :id => 'sort_submit' %> </noscript> <% end %> + <div class="list_gallery_toggle"> + <%= + link_to_unless(params[:view] == 'list', 'List', params.merge({:view => 'list'}), {:class => 'list_toggle'}) do |name| + content_tag(:span, name, {:class => 'list_toggle'}) + end + %> + <%= + link_to_unless(params[:view].blank?, 'Gallery', params.merge({:view => nil}), {:class => 'gallery_toggle'}) do |name| + content_tag(:span, name, {:class => 'gallery_toggle'}) + end + %> + </div> </div> <%- if params[:view] == 'list' -%> app/views/catalog/index.html.erb @@ -276,7 +276,7 @@ ul.toc { border-bottom:none; text-decoration:underline; } -div.prev_next_links, div.windowed_links, div.list_gallery_toggle { +div.prev_next_links, div.windowed_links { float:left; } @@ -284,10 +284,15 @@ div.prev_next_links, div.windowed_links { margin-top: 20px; } -div.windowed_links, div.list_gallery_toggle { +div.windowed_links { margin-left: 15px; } +div.list_gallery_toggle { + float: right; + margin-right: 15px; +} + div.list_gallery_toggle a, div.list_gallery_toggle span { display: block; float: left; public/stylesheets/styles.css 3dbb13418a4f81cba1950423eedb8a6b02473c4f Dan Weinand dweinand@gmail.com http://github.com/mediashelf/salt-blacklight/commit/41063ede6767875c8bf8a1818574ebfd2e74a323 41063ede6767875c8bf8a1818574ebfd2e74a323 2009-10-25T14:49:01-07:00 2009-10-25T14:49:01-07:00 Preserving pagination and other params when switching between list and gallery views f95e32058dd26d2357f90a0d06a37d756d5e7fd7 Dan Weinand dweinand@gmail.com