Merge pull request #1912 from digitalfabrik/bugfix/page-permissions

Fix alignment of page permission button

CHANGELOG.md

@@ -2,6 +2,9 @@ UNRELEASED
 ----------
 
 * [ [#1886](https://github.com/digitalfabrik/integreat-cms/issues/1886) ] Fix push notification character counter
+* [ [#1912](https://github.com/digitalfabrik/integreat-cms/issues/1912) ] Fix alignment of page permission button
+* [ [#1892](https://github.com/digitalfabrik/integreat-cms/issues/1892) ] Fix copy short url button in page tree
+* [ [#1890](https://github.com/digitalfabrik/integreat-cms/issues/1890) ] Add hint about icon aspect ratio to location form
 
 
 2022.11.4

integreat_cms/cms/fixtures/test_data.json

@@ -217,6 +217,7 @@
       "chat_enabled": true,
       "push_notifications_enabled": true,
       "short_urls_enabled": true,
+      "page_permissions_enabled": true,
       "latitude": 48.36882,
       "longitude": 10.8958715,
       "latitude_min": 48.2581444,
@@ -248,6 +249,7 @@
       "chat_enabled": true,
       "push_notifications_enabled": true,
       "short_urls_enabled": true,
+      "page_permissions_enabled": true,
       "latitude": 49.455288,
       "longitude": 11.0766198,
       "postal_code": "90403",

integreat_cms/cms/templates/pages/_page_permission_table.html

@@ -35,7 +35,7 @@
         <span class="inline-block rounded-full py-2 px-4 mx-2 my-1 bg-blue-500 text-white text-xl"
               title="{{ user.username }}">
             {{ user.full_user_name }}
-            <a class="revoke-page-permission inline-block align-middle hover:text-red-500"
+            <a class="revoke-page-permission inline-block hover:text-red-500"
                href="{% url 'revoke_page_permission_ajax' region_slug=request.region.slug %}"
                data-user-id="{{ user.id }}"
                data-page-id="{{ page.id }}"
@@ -48,12 +48,12 @@
 </div>
 <div class="w-full flex flex-wrap mt-2">
     {% render_field page_form.editors %}
-    <a class="grant-page-permission bg-blue-500 hover:bg-blue-600 text-white font-bold py-3 px-4 mt-2 rounded w-full"
-       data-url="{% url 'grant_page_permission_ajax' region_slug=request.region.slug %}"
-       data-page-id="{{ page.id }}"
-       data-permission="edit">
+    <button class="btn grant-page-permission mt-2 w-full"
+            data-url="{% url 'grant_page_permission_ajax' region_slug=request.region.slug %}"
+            data-page-id="{{ page.id }}"
+            data-permission="edit">
         <i icon-name="plus-circle" class="mr-2"></i> {% translate "Add to authors" %}
-    </a>
+    </button>
 </div>
 <label for="{{ page_form.publishers.id_for_label }}" class="secondary">{{ page_form.publishers.label }}</label>
 <div class="help-text">{{ page_form.publishers.help_text }}</div>
@@ -62,7 +62,7 @@
         <span class="inline-block rounded-full py-2 px-4 mx-2 my-1 bg-blue-500 text-white text-xl"
               title="{{ user.username }}">
             {{ user.full_user_name }}
-            <a class="revoke-page-permission inline-block align-middle hover:text-red-500"
+            <a class="revoke-page-permission inline-block hover:text-red-500"
                href="{% url 'revoke_page_permission_ajax' region_slug=request.region.slug %}"
                data-user-id="{{ user.id }}"
                data-page-id="{{ page.id }}"
@@ -75,7 +75,7 @@
 </div>
 <div class="w-full flex flex-wrap mt-2">
     {% render_field page_form.publishers %}
-    <button class="btn grant-page-permission bg-blue-500 hover:bg-blue-600 text-white font-bold py-3 px-4 mt-2 rounded w-full"
+    <button class="btn grant-page-permission mt-2 w-full"
             data-url="{% url 'grant_page_permission_ajax' region_slug=request.region.slug %}"
             data-page-id="{{ page.id }}"
             data-permission="publish">