Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modals Unification Mail - P1 Buttons #411

Merged
merged 3 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 #411: Standardization of Modal Button Positions

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() ?>
Loading