From ffd5b5b01303ae92106af521cee2a31121dc74ee Mon Sep 17 00:00:00 2001 From: bkfox Date: Sun, 7 Aug 2022 12:55:03 +0200 Subject: [PATCH 1/3] update home page + sidebar items sizing --- aircox/static/aircox/css/chunk-common.css | 3 -- aircox/templates/aircox/base.html | 4 +- aircox/templates/aircox/diffusion_list.html | 17 +------ aircox/templates/aircox/home.html | 31 ++++++------- .../aircox/widgets/basepage_item.html | 6 +++ .../aircox/widgets/diffusion_list.html | 22 +++++++++ aircox/views/home.py | 45 ++++++++++--------- assets/src/assets/styles.scss | 4 -- 8 files changed, 69 insertions(+), 63 deletions(-) create mode 100644 aircox/templates/aircox/widgets/diffusion_list.html diff --git a/aircox/static/aircox/css/chunk-common.css b/aircox/static/aircox/css/chunk-common.css index b64b142..7f08932 100644 --- a/aircox/static/aircox/css/chunk-common.css +++ b/aircox/static/aircox/css/chunk-common.css @@ -10883,9 +10883,6 @@ main .cover.is-tiny { aside > section { margin-bottom: 2em; } -aside .cover { - margin-bottom: 2em; -} aside .cover.is-small { width: 10em; } diff --git a/aircox/templates/aircox/base.html b/aircox/templates/aircox/base.html index ea5d99a..91b17ee 100644 --- a/aircox/templates/aircox/base.html +++ b/aircox/templates/aircox/base.html @@ -132,10 +132,11 @@ Usefull context: {# FIXME: block cover into sidebar one #} {% block cover %} {% if page and page.cover %} - + {% endif %} {% endblock %} + {% with is_thin=True %} {% block sidebar %} {% if sidebar_object_list %} {% with object_list=sidebar_object_list %} @@ -152,6 +153,7 @@ Usefull context: {% endif %} {% endblock %} + {% endwith %} {% endif %} diff --git a/aircox/templates/aircox/diffusion_list.html b/aircox/templates/aircox/diffusion_list.html index 9863fa4..565caaf 100644 --- a/aircox/templates/aircox/diffusion_list.html +++ b/aircox/templates/aircox/diffusion_list.html @@ -23,22 +23,7 @@ {% block pages_list %} {% with hide_schedule=True %}
-
- {% for diffusion in object_list %} -
-
- -
-
- {% with diffusion.episode as object %} - {% include "aircox/widgets/episode_item.html" %} - {% endwith %} -
-
- {% endfor %} -
+ {% include 'aircox/widgets/diffusion_list.html' %}
{% endwith %} {% endblock %} diff --git a/aircox/templates/aircox/home.html b/aircox/templates/aircox/home.html index 307091b..8f73904 100644 --- a/aircox/templates/aircox/home.html +++ b/aircox/templates/aircox/home.html @@ -14,10 +14,10 @@ {% block pages_list %} {% if page and page.content %}
{% endif %} -{% if top_diffs %} +{% if next_diffs %}
{% with render_card=True %} - {% for object in top_diffs %} + {% for object in next_diffs %} {% with is_primary=object.is_now %}

@@ -40,16 +40,16 @@ {% endfor %} {% endwith %}

-
{% endif %} -

{% translate "Last publications" %}

-{% with has_headline=True %} -{{ block.super }} -{% endwith %} +{% if object_list %} +

{% translate "Today" %}

+
+ {% include 'aircox/widgets/diffusion_list.html' %} +
+{% endif %} {% endblock %} - {% block pagination %}