mirror of
https://github.com/heyarne/airsonic-ui.git
synced 2026-05-06 18:33:38 +02:00
Move navigation to the top
Squashed commit of the following:
commit b03c1ea7ed0d2fbd56f56f3273e694abc5454101
Author: Arne Schlüter <arne@schlueter.is>
Date: Wed Aug 29 11:38:32 2018 +0200
Fix bug where dropdown menus behind notifications could not be hovered
commit f4d3cd3dad89d0de84f131dbef7268422b26aa35
Author: Arne Schlüter <arne@schlueter.is>
Date: Wed Aug 29 11:16:41 2018 +0200
Move navigation to top
commit 564d972291aebb382d1ca560a21fad332d70cd0c
Author: Arne Schlüter <arne@schlueter.is>
Date: Wed Aug 29 10:23:17 2018 +0200
Move audio player into its own component
commit 382e9e88021db1506efc5fb78935b7846b8257db
Author: Arne Schlüter <arne@schlueter.is>
Date: Wed Aug 29 10:11:14 2018 +0200
Remove link to last.fm in bio
commit f248c2999ca88eeb82769d7491b1e786ee4a7c9d
Author: Arne Schlüter <arne@schlueter.is>
Date: Wed Aug 29 10:01:10 2018 +0200
Add links to external services & hero headers to album and artist pages
This commit is contained in:
parent
5c66a1d5bf
commit
29ea86479c
17 changed files with 223 additions and 179 deletions
|
|
@ -16,7 +16,7 @@
|
|||
page as its argument. When `max-pages` is `nil` an infinite pagination
|
||||
will be rendered."
|
||||
[{:keys [url-fn max-pages current-page]}]
|
||||
[:nav.pagination.is-centered {:role "pagination", :aria-label "pagination"}
|
||||
[:nav.pagination {:role "pagination", :aria-label "pagination"}
|
||||
[:a.pagination-previous (if (> current-page 1)
|
||||
{:href (url-fn (dec current-page))}
|
||||
{:disabled true}) "Previous page"]
|
||||
|
|
@ -35,25 +35,26 @@
|
|||
current-page? (add-classes :is-current))
|
||||
(cond-> {:href (url-fn page), :aria-label (str "Page " page)}
|
||||
(= page current-page) (assoc :aria-current "page")) page]))
|
||||
(when (or (not max-pages) (< max-pages (- max-pages 3)))
|
||||
(when (or (not max-pages) (< current-page (- max-pages 2)))
|
||||
^{:key "ellipsis-after"} [:li>span.pagination-ellipsis "…"])]])
|
||||
|
||||
(defn main [route {:keys [scan-status album-list]}]
|
||||
(let [[_ {:keys [criteria]} {:keys [page] :or {page 1}}] route
|
||||
tab-items [[[::routes/library {:criteria "recent"} nil] "Recently played"]
|
||||
[[::routes/library {:criteria "newest"} nil] "Newest additions"]
|
||||
[[::routes/library {:criteria "starred"} nil] "Starred"]]
|
||||
pagination [pagination {:current-page (int page)
|
||||
:max-pages 5
|
||||
:url-fn #(url-for ::routes/library {:criteria criteria} {:page %})}]]
|
||||
[:div
|
||||
[:h2.title "Your library"]
|
||||
(if (:count scan-status)
|
||||
[:p.subtitle.is-5.has-text-grey "Containing " [:strong (:count scan-status)] " items"]
|
||||
(when (:scanning scan-status)
|
||||
[:p.subtitle.is-5.has-text-grey "Scanning…"]))
|
||||
(let [items [[[::routes/library {:criteria "recent"} nil] "Recently played"]
|
||||
[[::routes/library {:criteria "newest"} nil] "Newest additions"]
|
||||
[[::routes/library {:criteria "starred"} nil] "Starred"]]]
|
||||
[tabs {:items items :active-item {:criteria criteria}}])
|
||||
pagination
|
||||
[:section.section
|
||||
[album/listing (:album album-list)]]
|
||||
pagination]))
|
||||
[:section.hero.is-small>div.hero-body>div.container
|
||||
[:h2.title "Your library"]
|
||||
(if (:count scan-status)
|
||||
[:p.subtitle.is-5.has-text-grey "Containing " [:strong (:count scan-status)] " items"]
|
||||
(when (:scanning scan-status)
|
||||
[:p.subtitle.is-5.has-text-grey "Scanning…"]))]
|
||||
[:section.section>div.container
|
||||
[tabs {:items tab-items :active-item {:criteria criteria}}]
|
||||
pagination
|
||||
[:section.section [album/listing (:album album-list)]]
|
||||
pagination]]))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue