Skip to content

Updating with bootstrap 5 #564

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

Merged
MikeNeilson merged 1 commit into from
Oct 8, 2025
Merged

Updating with bootstrap 5 #564

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
53 changes: 28 additions & 25 deletions opendcs-web-client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,41 +23,44 @@ plugins {
dependencies {
implementation(libs.servlet.api)
implementation(libs.slf4j.api)
runtimeClasspath(libs.jstl)
runtimeClasspath(libs.slf4j.jdk14)

runtimeOnly("org.webjars:bootstrap:5.3.8")
runtimeOnly("org.webjars:jquery-blockui:2.70-1")
runtimeOnly("org.webjars:jquery:3.4.1")
runtimeOnly("org.webjars:datatables:2.3.2")
runtimeOnly("org.webjars:datatables-buttons:3.2.5")
runtimeOnly("org.webjars:datatables-select:2.1.0")
runtimeOnly("org.webjars:select2:4.0.13")
runtimeOnly("org.webjars:d3js:6.7.0")
runtimeOnly("org.webjars:datatables-responsive:2.2.7")
runtimeOnly("org.webjars:bootstrap-switch:3.3.4")
runtimeOnly("org.webjars:uniform:2.1.2-1")
runtimeOnly("org.webjars.npm:switchery:0.0.2") {
exclude group: "org.webjars.npm", module: "cssify"
}
runtimeOnly("org.webjars:datatables-rowreorder:1.4.1")
runtimeOnly("org.webjars:bootstrap-sidebar:0.2.2")
runtimeOnly("org.webjars:jquery-validation:1.20.0")
runtimeOnly("org.webjars:pickadate.js:3.6.4")
runtimeOnly("org.webjars:bootstrap-daterangepicker:3.1")
runtimeOnly("org.webjars:momentjs:2.30.1-1")
implementation(libs.jstl)
implementation(libs.slf4j.jdk14)

// Webjars
implementation("org.webjars:webjars-locator-core:0.59")
implementation("org.webjars:webjars-servlet-2.x:1.6")
implementation("org.webjars:jquery:3.7.1")
implementation("org.webjars:bootstrap:5.3.8")
implementation("org.webjars:momentjs:2.30.1-1")
implementation("org.webjars.npm:bootstrap-daterangepicker:3.1.0")
implementation("org.webjars:jquery-blockui:2.70-1")
implementation("org.webjars:jquery-validation:1.20.0")
implementation("org.webjars:d3js:6.7.0")

// DataTables + Bootstrap 5
implementation("org.webjars.npm:datatables.net:1.13.8")
implementation("org.webjars.npm:datatables.net-bs5:1.13.8")
implementation("org.webjars.npm:datatables.net-responsive:2.5.0")
implementation("org.webjars.npm:datatables.net-responsive-bs5:2.5.0")
implementation("org.webjars.npm:datatables.net-buttons:2.4.2")
implementation("org.webjars.npm:datatables.net-buttons-bs5:2.4.2")
implementation("org.webjars.npm:datatables.net-select:1.7.1")
implementation("org.webjars.npm:datatables.net-select-bs5:1.4.0")

runtimeOnly("org.webjars:webjars-locator-core:0.59")
runtimeOnly("org.webjars:webjars-servlet-2.x:1.6")
// Extras
implementation("org.webjars:select2:4.0.13")
implementation("org.webjars:bootstrap-switch:3.3.4")
implementation("org.webjars:uniform:2.1.2-1")
implementation("org.webjars:bootstrap-sidebar:0.2.2")
implementation("org.webjars:pickadate.js:3.6.4")

testImplementation(libs.selenium)
testImplementation(libs.junit.api)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.junit.jupiter)
}


publishing {
publications {
maven(MavenPublication) {
Expand Down
4 changes: 2 additions & 2 deletions opendcs-web-client/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@
<servlet-name>Error</servlet-name>
<url-pattern>/portal/error</url-pattern>
</servlet-mapping>

<servlet>
<servlet-name>WebjarsServlet</servlet-name>
<servlet-class>org.webjars.servlet.WebjarsServlet</servlet-class>
<load-on-startup>2</load-on-startup>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>WebjarsServlet</servlet-name>
Expand Down
15 changes: 7 additions & 8 deletions opendcs-web-client/src/main/webapp/algorithms.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="page-header-content header-elements-md-inline">
<div class="page-title d-flex">
<h4><span class="font-weight-semibold">OpenDCS</span> - Algorithms</h4>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="icon-more"></i></a>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="bi bi-three-dots-vertical"></i></a>
</div>
</div>
</div>
Expand Down Expand Up @@ -63,7 +63,7 @@
</div>
<!-- /page content -->
<!-- algorithm modal -->
<div id="modal_main" class="modal fade" tabindex="-1" data-keyboard="false" data-backdrop="static">
<div id="modal_main" class="modal fade" tabindex="-1" data-bs-keyboard="false" data-bs-backdrop="static">
<div class="modal-dialog modal-dialog-scrollable opendcs-modal-90" class_old="modal-dialog modal-xl modal-height-xl">
<div class="modal-content h-100">
<div class="modal-header bg-secondary">
Expand Down Expand Up @@ -151,19 +151,18 @@
</div>
</div>
<div class="modal-footer pt-3">
<button type="button" class="btn btn-secondary" id="cancelButton" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-secondary" id="cancelButton" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" id="saveButton">Save</button>
</div>
</div>
</div>
</div>
<!-- /algorithm modal -->
</body>
<jsp:include page="/resources/jsp/includes/decodes.jsp" />
<script src="/webjars/switchery/switchery.js"></script>
<script src="/webjars/bootstrap-switch/js/bootstrap-switch.min.js"></script>
<script src="/webjars/uniform/jquery.uniform.min.js"></script>
<script src="../resources/js/datatables/helpers.js"></script>
<jsp:include page="/resources/jsp/includes/decodes.jsp" />


<script src="../resources/js/datatables/helpers.js"></script>
<script src="../resources/js/lib/dom_utilities.js"></script>
<script src="../resources/js/lib/object_utilities.js"></script>
<script src="../resources/js/lib/date_utilities.js"></script>
Expand Down
21 changes: 10 additions & 11 deletions opendcs-web-client/src/main/webapp/computations.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="page-header-content header-elements-md-inline">
<div class="page-title d-flex">
<h4><span class="font-weight-semibold">OpenDCS</span> - Computations</h4>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="icon-more"></i></a>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="bi bi-three-dots-vertical"></i></a>
</div>
</div>
</div> <!-- /page header -->
Expand Down Expand Up @@ -44,7 +44,7 @@
</div> <!-- /main content -->
</div> <!-- /page content -->
<!-- Computation modal -->
<div id="modal_main" class="modal fade" tabindex="-1" data-keyboard="false" data-backdrop="static">
<div id="modal_main" class="modal fade" tabindex="-1" data-bs-keyboard="false" data-bs-backdrop="static">
<div class="modal-dialog modal-dialog-scrollable opendcs-modal-90" class_old="modal-dialog modal-xl modal-height-xl">
<div class="modal-content h-100">
<div class="modal-header bg-secondary">
Expand All @@ -60,9 +60,9 @@
<table class="table table-hover datatable-responsive dataTable no-footer mb-1">
<caption class="captionTitleCenter">Details
<div class="float-right">
<div class="form-check form-check-switchery"">
<div class="form-check form-switch"">
<label class="form-check-label">
<input type="checkbox" id="enabledCheckbox" class="form-check-input-switchery" data-fouc>
<input type="checkbox" id="enabledCheckbox" class="form-check-input" >
</label>
</div>
</div>
Expand Down Expand Up @@ -154,7 +154,7 @@
</div>
</div>
<div class="modal-footer pt-3">
<button type="button" class="btn btn-secondary" id="cancelButton" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-secondary" id="cancelButton" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" id="saveButton">Save</button>
</div>
</div>
Expand All @@ -163,7 +163,7 @@
</div>
<!-- /computation modal -->
<!-- Algorithm modal -->
<div id="modal_algorithm" class="modal fade" tabindex="-1" data-keyboard="false" data-backdrop="static">
<div id="modal_algorithm" class="modal fade" tabindex="-1" data-bs-keyboard="false" data-bs-backdrop="static">
<div class="modal-dialog modal-dialog-scrollable opendcs-modal-90" class_old="modal-dialog modal-xl modal-height-xl">
<div class="modal-content h-100">
<div class="modal-header bg-secondary">
Expand Down Expand Up @@ -192,18 +192,17 @@
</div>
</div>
<div class="modal-footer pt-3">
<button type="button" class="btn btn-secondary" id="cancelAlgoButton" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-secondary" id="cancelAlgoButton" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" id="submitAlgoButton">Submit</button>
</div>
</div>
</div>
</div>
<!-- /algorithm modal -->
</body>
<jsp:include page="/resources/jsp/includes/decodes.jsp" />
<script src="/webjars/switchery/switchery.js"></script>
<script src="/webjars/bootstrap-switch/js/bootstrap-switch.min.js"></script>
<script src="/webjars/uniform/jquery.uniform.min.js"></script>
<jsp:include page="/resources/jsp/includes/decodes.jsp" />


<script src="../resources/js/datatables/helpers.js"></script>
<script src="../resources/js/lib/dom_utilities.js"></script>
<script src="../resources/js/lib/object_utilities.js"></script>
Expand Down
28 changes: 10 additions & 18 deletions opendcs-web-client/src/main/webapp/configs.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="page-header-content header-elements-md-inline">
<div class="page-title d-flex">
<h4><span class="font-weight-semibold">OpenDCS</span> - Configs</h4>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="icon-more"></i></a>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="bi bi-three-dots-vertical"></i></a>
</div>
</div>
</div> <!-- /page header -->
Expand Down Expand Up @@ -55,7 +55,7 @@
</body>

<!-- Success modal -->
<div id="modal_config" class="modal fade" tabindex="-1" data-keyboard="false" data-backdrop="static">
<div id="modal_config" class="modal fade" tabindex="-1" data-bs-keyboard="false" data-bs-backdrop="static">
<div class="modal-dialog modal-dialog-scrollable opendcs-modal-90">
<div class="modal-content">
<div class="modal-header bg-secondary">
Expand Down Expand Up @@ -125,8 +125,7 @@
</div>

<div class="modal-footer">
<!--<button type="button" class="btn btn-link" data-dismiss="modal">Close</button>-->
<button type="button" class="btn btn-secondary" id="cancelConfigsModalButton" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-secondary" id="cancelConfigsModalButton" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" id="saveConfigsModalButton">Save</button>
</div>
</div>
Expand All @@ -136,7 +135,7 @@
<!-- /success modal -->

<!-- Config Sensor modal -->
<div id="modal_configsensor" class="modal fade" data-keyboard="false" data-backdrop="static">
<div id="modal_configsensor" class="modal fade" data-bs-keyboard="false" data-bs-backdrop="static">
<div class="modal-dialog modal-sm-med modal-dialog-scrollable">
<div class="modal-content h-100">
<div class="modal-header bg-secondary">
Expand Down Expand Up @@ -220,7 +219,7 @@
<label data-mediumtype="polled-tcp" class="col-form-label col-lg-3 text-right">1st Sample Time</label>
<div class="col-lg-6 input-group">
<span class="input-group-prepend">
<span class="input-group-text"><i class="icon-watch2"></i></span>
<span class="input-group-text"><i class="bi bi-clock"></i></span>
</span>
<input type="text" class="form-control" id="firstSampleTime" value="00:00:00">
</div>
Expand All @@ -230,7 +229,7 @@
<label data-mediumtype="polled-tcp" class="col-form-label col-lg-3 text-right">Sampling Interval</label>
<div class="col-lg-6 input-group">
<span class="input-group-prepend">
<span class="input-group-text"><i class="icon-watch2"></i></span>
<span class="input-group-text"><i class="bi bi-clock"></i></span>
</span>
<input type="text" class="form-control" id="samplingInterval" value="00:00:00">
</div>
Expand Down Expand Up @@ -267,7 +266,7 @@


<!-- Decoding Script modal -->
<div id="modal_decodingscript" class="modal fade" data-keyboard="false" data-backdrop="static">
<div id="modal_decodingscript" class="modal fade" data-bs-keyboard="false" data-bs-backdrop="static">
<div class="modal-dialog modal-med">
<div class="modal-content h-100">
<div class="modal-header bg-secondary">
Expand Down Expand Up @@ -340,8 +339,8 @@
<legend class="text-uppercase font-size-sm font-weight-bold">Sample Message</legend>

<ul class="nav nav-tabs">
<li class="nav-item"><a href="#lrgsTab" class="nav-link rounded-top active" data-toggle="tab">Load From LRGS</a></li>
<li class="nav-item"><a href="#fileTab" class="nav-link rounded-top" data-toggle="tab">Load From File</a></li>
<li class="nav-item"><a href="#lrgsTab" class="nav-link rounded-top active" data-bs-toggle="tab">Load From LRGS</a></li>
<li class="nav-item"><a href="#fileTab" class="nav-link rounded-top" data-bs-toggle="tab">Load From File</a></li>
</ul>

<div class="tab-content">
Expand Down Expand Up @@ -403,14 +402,7 @@
<!-- /decoding script modal -->

<jsp:include page="/resources/jsp/includes/decodes.jsp" />

<script src="/webjars/momentjs/moment.min.js"></script>
<script src="/webjars/bootstrap-daterangepicker/js/bootstrap-daterangepicker.js"></script>
<script src="../resources/js/plugins/pickers/anytime.min.js"></script>
<script src="/webjars/pickadate.js/picker.js"></script>
<script src="/webjars/pickadate.js/picker.date.js"></script>
<script src="/webjars/pickadate.js/picker.time.js"></script>
<script src="/webjars/pickadate.js/legacy.js"></script>

<script src="../resources/js/configs.js"></script>
<script src="../resources/js/datatables/helpers.js"></script>
<script src="../resources/js/lib/object_utilities.js"></script>
Expand Down
12 changes: 5 additions & 7 deletions opendcs-web-client/src/main/webapp/engineering_units.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="page-header-content header-elements-md-inline">
<div class="page-title d-flex">
<h4><span class="font-weight-semibold">OpenDCS</span> - Engineering Units</h4>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="icon-more"></i></a>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="bi bi-three-dots-vertical"></i></a>
</div>
</div>
</div> <!-- /page header -->
Expand Down Expand Up @@ -57,12 +57,10 @@
</div> <!-- /page content -->
</body>

<jsp:include page="/resources/jsp/includes/decodes.jsp" />

<script src="/webjars/switchery/switchery.js"></script>
<script src="/webjars/bootstrap-switch/js/bootstrap-switch.min.js"></script>
<script src="/webjars/uniform/jquery.uniform.min.js"></script>
<script src="../resources/js/datatables/helpers.js"></script>
<jsp:include page="/resources/jsp/includes/decodes.jsp" />


<script src="../resources/js/datatables/helpers.js"></script>
<script src="../resources/js/lib/dom_utilities.js"></script>
<script src="../resources/js/lib/object_utilities.js"></script>
<script src="../resources/js/lib/date_utilities.js"></script>
Expand Down
12 changes: 5 additions & 7 deletions opendcs-web-client/src/main/webapp/enumerations.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="page-header-content header-elements-md-inline">
<div class="page-title d-flex">
<h4><span class="font-weight-semibold">OpenDCS</span> - Enumerations</h4>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="icon-more"></i></a>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="bi bi-three-dots-vertical"></i></a>
</div>
</div>
</div> <!-- /page header -->
Expand Down Expand Up @@ -65,12 +65,10 @@



<jsp:include page="/resources/jsp/includes/decodes.jsp" />

<script src="/webjars/switchery/switchery.js"></script>
<script src="/webjars/bootstrap-switch/js/bootstrap-switch.min.js"></script>
<script src="/webjars/uniform/jquery.uniform.min.js"></script>
<script src="../resources/js/datatables/helpers.js"></script>
<jsp:include page="/resources/jsp/includes/decodes.jsp" />


<script src="../resources/js/datatables/helpers.js"></script>
<script src="../resources/js/lib/dom_utilities.js"></script>
<script src="../resources/js/lib/object_utilities.js"></script>
<script src="../resources/js/lib/date_utilities.js"></script>
Expand Down
14 changes: 6 additions & 8 deletions opendcs-web-client/src/main/webapp/eu_conversions.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="page-header-content header-elements-md-inline">
<div class="page-title d-flex">
<h4><span class="font-weight-semibold">OpenDCS</span> - Engineering Unit Conversions</h4>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="icon-more"></i></a>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="bi bi-three-dots-vertical"></i></a>
</div>
</div>
</div> <!-- /page header -->
Expand All @@ -32,7 +32,7 @@
<button type="button" class="btn btn-success float-right" id="saveButton">Save</button>
</div>
</div>
<table id="mainTable" class="table table-hover datatable-responsive w-100">
<table id="mainTable" class="table table-hover datatable-responsive w-100">
<caption class="captionTitleCenter">Engineering Unit Conversions
<button class="btn btn-secondary float-right captionButton mr-3" id="addButton">+</button>
</caption>
Expand Down Expand Up @@ -62,12 +62,10 @@
</div> <!-- /page content -->
</body>

<jsp:include page="/resources/jsp/includes/decodes.jsp" />

<script src="/webjars/switchery/switchery.js"></script>
<script src="/webjars/bootstrap-switch/js/bootstrap-switch.min.js"></script>
<script src="/webjars/uniform/jquery.uniform.min.js"></script>
<script src="../resources/js/datatables/helpers.js"></script>
<jsp:include page="/resources/jsp/includes/decodes.jsp" />


<script src="../resources/js/datatables/helpers.js"></script>
<script src="../resources/js/lib/dom_utilities.js"></script>
<script src="../resources/js/lib/object_utilities.js"></script>
<script src="../resources/js/lib/opendcs_utilities.js"></script>
Expand Down
5 changes: 3 additions & 2 deletions opendcs-web-client/src/main/webapp/login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<body class="navbar-top">

<jsp:include page="/resources/jsp/menus/decodes/main.jsp" />

<!-- Page content -->
<div class="page-content">
Expand All @@ -30,8 +31,8 @@
<div class="page-header page-header-light">
<div class="page-header-content header-elements-md-inline">
<div class="page-title d-flex">
<h4><i class="icon-arrow-left52 mr-2"></i> <span class="font-weight-semibold">OpenDCS Web Client</span> - Login</h4>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="icon-more"></i></a>
<h4><i class="bi bi-arrow-left me-2"></i> <span class="font-weight-semibold">OpenDCS Web Client</span> - Login</h4>
<a href="#" class="header-elements-toggle text-default d-md-none"><i class="bi bi-three-dots-vertical"></i></a>
</div>
</div>
</div>
Expand Down
Loading
Loading