diff options
| -rw-r--r-- | server/src/routes/ui/browser.rs | 4 | ||||
| -rw-r--r-- | server/src/routes/ui/sort.rs | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/server/src/routes/ui/browser.rs b/server/src/routes/ui/browser.rs index 14d32ba..d2c24bc 100644 --- a/server/src/routes/ui/browser.rs +++ b/server/src/routes/ui/browser.rs @@ -54,11 +54,11 @@ pub fn r_all_items_filter( li {@NodeCard { id, node: &node }} }} p.pagecontrols { - "Page " @page " of " + span.current { "Page " @{page + 1} " of " @max_page " " } @if page > 0 { a.prev[href=uri!(r_all_items_filter(Some(page - 1), filter.clone()))] { "Previous page" } " " } - @if page < max_page { + @if page + 1 < max_page { a.next[href=uri!(r_all_items_filter(Some(page + 1), filter.clone()))] { "Next page" } } } diff --git a/server/src/routes/ui/sort.rs b/server/src/routes/ui/sort.rs index ccc3529..4db8f3d 100644 --- a/server/src/routes/ui/sort.rs +++ b/server/src/routes/ui/sort.rs @@ -47,24 +47,24 @@ pub fn filter_and_sort_nodes(f: &NodeFilterSort, nodes: &mut Vec<(String, NodePu markup::define! { NodeFilterSortForm<'a>(f: &'a NodeFilterSort) { - details { + details.filtersort { summary { "Filter and Sort" } form[method="GET", action=""] { - fieldset { + fieldset.filter { legend { "Filter" } @use NodeKind::*; - @for (value, label) in [(Movie, "Movie"), (Episode, "Episode"), (Video, "Video"), (Channel, "Channel")] { + @for (value, label) in [(Movie, "Movie"), (Episode, "Episode"), (Video, "Video"), (Channel, "Channel"), (Series, "Series"), (Season, "Season"), (Collection, "Collection")] { label { input[type="checkbox", name="filter_kind", value=A(value), checked=f.filter_kind.as_ref().map(|k|k.contains(&value)).unwrap_or(true)]; @label } br; } } - fieldset { + fieldset.sortby { legend { "Sort By" } @use SortProperty::*; @for (value, label) in [(Title, "Title"), (ReleaseDate, "Release Date")] { label { input[type="radio", name="sort_by", value=value, checked=Some(value)==f.sort_by]; @label } br; } } - fieldset { + fieldset.sortorder { legend { "Sort Order" } @use SortOrder::*; @for (value, label) in [(Ascending, "Ascending"), (Descending, "Descending")] { |