app/views/catalog/_index_partials/_default_group.html.erb app/views/catalog/_index_partials/_gallery_document.html.erb app/views/catalog/_index_partials/_gallery_group.html.erb @@ -17,4 +17,31 @@ module SaltHelper link_to(name, catalog_index_path(facet_params), options) end + def grouped_result_count(response, facet_name=nil, facet_value=nil) + if facet_name && facet_value + facet = response.facets.detect {|f| f.name == facet_name} + facet_item = facet.items.detect {|i| i.value == facet_value} if facet + count = facet_item ? facet_item.hits : 0 + else + count = response.docs.total + end + pluralize(count, 'document') + end + + def grouping_facet + fields = Hash[sort_fields] + case h(params[:sort]) + when fields['date -'] + 'year_facet' + when fields['date +'] + 'year_facet' + when fields['document type'] + 'medium_t' + when fields['location'] + 'series_facet' + else + nil + end + end + end \ No newline at end of file app/helpers/salt_helper.rb @@ -1,9 +1,10 @@ -<div id="documents" class="thumbnail-grid"> - <%- @response.docs.each_with_index do |document, counter| -%> - <div class="document thumbnail"> - <%= link_to_document(document, :label => image_tag('default_thumbnail.gif'), :counter => (counter + 1 + @response.params[:start].to_i)) %> - <%= link_to_document(document, :label => truncate(document.get('title_facet'), :length => 20, :omission => "..."), :counter => (counter + 1 + @response.params[:start].to_i)) -%> - <%= document['date_t'] %> - </div> +<div id="documents"> + <% facet_name = grouping_facet %> + <%- if facet_name -%> + <%- @response.docs.group_by {|d| d.get(facet_name)}.each do |grouping| -%> + <%= render :partial => 'catalog/_index_partials/gallery_group', :locals => {:docs => grouping[1], :facet_name => facet_name, :facet_value => grouping[0].to_s} %> + <%- end -%> + <%- else -%> + <%= render :partial => 'catalog/_index_partials/gallery_group', :locals => {:docs => @response.docs, :facet_name => nil, :facet_value => nil} %> <%- end -%> </div> \ No newline at end of file app/views/catalog/_document_gallery.html.erb @@ -5,35 +5,12 @@ var id_array = new Array(); var standard_nums = new Array(); </script> - <% # loop thru each doc -%> - <table> - <caption> - <%= pluralize(@response.docs.total, 'document') %> - </caption> - <tr> - <th>Date</th> - <th>Title</th> - <th>Document Type</th> - <th>Location</th> - </tr> - <% @response.docs.each_with_index do |document,counter| %> - - <% # container for a single doc -%> - <tr class="document <%= cycle("even","odd")%>"> - <td> - <%= document.get(:date_t) %> - </td> - <td> - <%= link_to_document(document, :label => :title_facet, :counter => (counter + 1 + @response.params[:start].to_i)) %> - </td> - <td> - <%= document.get(:medium_t) %> - </td> - <td> - <%= "#{document.get(:series_facet)}, #{document.get(:box_facet)}, #{document.get(:folder_facet)}" %> - </td> - </tr> - - <% end %> - </table> + <% facet_name = grouping_facet %> + <%- if facet_name -%> + <%- @response.docs.group_by {|d| d.get(facet_name)}.each do |grouping| -%> + <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => grouping[1], :facet_name => facet_name, :facet_value => grouping[0].to_s} %> + <%- end -%> + <%- else -%> + <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => @response.docs, :facet_name => nil, :facet_value => nil} %> + <%- end -%> </div> \ No newline at end of file app/views/catalog/_document_list.html.erb @@ -1,5 +1,15 @@ <%# default partial to display solr document fields in catalog index view -%> -<div class="<%= params[:action]%>_details"> - <%= render :partial => "#{params[:controller]}/_#{params[:action]}_partials/default_details", :locals => {:document => document}%> -</div> -<div style="clear:both;"></div> \ No newline at end of file +<tr class="document <%= cycle("even","odd")%>"> + <td> + <%= document.get(:date_t) %> + </td> + <td> + <%= link_to_document(document, :label => :title_facet, :counter => (counter + 1 + @response.params[:start].to_i)) %> + </td> + <td> + <%= document.get(:medium_t) %> + </td> + <td> + <%= "#{document.get(:series_facet)}, #{document.get(:box_facet)}, #{document.get(:folder_facet)}" %> + </td> +</tr> \ No newline at end of file app/views/catalog/_index_partials/_default.html.erb @@ -13,6 +13,7 @@ <%= hidden_field_tag(:qt, params[:qt], :id => 'sort_qt') %> <%= hidden_field_tag(:per_page, params[:per_page].nil? ? Blacklight.config[:index][:num_per_page] : params[:per_page], :id => 'sort_per_page') %> <%= hidden_field_tag(:fq, params[:fq], :id => 'sort_fq') unless params[:fq].nil? %> + <%= hidden_field_tag(:view, params[:view]) %> <%= render :partial => 'catalog/hidden_filters' %> <noscript> <%= submit_tag 'submit', :id => 'sort_submit' %> app/views/catalog/index.html.erb @@ -955,6 +955,8 @@ div.advanced_results, div.advanced_results a, div.advanced_results h2, div.advan #documents { position: relative; float: left; + padding-top: 1em; + width: 100%; } #documents .thumbnail { @@ -972,10 +974,14 @@ div.advanced_results, div.advanced_results a, div.advanced_results h2, div.advan } .thumbnail-grid { - padding: 0px 0px; + padding: 0; + margin-bottom: 2em; + width: 100%; + float: left; } -#documents caption { +#documents h3 { + clear: both; background: #669; color: #fff; margin: 0; @@ -988,7 +994,8 @@ div.advanced_results, div.advanced_results a, div.advanced_results h2, div.advan } #documents table { - margin: 1em 0; + margin: 0 0 2em; + width: 100%; } @media print { public/stylesheets/styles.css @@ -6,6 +6,8 @@ class ApplicationController < ActionController::Base filter_parameter_logging :password, :password_confirmation helper_method :current_user_session, :current_user + + helper :all def user_class; User; end vendor/plugins/blacklight/app/controllers/application_controller.rb 728277d80bb71489fb12faab2d8b4f56c19ca354 Dan Weinand dweinand@gmail.com http://github.com/mediashelf/salt-blacklight/commit/89ec972374a3634715d3771758e212c5600a2a38 89ec972374a3634715d3771758e212c5600a2a38 2009-10-29T23:07:37-07:00 2009-10-29T23:07:37-07:00 Result Grouping first pass. 8d6a01bffe62efe4f79e3a898714882b7a24946e Dan Weinand dweinand@gmail.com