Fix Modal Close Button (#5564)

* Fix Modal Close Button

* Update CHANGELOG.md

* Update CHANGELOG_DEV.md

Co-authored-by: Lucas Bartholemy <luke-@users.noreply.github.com>
This commit is contained in:
s-tyshchenko 2022-02-17 12:30:32 +02:00 committed by GitHub
parent 7c11e4579e
commit 3e9be9b007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View File

@ -19,3 +19,4 @@
- Fix #5549: Topic icon is missing in TopicPicker search
- Fix #5556: Formatted output for date fields in "About me" profile area.
- Fix #5553: Cannot have two or more users without email when emailRequired is disabled.
- Fix #5564: Close modal button doesn't work after form validation

View File

@ -43,7 +43,7 @@ if ($linkOutput == 'button') {
<div class="modal-dialog modal-dialog-extra-small animated pulse">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-action-click="ui.modal.unload">&times;</button>
<h4 class="modal-title" id="myModalLabel"><?= $title; ?></h4>
</div>
<div class="modal-body text-center">

View File

@ -12,7 +12,7 @@ use humhub\widgets\LoaderWidget;
<?php if ($header !== null || $showClose): ?>
<div class="modal-header">
<?php if ($showClose): ?>
<button aria-hidden="true" data-dismiss="modal" class="close" type="button">×</button>
<button aria-hidden="true" data-dismiss="modal" class="close" type="button" data-action-click="ui.modal.unload">×</button>
<?php endif; ?>
<?php if ($header !== null): ?>
<h4 class="modal-title"><?= $header ?></h4>
@ -36,7 +36,7 @@ use humhub\widgets\LoaderWidget;
<!-- Footer -->
<?php if ($footer !== null): ?>
<div class="modal-footer">
<?= $footer ?>
<?= $footer ?>
</div>
<?php endif; ?>
<?php endif; ?>