add pre-release bugfixes and enhancements (#34)

partizipation · web-flow · commit 3b5658b3b831 · 2025-05-21T16:49:58.000+02:00
diff --git a/adhocracy-plus/assets/images/logo.png b/adhocracy-plus/assets/images/logo.png
diff --git a/adhocracy-plus/assets/images/logo.svg b/adhocracy-plus/assets/images/logo.svg
diff --git a/adhocracy-plus/config/settings/base.py b/adhocracy-plus/config/settings/base.py
@@ -442,7 +442,7 @@
 }
 
 # Wagtail
-WAGTAIL_SITE_NAME = "adhocracy+"
+WAGTAIL_SITE_NAME = "ROOTS Beteiligung"
 WAGTAILIMAGES_IMAGE_MODEL = "a4_candy_cms_images.CustomImage"
 WAGTAILDOCS_MAX_FILE_SIZE = 20 * 1024 * 1024  # 20MB
 
diff --git a/adhocracy-plus/templates/a4dashboard/communication_form_base.html b/adhocracy-plus/templates/a4dashboard/communication_form_base.html
@@ -23,13 +23,17 @@
                         {% translate "Social Media" %}
                     </a>
                 </li>
+                <li class="dashboard-nav__page">
+                    <a href="{% url 'a4dashboard:qr-create' organisation_slug=view.organisation.slug %}"
+                       class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == 'qr-create' %}is-active{% endif %}">
+                       {% translate "QR Codes erstellen" %}
+                    </a>
+                </li>
             </ul>
         </div>
     </nav>
-
-
     <div class="col-md-9">
-        {% block communication_form %}{% endblock %}
+        {% block communication_form %}{% endblock communication_form %}
     </div>
 </div>
-{% endblock %}
+{% endblock dashboard_content %}
diff --git a/adhocracy-plus/templates/email_base.html b/adhocracy-plus/templates/email_base.html
@@ -11,15 +11,9 @@
            style="width: 100%; max-width: 600px; margin: auto;">
     <tr>
             <td style="padding: 0px; position: relative; top: -4.5em;" align="center">
-                    {% if organisation and organisation.logo %}
-                    <div style="width: 100px; height: 100px; box-shadow: 0 2px 18px 0 rgba(0, 0, 0, 0.08); background-color: #ffffff;">
-                        <img src="cid:organisation_logo" height="80" width="80" alt="{{ organisation.name }} logo" style="margin: 10px;" />
-                    </div>
-                    {% else %}
-                    <div  style="width: 150px; height: 100px; box-shadow: 0 2px 18px 0 rgba(0, 0, 0, 0.08); background-color: #ffffff;">
-                        <img src="cid:logo" height="80" alt="adhocracy-plus logo" style="margin: 10px;" />
-                    </div>
-                    {% endif %}
+                <div  style="width: 150px; height: 100px; box-shadow: 0 2px 18px 0 rgba(0, 0, 0, 0.08); background-color: #ffffff;">
+                    <img src="cid:logo" height="80" alt="ROOTS logo" style="margin: 10px;" />
+                </div>
             </td>
      </tr>
       <tr>
@@ -90,8 +84,7 @@ <h3 style="color: #818181;">
           <td style="color: #818181; font-size: small; padding-top: 20px; padding-left: 5px; padding-right: 5px;">
               {% block reason %}{% endblock %}
               <p>
-                {% blocktranslate with platformname=settings.a4_candy_cms_settings.OrganisationSettings.platform_name %}{{ platformname }} is a participation platform operated by{% endblocktranslate %}<br />
-                Liquid Democracy e.V., Am Sudhaus 2, D-12053 Berlin
+                ROOTS-Beteiligung ist eine Beteiligungsplattform für Non-Profit Organisationen, die im Rahmen des <a href="https://kmi-netzwerk.org/kmi-roots/">KMI/ROOTS</a> Projektes entstanden ist und von Liquid Democracy e.V. umgesetzt wird.
               </p>
           </td>
       </tr>
diff --git a/adhocracy-plus/templates/footer.html b/adhocracy-plus/templates/footer.html
@@ -31,7 +31,7 @@
                 <nav class="navi p-0">
                     <ul class="navi__list mb-2 d-sm-flex flex-wrap">
                         <li class="navi__item footer__link">
-                          2020 Liquid Democracy
+                          2025 Liquid Democracy
                         </li>
                         {% if pages.imprint %}
                         <li class="navi__item footer__link">
diff --git a/apps/cms/settings/migrations/0008_alter_organisationsettings_platform_name.py b/apps/cms/settings/migrations/0008_alter_organisationsettings_platform_name.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.18 on 2025-05-21 13:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("a4_candy_cms_settings", "0007_importantpages_registration"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="organisationsettings",
+            name="platform_name",
+            field=models.CharField(
+                default="ROOTS Beteiligung",
+                help_text="This name appears in the footer of all pages and e-mails as well as in the tab of the browser.",
+                max_length=20,
+                verbose_name="Platform name",
+            ),
+        ),
+    ]
diff --git a/apps/cms/settings/models.py b/apps/cms/settings/models.py
@@ -137,7 +137,7 @@ class ImportantPages(BaseSiteSetting):
 class OrganisationSettings(BaseSiteSetting):
     platform_name = models.CharField(
         max_length=20,
-        default="adhocracy+",
+        default="ROOTS Beteiligung",
         verbose_name="Platform name",
         help_text=(
             "This name appears in the footer of all pages and e-mails "
diff --git a/apps/dashboard/urls.py b/apps/dashboard/urls.py
@@ -58,6 +58,11 @@
         organisation_views.DashboardCommunicationContentCreateView.as_view(),
         name="communication-content-create",
     ),
+    path(
+        "communication/content/qr-codes-create/",
+        organisation_views.DashboardCommunicationQRCreateView.as_view(),
+        name="qr-create",
+    ),
 ]
 
 # a4 dashboard urls without organisation slug
diff --git a/apps/learning_nuggets/migrations/0005_alter_learningcategory_permission_level.py b/apps/learning_nuggets/migrations/0005_alter_learningcategory_permission_level.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.18 on 2025-05-20 15:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("a4_candy_learning_nuggets", "0004_alter_learningnuggetpage_content"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="learningcategory",
+            name="permission_level",
+            field=models.CharField(
+                choices=[
+                    ("participant", "Teilnehmer"),
+                    ("initiator", "Initiator"),
+                    ("moderator", "Moderator"),
+                ],
+                default="participant",
+                max_length=50,
+            ),
+        ),
+    ]
diff --git a/apps/learning_nuggets/models.py b/apps/learning_nuggets/models.py
@@ -4,10 +4,10 @@
 from django.utils.text import slugify
 from wagtail.admin.panels import FieldPanel
 from wagtail.fields import StreamField
+from wagtail.models import Orderable
 from wagtail.models import Page
 from wagtail.search import index
 from wagtail.snippets.models import register_snippet
-from wagtail.models import Orderable
 
 from .blocks import LearningContentBlock
 
@@ -20,7 +20,7 @@ class LearningCategory(models.Model):
     permission_level = models.CharField(
         max_length=50,
         choices=[
-            ("participant", "Participant"),
+            ("participant", "Teilnehmer"),
             ("initiator", "Initiator"),
             ("moderator", "Moderator"),
         ],
@@ -58,7 +58,7 @@ def save(self, update_fields=None, *args, **kwargs):
         super().save(update_fields=update_fields, *args, **kwargs)
 
     def ordered_nuggets(self):
-        return self.nuggets.all().order_by('order')
+        return self.nuggets.all().order_by("order")
 
     def __str__(self):
         return self.name
@@ -114,7 +114,7 @@ class LearningNuggetPage(Page, Orderable):
     content_panels = Page.content_panels + [
         FieldPanel("category"),
         FieldPanel("content"),
-        FieldPanel('order'),
+        FieldPanel("order"),
     ]
 
     parent_page_types = ["LearningCenterPage"]
@@ -131,4 +131,4 @@ def get_absolute_url(self):
 
     class Meta:
         verbose_name = "Learning Nugget Page"
-        ordering = ['order']
+        ordering = ["order"]
diff --git a/apps/learning_nuggets/views.py b/apps/learning_nuggets/views.py
@@ -1,4 +1,3 @@
-from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404
 from django.views.generic import DetailView
 from django.views.generic import ListView
@@ -90,10 +89,4 @@ def get_object(self):
             LearningNuggetPage, slug=self.kwargs["nugget_slug"], category=category
         )
 
-        permission_check = (
-            f"a4_candy_learning_nuggets.view_{category.permission_level}_content"
-        )
-        if not self.request.user.has_perm(permission_check):
-            raise PermissionDenied
-
         return nugget
diff --git a/apps/organisations/forms.py b/apps/organisations/forms.py
@@ -46,7 +46,7 @@
         "description_y": 902,
         "img_min_width": 1080,
         "img_min_height": 760,
-        "aplus_logo_width": 70,
+        "aplus_logo_width": 75,
         "aplus_logo_height": 56,
         "aplus_logo_y": 970,
         "org_logo_y": 80,
@@ -61,7 +61,7 @@
         "description_y": 1554,
         "img_min_width": 1080,
         "img_min_height": 1278,
-        "aplus_logo_width": 360,
+        "aplus_logo_width": 117,
         "aplus_logo_height": 88,
         "aplus_logo_y": 1654,
         "org_logo_y": 1054,
@@ -76,7 +76,7 @@
         "description_y": 588,
         "img_min_width": 1104,
         "img_min_height": 482,
-        "aplus_logo_width": 196,
+        "aplus_logo_width": 64,
         "aplus_logo_height": 48,
         "aplus_logo_y": 634,
         "org_logo_y": 80,
@@ -91,7 +91,7 @@
         "description_y": 548,
         "img_min_width": 1200,
         "img_min_height": 448,
-        "aplus_logo_width": 196,
+        "aplus_logo_width": 64,
         "aplus_logo_height": 48,
         "aplus_logo_y": 602,
         "org_logo_y": 80,
diff --git a/apps/organisations/templates/a4_candy_organisations/communication_qr_create.html b/apps/organisations/templates/a4_candy_organisations/communication_qr_create.html
@@ -0,0 +1,27 @@
+{% extends "a4dashboard/communication_form_base.html" %}
+{% load i18n %}
+
+{% block title %}{% translate "Settings" %} — {{ block.super }}{% endblock title %}
+
+{% block communication_form %}
+    <div class="col-md-9">
+      <h1 class="u-first-heading">{% translate "QR Codes erstellen" %}</h1>
+
+      <div class="qr-code-info mb-4">
+          <p class="mb-2">
+              {% translate "Mit QR-Codes könnt ihr einfach und direkt auf eure Beteiligungsprojekte verlinken – z. B. auf Plakaten oder Flyern." %}
+          </p>
+          <p class="mb-2">
+              {% translate "Über dieses externe Tool der TU Chemnitz könnt ihr QR-Codes kostenlos erstellen:" %}
+              <br/>
+              <a href="https://www.tu-chemnitz.de/urz/apps/qrcode/" target="_blank">
+                  {% translate "QR-Code-Generator öffnen" %}
+              </a>
+          </p>
+          <p>
+              {% translate "Einfach Projekt-Link einfügen, Code erzeugen und für eure Öffentlichkeitsarbeit nutzen!" %}
+          </p>
+      </div>
+
+    </div>
+{% endblock communication_form %}
diff --git a/apps/organisations/views.py b/apps/organisations/views.py
@@ -129,6 +129,18 @@ def get_success_url(self):
         return self.request.path
 
 
+class DashboardCommunicationQRCreateView(
+    a4dashboard_mixins.DashboardBaseMixin, generic.TemplateView
+):
+
+    template_name = "a4_candy_organisations/communication_qr_create.html"
+    permission_required = "a4_candy_organisations.change_organisation"
+
+    def get_permission_object(self):
+        """Required by DashboardBaseMixin (rules_mixins.PermissionRequiredMixin)."""
+        return self.organisation  # Or another object for permission checks
+
+
 class DashboardCommunicationProjectChoiceView(
     a4dashboard_mixins.DashboardBaseMixin, generic.FormView
 ):
diff --git a/tests/account/test_views.py b/tests/account/test_views.py
@@ -130,8 +130,9 @@ def test_account_deletion(client, user):
     assert User.objects.count() == 0
     assert not User.objects.filter(pk=user.pk).exists()
     assert len(mail.outbox) == 1
-    assert mail.outbox[0].subject == (
-        "Confirmation: Deletion of Your Account on " "adhocracy+"
+    assert (
+        mail.outbox[0].subject
+        == "Confirmation: Deletion of Your Account on ROOTS Beteiligung"
     )
     # assert that user is redirected to homepage
     assert redirect_target(response) == "wagtail_serve"

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`# Wagtail`
`445`		`-WAGTAIL_SITE_NAME = "adhocracy+"`
	`445`	`+WAGTAIL_SITE_NAME = "ROOTS Beteiligung"`
`446`	`446`	`WAGTAILIMAGES_IMAGE_MODEL = "a4_candy_cms_images.CustomImage"`
`447`	`447`	`WAGTAILDOCS_MAX_FILE_SIZE = 20 * 1024 * 1024 # 20MB`
`448`	`448`