From 29b4dc2de57205532a0aa699ff1b6298e99e5358 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Thu, 19 Sep 2024 11:14:59 +0200 Subject: [PATCH] radiocampus: integrate marielle design, timetable pages --- .../static/radiocampus/radiocampus.css | 20 +++- .../templates/aircox/episode_list.html | 23 ++++ radiocampus/templates/aircox/home.html | 2 +- .../templates/aircox/timetable_list.html | 105 ++++++++++++++++++ .../templates/aircox/widgets/item.html | 1 + 5 files changed, 145 insertions(+), 6 deletions(-) create mode 100644 radiocampus/templates/aircox/episode_list.html create mode 100644 radiocampus/templates/aircox/timetable_list.html diff --git a/radiocampus/static/radiocampus/radiocampus.css b/radiocampus/static/radiocampus/radiocampus.css index 5e7dd8b..652be2a 100644 --- a/radiocampus/static/radiocampus/radiocampus.css +++ b/radiocampus/static/radiocampus/radiocampus.css @@ -34,7 +34,7 @@ --nav-active-fg: white; --preview-title-sz: 21px; --text-color: #75124e; - --text-color-light: #bbb; + --text-color-light: #eee; } @font-face { @@ -147,13 +147,24 @@ a.heading.title:hover { gap: 0.2rem; } .grid.listfive .media-content { - margin-top: 0.4rem; font-size: 0.84rem; } .today { color: yellow; font-size: 1.4em !important; } +.lagrille:not(.homedisplay) article { + border-bottom: 1px solid black; +} +.lagrille .category { + color: grey; + margin-left: 10px; + vertical-align: text-bottom; + font-size: 0.8rem; +} +.lagrille:not(.homedisplay) .heading.subtitle { + color: black; +} .mt-3 { margin-top: unset !important; } @@ -163,7 +174,7 @@ a.heading.title:hover { .nav.secondary .nav-item { color: black !important; } -.nav-item:hover { +a.nav-item:hover { opacity: 0.8; } .nav.primary .nav-item { @@ -208,7 +219,6 @@ a.heading.title:hover { .radiocampus-grid article div.media div.media-content span.heading.subtitle { float: right; } - .schedule { background-color: unset; font-size: 0.9em; @@ -223,7 +233,7 @@ a.heading.title:hover { .title, .preview .title, .preview .title:not(:last-child) { text-transform: unset; font-weight: unset; - font-size: 1.2em; + font-size: 1.2rem; } @media screen and (max-width: 400px) { diff --git a/radiocampus/templates/aircox/episode_list.html b/radiocampus/templates/aircox/episode_list.html new file mode 100644 index 0000000..82c4511 --- /dev/null +++ b/radiocampus/templates/aircox/episode_list.html @@ -0,0 +1,23 @@ +{% extends "aircox/basepage_list.html" %} +{% load i18n %} + +{% block filters %} +{{ block.super }} +
+
+ +
+
+
+ +
+
+
+{% endblock %} + +{% block list-container %} +{% with list_class="list-podcasts" %} +{{ block.super }} +{% endwith %} +{% endblock %} diff --git a/radiocampus/templates/aircox/home.html b/radiocampus/templates/aircox/home.html index 353bb09..b1586c0 100644 --- a/radiocampus/templates/aircox/home.html +++ b/radiocampus/templates/aircox/home.html @@ -49,7 +49,7 @@ function display(id) { {% block list-container %}
-
+
diff --git a/radiocampus/templates/aircox/timetable_list.html b/radiocampus/templates/aircox/timetable_list.html new file mode 100644 index 0000000..83a0ad4 --- /dev/null +++ b/radiocampus/templates/aircox/timetable_list.html @@ -0,0 +1,105 @@ +{% extends "aircox/basepage_list.html" %} +{% comment %}List of diffusions as a timetable{% endcomment %} +{% load i18n aircox humanize %} + +{% block subtitle %}{{ date|date:"l d F Y" }}{% endblock %} + +{% block secondary-nav %} + +{% endblock %} + + +{% block breadcrumbs %} +{% if parent and model.list_url_name %} + {% include "./widgets/breadcrumbs.html" with page=parent %} + {{ model|verbose_name:True }} +{% elif page and model.list_url_name %} + {{ page.title }} + {% if category %} + + {{ category.title }} + + {% endif %} +{% else %} + {{ model|verbose_name:True }} + {% if category %} + + {{ category.title }} + + {% endif %} +{% endif %} +{{ date|date:"l d F Y" }} +{% endblock %} + + +{% block list-container %} +{% with list_class="grid" %} +
+
+
+{% block list %} +{% with object_list=object_list timetable=True %} +{% with widget|default:"item" as widget %} + + {% for object in object_list %} + {% if object.episode %} +
+ {% page_widget widget object.episode diffusion=object timetable=True %} +
+ {% else %} +
+
+ {% for obj in object %} + {% include "aircox/widgets/track_item.html" with object=obj.track log=obj timetable=True %} +
+ {% endfor %} +
+
+ {% endif %} + {% endfor %} + +{% endwith %} +{% endwith %} +{% endblock %} +
+
+
+{% endwith %} +{% endblock %} + + + +{% block title %} +{% if parent %}{{ parent.title }} +{% else %}{{ block.super }} +{% endif %} +{% endblock %} + + + + + +{% block header %} +{% if page and not object %} + {% with page as object %} + {{ block.super }} + {% endwith %} +{% else %} + {{ block.super }} +{% endif %} +{% endblock %} + + + + + + +{% block content-container %}{% endblock %} + + + +{% block list-pagination %} +{% include "./widgets/page_pagination.html" %} +{% endblock %} diff --git a/radiocampus/templates/aircox/widgets/item.html b/radiocampus/templates/aircox/widgets/item.html index b735e87..1928297 100644 --- a/radiocampus/templates/aircox/widgets/item.html +++ b/radiocampus/templates/aircox/widgets/item.html @@ -26,6 +26,7 @@ {% block title %}{{ title|default:"" }}{% endblock %} + {{ object.program.category }} {% block subtitle %}{{ subtitle|default:"" }}{% endblock %}