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.

Sign up for GitHub

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

Jump to bottom

fix modal dialogues opening/closing for Bootstrap5 #1091

Merged
merged 1 commit into from
Jun 11, 2024
Merged

fix modal dialogues opening/closing for Bootstrap5 #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions flexmeasures/ui/templates/admin/upload.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ <h1>Meter data</h1>
</thead>
<tbody id ="clients-table"> </tbody>
</table>
<a class="btn btn-default" href="#" role="button" data-toggle="modal" data-target="#editClientModal" id="button-add-client">
<a class="btn btn-default" href="#" role="button" data-bs-toggle="modal" data-bs-target="#editClientModal" id="button-add-client">
<span class="fa fa-plus" aria-hidden="true"></span> Add
</a>
<div class="modal fade" id="editClientModal" tabindex="-1" role="dialog" aria-labelledby="editClientModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editClientModalLabel">
Expand Down Expand Up @@ -112,8 +112,8 @@ <h4 class="modal-title" id="editClientModalLabel">
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="edit-client-form-save" data-dismiss="modal">Save</button>
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="edit-client-form-save" data-bs-dismiss="modal">Save</button>
</div>
</div>
</div>
Expand All @@ -128,8 +128,8 @@ <h4 class="modal-title text-center" id="removeClientModalLabel">Are you sure you
<form id="remove-client-form">
<input type="hidden" name="id" id="remove-client-id"/>
</form>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" id="button-remove-client" data-dismiss="modal">Remove</button>
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" id="button-remove-client" data-bs-dismiss="modal">Remove</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -187,8 +187,8 @@ <h4 class="modal-title" id="editClientDataSetModalLabel">
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="edit-client-data-set-form-save" data-dismiss="modal">Save</button>
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="edit-client-data-set-form-save" data-bs-dismiss="modal">Save</button>
</div>
</div>
</div>
Expand All @@ -209,14 +209,14 @@ <h1>Price data</h1>
</thead>
<tbody id ="markets-table"> </tbody>
</table>
<a class="btn btn-default" href="#" role="button" data-toggle="modal" data-target="#editMarketModal" id="button-add-market">
<a class="btn btn-default" href="#" role="button" data-bs-toggle="modal" data-bs-target="#editMarketModal" id="button-add-market">
<span class="fa fa-plus" aria-hidden="true"></span> Add
</a>
<div class="modal fade" id="editMarketModal" tabindex="-1" role="dialog" aria-labelledby="editMarketModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editMarketModalLabel">
Expand All @@ -242,8 +242,8 @@ <h4 class="modal-title" id="editMarketModalLabel">
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="edit-market-form-save" data-dismiss="modal">Save</button>
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="edit-market-form-save" data-bs-dismiss="modal">Save</button>
</div>
</div>
</div>
Expand All @@ -258,8 +258,8 @@ <h4 class="modal-title text-center" id="removeMarketModalLabel">Are you sure you
<form id="remove-market-form">
<input type="hidden" name="id" id="remove-market-id"/>
</form>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" id="button-remove-market" data-dismiss="modal">Remove</button>
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" id="button-remove-market" data-bs-dismiss="modal">Remove</button>
</div>
</div>
</div>
Expand All @@ -268,7 +268,7 @@ <h4 class="modal-title text-center" id="removeMarketModalLabel">Are you sure you
<div class="modal-dialog modal-lg" id="edit-market-data-set-modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editMarketDataSetModalLabel">
Expand Down Expand Up @@ -316,8 +316,8 @@ <h4 class="modal-title" id="editMarketDataSetModalLabel">
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="edit-market-data-set-form-save" data-dismiss="modal">Save</button>
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="edit-market-data-set-form-save" data-bs-dismiss="modal">Save</button>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions flexmeasures/ui/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,14 +700,14 @@
{% endblock copyright_notice %}

{% block about %}
<a href="#" data-toggle="modal" data-target="#About">About FlexMeasures</a>.
<a href="#" data-bs-toggle="modal" data-bs-target="#About">About FlexMeasures</a>.
<!-- The modal -->
<div class="modal fade" id="About" tabindex="-1" role="dialog" aria-labelledby="modalLabelLarge" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">

<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="modalLabelLarge">About FlexMeasures</h4>
Expand Down Expand Up @@ -769,15 +769,15 @@ <h4 class="modal-title" id="modalLabelLarge">About FlexMeasures</h4>
{% endblock about %}

{% block credits %}
<a href="#" data-toggle="modal" data-target="#Credits">Credits</a>.
<a href="#" data-bs-toggle="modal" data-bs-target="#Credits">Credits</a>.

<!-- The modal -->
<div class="modal fade" id="Credits" tabindex="-1" role="dialog" aria-labelledby="modalLabelLarge" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">

<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="modalLabelLarge">Credits</h4>
Expand Down
2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/rq_dashboard/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div class="modal-content">
<div class="modal-header">
<h3>Do you really want to <span id="confirmation-modal-action"></span>?</h3>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-footer">
<button type="button" id="confirmation-modal-no" class="btn">No</button>
Expand Down
Loading