From 0974480d8c4ea24409ab0a0699427fc1d4b257af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Thu, 21 Dec 2023 10:40:01 +0100
Subject: [PATCH] nicer crossroad page design
---
main/models.py | 2 --
.../includes/molecules/boxes/card_box_block.html | 2 +-
.../boxes/card_box_with_headline_block.html | 6 ++----
main/templates/main/main_crossroad_page.html | 12 ++++++------
main/templates/main/main_people_page.html | 16 ++++++++--------
5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/main/models.py b/main/models.py
index 066a5c35..75891673 100644
--- a/main/models.py
+++ b/main/models.py
@@ -715,7 +715,6 @@ class MainPeoplePage(ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin,
subpage_types = [
"main.MainPersonPage",
"main.MainSimplePage",
- "main.MainCrossroadPage",
]
### OTHERS
@@ -962,7 +961,6 @@ class MainCrossroadPage(
parent_page_types = [
"main.MainHomePage",
"main.MainCrossroadPage",
- "main.MainPeoplePage",
]
subpage_types = [
"main.MainSimplePage",
diff --git a/main/templates/main/includes/molecules/boxes/card_box_block.html b/main/templates/main/includes/molecules/boxes/card_box_block.html
index 60e92843..07dc2b5e 100644
--- a/main/templates/main/includes/molecules/boxes/card_box_block.html
+++ b/main/templates/main/includes/molecules/boxes/card_box_block.html
@@ -3,4 +3,4 @@
{% image self.image fill-512x512 as image %}
{% firstof self.page.url self.link as url %}
-{% include 'main/includes/molecules/boxes/card_box.html' with url=url image=image header=self.title text=self.content description_classes="!bg-grey-180" classes="drop-shadow" %}
+{% include 'main/includes/molecules/boxes/card_box.html' with url=url image=image header=self.title content=self.text description_classes="!bg-grey-180" classes="drop-shadow" %}
diff --git a/main/templates/main/includes/molecules/boxes/card_box_with_headline_block.html b/main/templates/main/includes/molecules/boxes/card_box_with_headline_block.html
index 653a363f..f440c098 100644
--- a/main/templates/main/includes/molecules/boxes/card_box_with_headline_block.html
+++ b/main/templates/main/includes/molecules/boxes/card_box_with_headline_block.html
@@ -4,10 +4,8 @@
<h2 class="head-6xl mt-5 mb-5">{{ self.headline }}</h2>
{% endif %}
-<ul class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-8">
+<ul class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-8">
{% for card_block in self.card_items %}
- <li>
- {% include_block card_block %}
- </li>
+ {% include_block card_block %}
{% endfor %}
</ul>
diff --git a/main/templates/main/main_crossroad_page.html b/main/templates/main/main_crossroad_page.html
index cbe0e47d..114aed54 100644
--- a/main/templates/main/main_crossroad_page.html
+++ b/main/templates/main/main_crossroad_page.html
@@ -7,17 +7,17 @@
<main role="main" class="mb-10 xl:mb-32">
<div class="mb-2 lg:mb-12 container--wide">
- <div class="grid-full">
+ <div class="flex flex-col gap-16">
{% for headlined_card_block in page.headlined_cards_content %}
- {% include_block headlined_card_block %}
+ <div>
+ {% include_block headlined_card_block %}
+ </div>
{% endfor %}
{% if page.cards_content|length != 0 %}
- <ul class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
+ <ul class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-8">
{% for card_block in page.cards_content %}
- <li>
- {% include_block card_block %}
- </li>
+ {% include_block card_block %}
{% endfor %}
</ul>
{% endif %}
diff --git a/main/templates/main/main_people_page.html b/main/templates/main/main_people_page.html
index 13f68f07..50fd77dc 100644
--- a/main/templates/main/main_people_page.html
+++ b/main/templates/main/main_people_page.html
@@ -39,18 +39,18 @@
<template v-if="isCurrentView('{{ block.value.slug }}-{{ forloop.counter }}')">
{% for team in block.value.team_list %}
- {% if team.value.headline %}
- <h2 class="head-6xl mt-5 mb-5">{{ team.value.headline }}</h2>
+ {% if team.headline %}
+ <h2 class="head-6xl mt-5 mb-5">{{ team.headline }}</h2>
{% endif %}
- <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-8">
- {% for card in team.value.card_items %}
- {% image card.value.image max-512 as card_image %}
- {% firstof card.value.page.url card.value.link as card_url %}
+ <ul class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 content-stretch gap-8">
+ {% for card in team.card_items %}
+ {% image card.image max-512x512 as card_image %}
+ {% firstof card.page.url card.link as card_url %}
- {% include 'main/includes/molecules/boxes/card_box.html' with image=card_image header=card.value.title content=card.value.txt url=card_url %}
+ {% include 'main/includes/molecules/boxes/card_box.html' with image=card_image header=card.title content=card.text url=card_url description_classes='!bg-grey-180' %}
{% endfor %}
- </div>
+ </ul>
{% endfor %}
</template>
{% endif %}
--
GitLab