From ed73e54b659ba0dfc3a98effee09a4071af0727d Mon Sep 17 00:00:00 2001
From: mbumpalumpa <92554196+mbumpalumpa@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:32:30 +0200
Subject: [PATCH] Modals Unification Mail - P1 Buttons

This is a part of a larger task aimed at unifying Modals. The first step, which involves unifying button positions, has been completed to enhance the user experience.

#408 #409 #410

Issue tracker
humhub/team_tasks#336

Project
https://github.com/orgs/humhub/projects/31
---
 docs/CHANGELOG.md                       | 4 ++++
 module.json                             | 2 +-
 views/mail/create.php                   | 2 +-
 views/mail/editEntry.php                | 4 +++-
 views/tag/editConversationTagsModal.php | 4 +++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 66d42102..7efbb449 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+3.2.3 (Unreleased)
+--------------------
+- Enh #408: Implement provider for meta searching
+
 3.2.2 (July 9, 2024)
 --------------------
 - Enh #382: Implement provider for meta searching
diff --git a/module.json b/module.json
index ad941cb2..49c8deaf 100644
--- a/module.json
+++ b/module.json
@@ -8,7 +8,7 @@
     "messenger",
     "communication"
   ],
-  "version": "3.2.2",
+  "version": "3.2.3",
   "humhub": {
     "minVersion": "1.16"
   },
diff --git a/views/mail/create.php b/views/mail/create.php
index 3d6e7e82..5115567c 100644
--- a/views/mail/create.php
+++ b/views/mail/create.php
@@ -77,8 +77,8 @@
     </div>
     <div class="modal-footer">
 
-        <?= ModalButton::submitModal(Url::toCreateConversation(), Yii::t('MailModule.views_mail_create', 'Send')) ?>
         <?= ModalButton::cancel() ?>
+        <?= ModalButton::submitModal(Url::toCreateConversation(), Yii::t('MailModule.views_mail_create', 'Send')) ?>
 
     </div>
 
diff --git a/views/mail/editEntry.php b/views/mail/editEntry.php
index 75093736..2fa0bd66 100644
--- a/views/mail/editEntry.php
+++ b/views/mail/editEntry.php
@@ -59,8 +59,10 @@
     <div class="row">
         <div class="col-md-3"></div>
         <div class="col-md-6">
-            <?= Button::save(Yii::t('base', 'Save'))->submit()->action('mail.conversation.submitEditEntry')->options(['data-entry-id' => $entry->id]) ?>
+            
             <?= ModalButton::cancel() ?>
+            <?= Button::save(Yii::t('base', 'Save'))->submit()->action('mail.conversation.submitEditEntry')->options(['data-entry-id' => $entry->id]) ?>
+
         </div>
         <div class="col-md-3">
             <?= Button::danger(Yii::t('base', 'Delete'))->right()->options(['data-entry-id' => $entry->id])
diff --git a/views/tag/editConversationTagsModal.php b/views/tag/editConversationTagsModal.php
index 48e30ba8..d6f20c3a 100644
--- a/views/tag/editConversationTagsModal.php
+++ b/views/tag/editConversationTagsModal.php
@@ -24,8 +24,10 @@
             <?= $form->field($model, 'tags')->widget(ConversationTagPicker::class)->label(false) ?>
         </div>
     <div class="modal-footer">
-        <?= ModalButton::submitModal(Url::toEditConversationTags($model->message)) ?>
+        
         <?= ModalButton::cancel() ?>
+        <?= ModalButton::submitModal(Url::toEditConversationTags($model->message)) ?>
+        
     </div>
     <?php ActiveForm::end() ?>
 <?php ModalDialog::end() ?>
\ No newline at end of file