From b9148933f44e35b2919525524679eb3b06763685 Mon Sep 17 00:00:00 2001 From: bkfox Date: Sat, 27 Jan 2024 19:24:24 +0100 Subject: [PATCH] rendering --- aircox/models/log.py | 13 ++++++------- aircox/static/aircox/css/admin.css | 1 - aircox/static/aircox/css/public.css | 8 +++++++- aircox/templates/aircox/widgets/player.html | 4 +++- aircox/views/home.py | 4 +++- assets/src/assets/components.scss | 1 - assets/src/assets/public.scss | 12 ++++++++++-- 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/aircox/models/log.py b/aircox/models/log.py index 72b3e9b..1009583 100644 --- a/aircox/models/log.py +++ b/aircox/models/log.py @@ -164,7 +164,7 @@ class Log(Renderable, models.Model): object_list += [cls(obj) for obj in items] @classmethod - def merge_diffusions(cls, logs, diffs, count=None, diff_count=None, log_slice=None, group_logs=False): + def merge_diffusions(cls, logs, diffs, count=None, diff_count=None, group_logs=False): """Merge logs and diffusions together. `logs` can either be a queryset or a list ordered by `Log.date`. @@ -179,7 +179,7 @@ class Log(Renderable, models.Model): while True: if not len(diffs): - cls._append_logs(object_list, logs, len(logs), slice=log_slice, group=group_logs) + cls._append_logs(object_list, logs, len(logs), group=group_logs) break if not len(logs): @@ -190,7 +190,7 @@ class Log(Renderable, models.Model): # - takes all logs after diff start index = cls._next_index(logs, diff.end, len(logs), pred=operator.le) - cls._append_logs(object_list, logs, index, slice=log_slice, group=group_logs) + cls._append_logs(object_list, logs, index, group=group_logs) if len(logs): # FIXME @@ -214,9 +214,7 @@ class Log(Renderable, models.Model): return next(iter, default) @classmethod - def _append_logs(cls, object_list, logs, count, slice=None, group=False): - if slice: - count = min(slice, count) + def _append_logs(cls, object_list, logs, count, group=False): logs = logs[:count] if not logs: return object_list @@ -239,7 +237,8 @@ class Log(Renderable, models.Model): yield cum cum = [] last_time = hour - cum.append(log) + # reverse from lowest to highest date + cum.insert(0, log) if cum: yield cum diff --git a/aircox/static/aircox/css/admin.css b/aircox/static/aircox/css/admin.css index 2b0d91d..cff5404 100644 --- a/aircox/static/aircox/css/admin.css +++ b/aircox/static/aircox/css/admin.css @@ -491,7 +491,6 @@ preview-header:not(.no-cover) .card-headings .heading, preview-header:not(.no-co padding: 0.4rem !important; min-width: calc(var(--a-player-bar-height) + 0.8rem); border-radius: 0px; - transition: background-color 0.5s; } .a-player-bar .button.open { background-color: var(--a-player-bar-button-hg-bg); diff --git a/aircox/static/aircox/css/public.css b/aircox/static/aircox/css/public.css index 4c2a526..2b46f67 100644 --- a/aircox/static/aircox/css/public.css +++ b/aircox/static/aircox/css/public.css @@ -491,7 +491,6 @@ preview-header:not(.no-cover) .card-headings .heading, preview-header:not(.no-co padding: 0.4rem !important; min-width: calc(var(--a-player-bar-height) + 0.8rem); border-radius: 0px; - transition: background-color 0.5s; } .a-player-bar .button.open { background-color: var(--a-player-bar-button-hg-bg); @@ -7323,6 +7322,9 @@ a.tag:hover { margin: 0.6rem; margin-left: 0rem; } +.schedule .heading { + padding: 0em; +} .schedule .day { font-weight: 700; margin-right: 0.6rem; @@ -7671,7 +7673,11 @@ nav li a, nav li .button { margin-bottom: 2rem; } +.list-item.logs .track { + margin-right: 0.6rem; +} .list-item.logs .track .icon { + margin-right: 0.4rem; color: var(--secondary-color-dark); } .list-item:nth-child(3n):not(.wide) { diff --git a/aircox/templates/aircox/widgets/player.html b/aircox/templates/aircox/widgets/player.html index b0a80b9..0633a41 100644 --- a/aircox/templates/aircox/widgets/player.html +++ b/aircox/templates/aircox/widgets/player.html @@ -30,7 +30,9 @@ The audio player

- ♬ + + + [[ current.data.title ]] — [[ current.data.artist ]] diff --git a/aircox/views/home.py b/aircox/views/home.py index 85fc4c1..0b4939d 100644 --- a/aircox/views/home.py +++ b/aircox/views/home.py @@ -32,7 +32,9 @@ class HomeView(AttachedToMixin, BaseView, ListView): logs = logs.after(min_date) else: logs = logs.date(today) - return Log.merge_diffusions(logs, object_list, diff_count=self.related_count, log_slice=20, group_logs=True) + return Log.merge_diffusions( + logs, object_list, diff_count=self.related_count, count=self.related_count + 2, group_logs=True + ) def get_next_diffs(self): now = tz.now() diff --git a/assets/src/assets/components.scss b/assets/src/assets/components.scss index 49b1107..e8d24ed 100644 --- a/assets/src/assets/components.scss +++ b/assets/src/assets/components.scss @@ -674,7 +674,6 @@ padding: v.$mp-2 !important; min-width: calc(var(--a-player-bar-height) + v.$mp-2 * 2); border-radius: 0px; - transition: background-color 0.5s; &.open { background-color: var(--a-player-bar-button-hg-bg); diff --git a/assets/src/assets/public.scss b/assets/src/assets/public.scss index 5f6277a..bd733c3 100644 --- a/assets/src/assets/public.scss +++ b/assets/src/assets/public.scss @@ -55,6 +55,10 @@ margin: v.$mp-3; margin-left: 0rem; + .heading { + padding: 0em; + } + .day { font-weight: v.$weight-bold; margin-right: v.$mp-3; @@ -407,8 +411,12 @@ nav li { // ---- ---- list .list-item { &.logs { - .track .icon { - color: var(--secondary-color-dark); + .track { + margin-right: v.$mp-3; + .icon { + margin-right: v.$mp-2; + color: var(--secondary-color-dark); + } } }