Skip to content

Commit

Permalink
Merge branch 'main' into 1077-merge-job-status
Browse files Browse the repository at this point in the history
  • Loading branch information
@nhoening
nhoening committed Jun 11, 2024
2 parents 81abd38 + 1d7b6ca commit f2446e2
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 44 deletions.
9 changes: 0 additions & 9 deletions flexmeasures/ui/static/css/flexmeasures.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,15 +1026,6 @@ body .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover {
z-index: 999992 !important;
}

.close:focus, .close:hover {
color: var(--red);
transition: .3s;
-webkit-transition: .3s;
-moz-transition: .3s;
-ms-transition: .3s;
-o-transition: .3s;
}

/* ---- End Modal ---- */


Expand Down
44 changes: 18 additions & 26 deletions flexmeasures/ui/templates/admin/upload.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,18 @@ <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">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editClientModalLabel">
<span id="add-client-header">Add a client</span>
<span id="edit-client-header">Edit <span id="edit-client-name-header"> </span></span>
</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form id="edit-client-form" enctype="multipart/form-data" class="form-horizontal">
Expand Down Expand Up @@ -112,8 +110,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 +126,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 All @@ -138,12 +136,10 @@ <h4 class="modal-title text-center" id="removeClientModalLabel">Are you sure you
<div class="modal-dialog modal-lg" id="edit-client-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">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editClientDataSetModalLabel">
<span id="edit-client-data-set-name-header"> </span> for <span id="edit-client-data-set-owner-header"> </span>
</h4>
<button type="button" class="btn-close" data-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div id="client-data-set-plot" class="data-set-plot edit-data-set-hideable"> </div>
Expand Down Expand Up @@ -187,8 +183,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,20 +205,18 @@ <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">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editMarketModalLabel">
<span id="add-market-header">Add a market</span>
<span id="edit-market-header">Edit market &ldquo;<span id="edit-market-name-header"> </span>&rdquo;</span>
</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form id="edit-market-form" enctype="multipart/form-data" class="form-horizontal">
Expand All @@ -242,8 +236,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 +252,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,12 +262,10 @@ <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">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editMarketDataSetModalLabel">
<span id="edit-market-data-set-name-header"> </span> for <span id="edit-market-data-set-owner-header"> </span>
</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div id="market-data-set-plot" class="data-set-plot edit-data-set-hideable"> </div>
Expand Down Expand Up @@ -316,8 +308,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
12 changes: 4 additions & 8 deletions flexmeasures/ui/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,17 +700,15 @@
{% 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">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="modalLabelLarge">About FlexMeasures</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>

<div class="modal-body">
Expand Down Expand Up @@ -769,18 +767,16 @@ <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">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="modalLabelLarge">Credits</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>

<div class="modal-body">
Expand Down
2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/rq_dashboard/base.html
View file
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="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
</div>
<div class="modal-footer">
<button type="button" id="confirmation-modal-no" class="btn">No</button>
Expand Down

0 comments on commit f2446e2

Please sign in to comment.