Skip to content

Commit

Permalink
Modals Unification Mail - P1 Buttons
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mbumpalumpa committed Jul 25, 2024
1 parent 859ed51 commit ed73e54
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion module.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"messenger",
"communication"
],
"version": "3.2.2",
"version": "3.2.3",
"humhub": {
"minVersion": "1.16"
},
Expand Down
2 changes: 1 addition & 1 deletion views/mail/create.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 3 additions & 1 deletion views/mail/editEntry.php
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
4 changes: 3 additions & 1 deletion views/tag/editConversationTagsModal.php
Original file line number Diff line number Diff line change
Expand Up @@ -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() ?>

0 comments on commit ed73e54

Please sign in to comment.