From deffe6f1229ae88bc13dbc763930f1a4160ca143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Thu, 23 May 2024 16:10:36 +0200
Subject: [PATCH] migrate district-specific blocks
---
district/blocks.py | 4 ++--
district/templates/district/blocks/chart.html | 4 ++--
.../articles/article_timeline_preview.html | 8 ++++---
.../articles/article_title_preview.html | 23 +++++++++++++++++++
.../articles/article_links_block.html | 7 ++++++
.../articles/article_list_block.html | 7 ++++++
6 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 shared/templates/styleguide2/includes/molecules/articles/article_title_preview.html
create mode 100644 shared/templates/styleguide2/includes/organisms/articles/article_links_block.html
create mode 100644 shared/templates/styleguide2/includes/organisms/articles/article_list_block.html
diff --git a/district/blocks.py b/district/blocks.py
index e92cd4d4..639476e1 100644
--- a/district/blocks.py
+++ b/district/blocks.py
@@ -517,7 +517,7 @@ class ArticlesBlock(StructBlock):
)
class Meta:
- template = "district/blocks/articles_block.html"
+ template = "styleguide2/includes/organisms/articles/article_list_block.html"
icon = "list-ul"
label = "Blok aktualit"
@@ -532,6 +532,6 @@ class ArticleLinksBlock(StructBlock):
)
class Meta:
- template = "district/blocks/article_links_block.html"
+ template = "styleguide2/includes/organisms/articles/article_links_block.html"
icon = "list-ul"
label = "Seznam nadpisů článků"
diff --git a/district/templates/district/blocks/chart.html b/district/templates/district/blocks/chart.html
index fb0eda2c..a5f06870 100644
--- a/district/templates/district/blocks/chart.html
+++ b/district/templates/district/blocks/chart.html
@@ -6,8 +6,8 @@
<div class="py-4">
<canvas
class="lg:h-120 lg:w-auto w-full mx-auto"
- id="{{ block_id }}"
+ id="{{ block.id }}"
></canvas>
</div>
-{% include "shared/chart_script_snippet.html" with value=value block_id=block_id %}
+{% include "shared/chart_script_snippet.html" with value=value block_id=block.id %}
diff --git a/shared/templates/styleguide2/includes/molecules/articles/article_timeline_preview.html b/shared/templates/styleguide2/includes/molecules/articles/article_timeline_preview.html
index 4d51ba64..daf1d032 100644
--- a/shared/templates/styleguide2/includes/molecules/articles/article_timeline_preview.html
+++ b/shared/templates/styleguide2/includes/molecules/articles/article_timeline_preview.html
@@ -26,9 +26,11 @@
<h2 class="font-alt text-4xl">{{ article.title }}</h2>
</a>
- <div class="mb-6">
- {% include 'styleguide2/includes/molecules/tags/inline_tags.html' with tags=article.get_tags tags_are_selectable=True %}
- </div>
+ {% if article.tags %}
+ <div class="mb-6">
+ {% include 'styleguide2/includes/molecules/tags/inline_tags.html' with tags=article.get_tags tags_are_selectable=True %}
+ </div>
+ {% endif %}
<div class="flex flex-col justify-between h-full">
<p class="mb-8 text-lg">
diff --git a/shared/templates/styleguide2/includes/molecules/articles/article_title_preview.html b/shared/templates/styleguide2/includes/molecules/articles/article_title_preview.html
new file mode 100644
index 00000000..f9733e45
--- /dev/null
+++ b/shared/templates/styleguide2/includes/molecules/articles/article_title_preview.html
@@ -0,0 +1,23 @@
+<div
+ class="
+ flex flex-col bg-grey-180 drop-shadow
+
+ {{ classes }}
+ "
+>
+ <div class="flex flex-col px-8 pb-6 pt-6 h-full">
+ <div class="text-xl text-grey-350 mb-2">
+ {{ article.date }}
+ </div>
+
+ <a href="{{ article.url }}" class="underline-offset-4">
+ <h2 class="font-alt text-4xl">{{ article.title }}</h2>
+ </a>
+
+ {% if article.get_tags %}
+ <div class="mt-2">
+ {% include 'styleguide2/includes/molecules/tags/inline_tags.html' with tags=article.get_tags tags_are_selectable=True %}
+ </div>
+ {% endif %}
+ </div>
+</div>
diff --git a/shared/templates/styleguide2/includes/organisms/articles/article_links_block.html b/shared/templates/styleguide2/includes/organisms/articles/article_links_block.html
new file mode 100644
index 00000000..aeb85444
--- /dev/null
+++ b/shared/templates/styleguide2/includes/organisms/articles/article_links_block.html
@@ -0,0 +1,7 @@
+{% if self.articles|length != 0 %}
+ <div class="grid grid-cols-1 md:grid-cols-2 gap-12">
+ {% for article in self.articles %}
+ {% include 'styleguide2/includes/molecules/articles/article_title_preview.html' %}
+ {% endfor %}
+ </div>
+{% endif %}
diff --git a/shared/templates/styleguide2/includes/organisms/articles/article_list_block.html b/shared/templates/styleguide2/includes/organisms/articles/article_list_block.html
new file mode 100644
index 00000000..4c170e7d
--- /dev/null
+++ b/shared/templates/styleguide2/includes/organisms/articles/article_list_block.html
@@ -0,0 +1,7 @@
+{% if self.articles|length != 0 %}
+ <div class="grid grid-cols-1 md:grid-cols-2 gap-12">
+ {% for article in self.articles %}
+ {% include 'styleguide2/includes/molecules/articles/article_timeline_preview.html' %}
+ {% endfor %}
+ </div>
+{% endif %}
--
GitLab