From 35c248a419bef9638404bcfefc98c522d86de69e Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 17:18:04 -0700 Subject: [PATCH] add chronological and random sorting --- app/controllers/page_collections_controller.rb | 2 ++ app/views/page_collections/_sort_bar.html.erb | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index eedebd23..c914f0ae 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -173,6 +173,8 @@ class PageCollectionsController < ApplicationController @pages = @pages.reorder('cached_content_name ASC') when 'chronological' @pages = @pages.reorder('accepted_at ASC') + when 'shuffle' + @pages = @pages.shuffle when 'recent' @pages = @pages.reorder('accepted_at DESC') when nil diff --git a/app/views/page_collections/_sort_bar.html.erb b/app/views/page_collections/_sort_bar.html.erb index 85efde82..6dcdf878 100644 --- a/app/views/page_collections/_sort_bar.html.erb +++ b/app/views/page_collections/_sort_bar.html.erb @@ -5,12 +5,20 @@ Trending <% end %> --> - <%= link_to params.permit(:sort).merge({sort: 'alphabetical'}), class: 'btn btn-flat' do %> + <%= link_to params.permit(:sort).merge({sort: 'alphabetical'}), class: 'btn btn-flat tooltipped', data: { tooltip: "Show pages in this collection alphabetically, by name" } do %> sort Alphabetical <% end %> - <%= link_to params.permit(:sort).merge({sort: 'recent'}), class: 'btn btn-flat' do %> + <%= link_to params.permit(:sort).merge({sort: 'chronological'}), class: 'btn btn-flat tooltipped', data: { tooltip: "Show pages in this collection in the order they were added" } do %> + sort + Chronological + <% end %> + <%= link_to params.permit(:sort).merge({sort: 'recent'}), class: 'btn btn-flat tooltipped', data: { tooltip: "Sort pages in this collection most-recently-added-first" } do %> sort Recently added <% end %> + <%= link_to params.permit(:sort).merge({sort: 'shuffle'}), class: 'btn btn-flat tooltipped', data: { tooltip: "Show pages in this collection in a random order" } do %> + sort + Shuffle + <% end %> \ No newline at end of file