Add django-datashow with CMS app and template overrides

okfde · Jan 24, 2025 · f4cd92b · f4cd92b
1 parent 7042433
commit f4cd92b
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 0 deletions.
diff --git a/fragdenstaat_de/fds_cms/cms_apps.py b/fragdenstaat_de/fds_cms/cms_apps.py
@@ -60,3 +60,12 @@ class FdsCmsPlainAPIApp(CMSApp):
 
     def get_urls(self, page=None, language=None, **kwargs):
         return ["fragdenstaat_de.fds_cms.urls_plainapi"]
+
+
+@apphook_pool.register
+class DatashowCMSApp(CMSApp):
+    name = "Datashow CMS App"
+    app_name = "datashow"
+
+    def get_urls(self, page=None, language=None, **kwargs):
+        return ["datashow.urls"]
diff --git a/fragdenstaat_de/settings/base.py b/fragdenstaat_de/settings/base.py
@@ -86,6 +86,7 @@ def INSTALLED_APPS(self):
                 # Additional CMS plugins
                 "sortabletable",
                 "contractor",
+                "datashow",
                 "djcelery_email",
                 "django.contrib.redirects",
                 "django_prices",

diff --git a/fragdenstaat_de/templates/datashow/_filterform.html b/fragdenstaat_de/templates/datashow/_filterform.html
@@ -0,0 +1,2 @@
+{% load i18n form_helper %}
+{% render_form form %}
diff --git a/fragdenstaat_de/templates/datashow/base.html b/fragdenstaat_de/templates/datashow/base.html
@@ -0,0 +1,56 @@
+{% extends "base.html" %}
+{% load static i18n %}
+{% load cms_tags %}
+{% block css %}
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static 'datashow/css/datashow.css' %}">
+{% endblock %}
+{% block body %}
+    <div class="text-bg-secondary mb-3">
+        <nav class="container-md" aria-label="breadcrumb">
+            <ol class="breadcrumb">
+                <li class="breadcrumb-item">
+                    {# djlint:off D018 #}
+                    <a href="/"> {# djlint:on #}
+                        <i class="fa fa-home"></i>
+                        <span class="sr-only">{% trans "Home Page" %}</span>
+                    </a>
+                </li>
+                <li class="breadcrumb-item">
+                    {% if dataset %}
+                        {% page_url "datasets" as datasets_url %}
+                        <a href="{{ datasets_url|default:'/daten/' }}">{% translate "Datasets" %}</a>
+                    {% else %}
+                        {% translate "Datasets" %}
+                    {% endif %}
+                </li>
+                <li class="breadcrumb-item">
+                    {% if table %}
+                        <a href="{{ dataset.get_absolute_url }}">{{ dataset.name }}</a>
+                    {% else %}
+                        {{ dataset.name }}
+                    {% endif %}
+                </li>
+                {% if table and dataset.default_table != table %}
+                    <li class="breadcrumb-item">
+                        {% if row %}
+                            <a href="{{ table.get_absolute_url }}">{{ table.label }}</a>
+                        {% else %}
+                            {{ table.label }}
+                        {% endif %}
+                    </li>
+                {% endif %}
+                {% if row %}<li class="breadcrumb-item">{{ row_label }}</li>{% endif %}
+            </ol>
+        </nav>
+    </div>
+    <div class="container mb-3">
+        {% block app_body %}
+            {% block content %}{% endblock %}
+        {% endblock %}
+    </div>
+{% endblock %}
+{% block scripts %}
+    {{ block.super }}
+    <script type="text/javascript" src="{% static 'datashow/js/htmx.min.js' %}"></script>
+{% endblock %}
diff --git a/pyproject.toml b/pyproject.toml
@@ -30,6 +30,7 @@ dependencies = [
   "django-contractor>=0.0.8",
   "django-contrib-comments>=2.2.0",
   "django-crossdomainmedia>=0.0.4",
+  "django-datashow>=0.1.0",
   "django-elasticsearch-dsl>=8.0,<9.0",
   "django-filer>=3.0.0",
   "django-filingcabinet @ git+https://github.com/okfde/django-filingcabinet.git@main",

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -155,6 +155,7 @@ django==4.2.16
     #   django-configurations
     #   django-contrib-comments
     #   django-crossdomainmedia
+    #   django-datashow
     #   django-debug-toolbar
     #   django-entangled
     #   django-filer
@@ -192,6 +193,7 @@ django==4.2.16
 django-admin-sortable2==2.2.3
     # via
     #   fragdenstaat-de (pyproject.toml)
+    #   django-datashow
     #   froide-campaign
     #   froide-govplan
 django-amenities @ git+https://github.com/okfde/django-amenities.git@c351c2d571dcf81912502919016aeba325a1605a
@@ -247,6 +249,8 @@ django-crossdomainmedia==0.0.4
     # via
     #   fragdenstaat-de (pyproject.toml)
     #   froide
+django-datashow==0.1.0
+    # via fragdenstaat-de (pyproject.toml)
 django-debug-toolbar==4.4.6
     # via fragdenstaat-de (pyproject.toml)
 django-elasticsearch-dsl==8.0
@@ -610,6 +614,7 @@ lxml-html-clean==0.2.2
 markdown==3.7
     # via
     #   fragdenstaat-de (pyproject.toml)
+    #   django-datashow
     #   django-legal-advice-builder
     #   froide
 markupsafe==2.1.5

diff --git a/requirements-production.txt b/requirements-production.txt
@@ -134,6 +134,7 @@ django==4.2.16
     #   django-configurations
     #   django-contrib-comments
     #   django-crossdomainmedia
+    #   django-datashow
     #   django-entangled
     #   django-filer
     #   django-filingcabinet
@@ -170,6 +171,7 @@ django==4.2.16
 django-admin-sortable2==2.2.3
     # via
     #   fragdenstaat-de (pyproject.toml)
+    #   django-datashow
     #   froide-campaign
     #   froide-govplan
 django-amenities @ git+https://github.com/okfde/django-amenities.git@c351c2d571dcf81912502919016aeba325a1605a
@@ -223,6 +225,8 @@ django-crossdomainmedia==0.0.4
     # via
     #   fragdenstaat-de (pyproject.toml)
     #   froide
+django-datashow==0.1.0
+    # via fragdenstaat-de (pyproject.toml)
 django-elasticsearch-dsl==8.0
     # via
     #   fragdenstaat-de (pyproject.toml)
@@ -538,6 +542,7 @@ lxml-html-clean==0.2.2
 markdown==3.7
     # via
     #   fragdenstaat-de (pyproject.toml)
+    #   django-datashow
     #   django-legal-advice-builder
     #   froide
 markupsafe==2.1.5

diff --git a/requirements.txt b/requirements.txt
@@ -128,6 +128,7 @@ django==4.2.14
     #   django-configurations
     #   django-contrib-comments
     #   django-crossdomainmedia
+    #   django-datashow
     #   django-entangled
     #   django-filer
     #   django-filingcabinet
@@ -164,6 +165,7 @@ django==4.2.14
 django-admin-sortable2==2.2.1
     # via
     #   fragdenstaat-de (pyproject.toml)
+    #   django-datashow
     #   froide-campaign
     #   froide-govplan
 django-amenities @ git+https://github.com/okfde/django-amenities.git@c351c2d571dcf81912502919016aeba325a1605a
@@ -217,6 +219,8 @@ django-crossdomainmedia==0.0.4
     # via
     #   fragdenstaat-de (pyproject.toml)
     #   froide
+django-datashow==0.1.0
+    # via fragdenstaat-de (pyproject.toml)
 django-elasticsearch-dsl==8.0
     # via
     #   fragdenstaat-de (pyproject.toml)
@@ -528,6 +532,7 @@ lxml-html-clean==0.2.2
 markdown==3.7
     # via
     #   fragdenstaat-de (pyproject.toml)
+    #   django-datashow
     #   django-legal-advice-builder
     #   froide
 markupsafe==2.1.5
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% load i18n form_helper %}
		{% render_form form %}