From dd9d99eca21d55b0964955ab3ff6fb13fbdf944b Mon Sep 17 00:00:00 2001
From: David Venhoff <venhoff@integreat-app.de>
Date: Mon, 6 Jun 2022 17:07:35 +0200
Subject: [PATCH] Fix horizontal align of content form save buttons

---
 CHANGELOG.md                                                  | 2 ++
 integreat_cms/cms/templates/events/event_form.html            | 4 ++--
 integreat_cms/cms/templates/languages/language_form.html      | 4 ++--
 integreat_cms/cms/templates/pages/_page_order_table.html      | 2 +-
 integreat_cms/cms/templates/pages/page_form.html              | 4 ++--
 integreat_cms/cms/templates/pois/poi_form.html                | 4 ++--
 .../templates/push_notifications/push_notification_form.html  | 4 ++--
 integreat_cms/cms/templates/regions/region_form.html          | 4 ++--
 integreat_cms/cms/templates/users/user_form.html              | 2 +-
 9 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 008eff4182..adefc7f883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 UNRELEASED
 ----------
 
+* [ [#1516](https://github.com/digitalfabrik/integreat-cms/issues/1516) ] Fix save buttons alignment
+
 
 2022.6.0
 --------
diff --git a/integreat_cms/cms/templates/events/event_form.html b/integreat_cms/cms/templates/events/event_form.html
index abb05de3c3..be3829bed5 100644
--- a/integreat_cms/cms/templates/events/event_form.html
+++ b/integreat_cms/cms/templates/events/event_form.html
@@ -16,7 +16,7 @@
         {% get_current_language as LANGUAGE_CODE %}
         {% get_language LANGUAGE_CODE as current_language %}
         <div class="flex flex-wrap justify-between gap-4 mb-4">
-            <h1 class="heading">
+            <h1 class="heading overflow-hidden text-ellipsis">
                 {% if event_form.instance.id %}
                     {% if event_translation_form.instance.id %}
                         {% with event_translation_form.instance.title as event_title %}
@@ -36,7 +36,7 @@ <h1 class="heading">
             </h1>
             {% if perms.cms.change_event %}
                 {% if not event_form.instance.id or not event_form.instance.archived %}
-                    <div class="flex flex-wrap gap-4">
+                    <div class="flex flex-wrap gap-4 ml-auto mr-0">
                         <button name="submit_draft" class="btn btn-gray">{% trans 'Save as draft' %}</button>
                         {% if perms.cms.publish_event %}
                             <button name="submit_public" class="btn">
diff --git a/integreat_cms/cms/templates/languages/language_form.html b/integreat_cms/cms/templates/languages/language_form.html
index a0dd8a01ca..56bf812b8a 100644
--- a/integreat_cms/cms/templates/languages/language_form.html
+++ b/integreat_cms/cms/templates/languages/language_form.html
@@ -6,7 +6,7 @@
 <form method="post" data-unsaved-warning>
     {% csrf_token %}
     <div class="flex flex-wrap mb-4 justify-between">
-        <h1 class="heading">
+        <h1 class="heading overflow-hidden text-ellipsis">
           {% if form.instance.id %}
             {% with form.instance.translated_name as translated_language_name %}
             {% blocktrans %}Edit language "{{ translated_language_name }}"{% endblocktrans %}
@@ -16,7 +16,7 @@ <h1 class="heading">
           {% endif %}
         </h1>
         {% if perms.cms.change_language %}
-            <button class="btn">{% trans 'Save' %}</button>
+            <button class="btn ml-auto mr-0">{% trans 'Save' %}</button>
         {% endif %}
     </div>
 
diff --git a/integreat_cms/cms/templates/pages/_page_order_table.html b/integreat_cms/cms/templates/pages/_page_order_table.html
index f78f5bb42f..1a83ee2aff 100644
--- a/integreat_cms/cms/templates/pages/_page_order_table.html
+++ b/integreat_cms/cms/templates/pages/_page_order_table.html
@@ -2,7 +2,7 @@
 {% load content_filters %}
 {% load page_filters %}
 <div class="table-listing">
-    <table data-activate-page-order class="w-full mt-4 rounded border border-solid border-gray-200 shadow bg-white table-auto cursor-default">
+    <table data-activate-page-order class="w-full mt-4 rounded border border-solid border-gray-200 shadow bg-white table-auto cursor-default break-all">
         <tbody>
             {% for sibling in siblings %}
                 {% if sibling == page %}
diff --git a/integreat_cms/cms/templates/pages/page_form.html b/integreat_cms/cms/templates/pages/page_form.html
index 0ff5d94c2c..28f98bdd6e 100644
--- a/integreat_cms/cms/templates/pages/page_form.html
+++ b/integreat_cms/cms/templates/pages/page_form.html
@@ -18,7 +18,7 @@
           data-unsaved-warning>
         {% csrf_token %}
         <div class="w-full flex flex-wrap justify-between mb-6">
-            <h1 class="heading">
+            <h1 class="heading overflow-hidden text-ellipsis">
                 {% if page %}
                     {% if page_translation_form.instance.id %}
                         {% with page_translation_form.instance.title as page_title %}
@@ -37,7 +37,7 @@ <h1 class="heading">
                 {% endif %}
             </h1>
             {% if not page_form.instance.id or not page_form.instance.archived %}
-                <div class="flex flex-wrap gap-4">
+                <div class="flex flex-wrap gap-4 ml-auto mr-0">
                     <button
                         name="preview_page"
                         type="button"
diff --git a/integreat_cms/cms/templates/pois/poi_form.html b/integreat_cms/cms/templates/pois/poi_form.html
index f77580b8f8..1adbca39db 100644
--- a/integreat_cms/cms/templates/pois/poi_form.html
+++ b/integreat_cms/cms/templates/pois/poi_form.html
@@ -13,7 +13,7 @@
           data-unsaved-warning>
         {% csrf_token %}
         <div class="w-full flex flex-wrap justify-between mb-4">
-            <h1 class="heading">
+            <h1 class="heading overflow-hidden text-ellipsis">
                 {% if poi_form.instance.id %}
                     {% if poi_translation_form.instance.id %}
                         {% with poi_translation_form.instance.title as poi_title %}
@@ -31,7 +31,7 @@ <h1 class="heading">
                 {% endif %}
             </h1>
             {% if not poi_form.instance.archived and perms.cms.change_poi %}
-                <div class="flex flex-wrap gap-4">
+                <div class="flex flex-wrap gap-4 ml-auto mr-0">
                     <button name="submit_draft" class="btn btn-gray">{% trans 'Save as draft' %}</button>
                     <button name="submit_public" class="btn">
                         {% if poi_translation_form.instance.status == PUBLIC %}
diff --git a/integreat_cms/cms/templates/push_notifications/push_notification_form.html b/integreat_cms/cms/templates/push_notifications/push_notification_form.html
index d71b5f807d..ddfd92010d 100644
--- a/integreat_cms/cms/templates/push_notifications/push_notification_form.html
+++ b/integreat_cms/cms/templates/push_notifications/push_notification_form.html
@@ -9,7 +9,7 @@
         {% csrf_token %}
         <div class="flex flex-wrap">
             <div class="w-full flex flex-wrap justify-between gap-4 mb-6">
-                <h1 class="heading">
+                <h1 class="heading overflow-hidden text-ellipsis">
                     {% if push_notification_form.instance.id %}
                         {% with push_notification_form.instance as push_notification_title %}
                             {% blocktrans %}Edit news message "{{ push_notification_title }}"{% endblocktrans %}
@@ -18,7 +18,7 @@ <h1 class="heading">
                         {% trans 'Create news message' %}
                     {% endif %}
                 </h1>
-                <div class="flex flex-wrap gap-4">
+                <div class="flex flex-wrap gap-4 ml-auto mr-0">
                     {% if perms.cms.change_pushnotification %}
                         <button name="submit_save" class="btn btn-gray">{% trans 'Save' %}</button>
                     {% endif %}
diff --git a/integreat_cms/cms/templates/regions/region_form.html b/integreat_cms/cms/templates/regions/region_form.html
index 164626390f..d50497c59f 100644
--- a/integreat_cms/cms/templates/regions/region_form.html
+++ b/integreat_cms/cms/templates/regions/region_form.html
@@ -8,7 +8,7 @@
 <form enctype="multipart/form-data" method="post" data-unsaved-warning>
     {% csrf_token %}
     <div class="flex flex-wrap justify-between mb-4">
-        <h1 class="heading">
+        <h1 class="heading overflow-hidden text-ellipsis">
             {% if form.initial %}
                 {% with form.name.value as region_name %}
                     {% blocktrans %}Edit region "{{ region_name }}"{% endblocktrans %}
@@ -18,7 +18,7 @@ <h1 class="heading">
             {% endif %}
         </h1>
         {% if perms.cms.change_region %}
-            <button class="btn">{% trans 'Save' %}</button>
+            <button class="btn ml-auto mr-0">{% trans 'Save' %}</button>
         {% endif %}
     </div>
 
diff --git a/integreat_cms/cms/templates/users/user_form.html b/integreat_cms/cms/templates/users/user_form.html
index 0b0aa07253..f9f9806cf3 100644
--- a/integreat_cms/cms/templates/users/user_form.html
+++ b/integreat_cms/cms/templates/users/user_form.html
@@ -6,7 +6,7 @@
 <form method="post" data-unsaved-warning>
     {% csrf_token %}
     <div class="flex justify-between mb-4">
-        <h1 class="heading">
+        <h1 class="heading overflow-hidden text-ellipsis">
             {% if user_form.instance.id %}
                 {% with user_form.username.value as user_name %}
                     {% blocktrans %}Edit user "{{ user_name }}"{% endblocktrans %}