Skip to content

Commit fcdc9c4

Browse files
committed
Fixed errors in UI
1 parent 06693c2 commit fcdc9c4

9 files changed

Lines changed: 8 additions & 20 deletions

File tree

install/cws-ui/history.ftl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<title>CWS - History</title>
55

66
<script src="/${base}/js/jquery.min.js"></script>
7-
<script src="/${base}/js/docs.min.js"></script>
87
<script src="/${base}/js/popper.min.js"></script>
98
<script src="/${base}/js/bootstrap-datepicker.min.js"></script>
109
<script src="/${base}/js/bootstrap.min.js"></script>
@@ -612,7 +611,7 @@
612611
for (const [key, value] of sortedEntries) {
613612
var temp = "";
614613
var varTimeSet = key.substring(key.indexOf("[")+1, key.indexOf("]"));
615-
if (moment(varTimeSet).diff(timeStart, "seconds") > 1) {
614+
if (moment(new Date(varTimeSet)).diff(moment(new Date(timeStart)), "seconds") > 1) {
616615
continue;
617616
}
618617
var tempVal = value;

install/cws-ui/login.ftl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
================================================== -->
7979
<!-- Placed at the end of the document so the pages load faster -->
8080
<script src="/${base}/js/bootstrap.min.js"></script>
81-
<script src="/${base}/js/docs.min.js"></script>
8281

8382
</body>
8483
</html>

install/cws-ui/logs.ftl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<script src="/${base}/js/DataTables/datatables.js"></script>
1616
<script src="/${base}/js/DataTablesDateFilter.js"></script>
1717
<script src="/${base}/js/bootstrap-datepicker.min.js"></script>
18-
<script src="/${base}/js/DataTables/dataTables.responsive.min.js"></script>
19-
<script src="/${base}/js/DataTables/responsive.bootstrap.min.js"></script>
2018
<script src="/${base}/js/cws.js" type="text/javascript"></script>
2119
<!--Load CSS Stylesheets-->
2220
<link href="/${base}/css/bootstrap.min.css"rel="stylesheet">

install/cws-ui/not_authorized.ftl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
================================================== -->
8383
<!-- Placed at the end of the document so the pages load faster -->
8484
<script src="/${base}/js/bootstrap.min.js"></script>
85-
<script src="/${base}/js/docs.min.js"></script>
8685

8786
</body>
8887
</html>

install/cws-ui/processes.ftl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,9 @@
585585
var temp = "";
586586
var varTimeSetString = key.substring(key.indexOf("[") + 1, key.indexOf("]"));
587587
if (timeStart && varTimeSetString) {
588-
if (moment(varTimeSetString).diff(timeStart, "seconds") > 1) {
588+
var varTimeSet = moment(new Date(varTimeSetString));
589+
var timeStartMoment = moment(new Date(timeStart));
590+
if (varTimeSet.isValid() && timeStartMoment.isValid() && varTimeSet.diff(timeStartMoment, "seconds") > 1) {
589591
continue;
590592
}
591593
}

install/cws-ui/sidebar.ftl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<script type="text/javascript">
2-
$(document).ready(_ =>{
3-
console.log("initialize tooltips!")
4-
const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
5-
const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
2+
$(document).ready(_ => {
3+
const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
4+
const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
65
})
76
</script>
87

9-
108
<div class="sidebar show" id="sidebar">
119
<ul class="nav nav-sidebar">
1210

install/cws-ui/snippets.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<meta charset="utf-8">
66
<title>CWS - Executable Code</title>
77
<script src="/${base}/js/jquery.min.js"></script>
8-
<script src="/${base}/js/bootstrap.min.js"></script>
98
<script src="/${base}/js/popper.min.js"></script>
9+
<script src="/${base}/js/bootstrap.min.js"></script>
1010

1111
<link href="/${base}/css/bootstrap.min.css" rel="stylesheet">
1212
<link href="/${base}/css/bootstrap-reboot.min.css" rel="stylesheet">

install/cws-ui/summary.ftl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
refreshElasticsearchStats();
5757
});
5858
59-
$( window ).load(function() {
60-
console.log( "window loaded" );
61-
});
6259
</script>
6360

6461
<!-- Just for debugging purposes. Don't actually copy this line! -->
@@ -110,7 +107,6 @@
110107
================================================== -->
111108
<!-- Placed at the end of the document so the pages load faster -->
112109
<script src="/${base}/js/bootstrap.min.js"></script>
113-
<script src="/${base}/js/docs.min.js"></script>
114110

115111
</body>
116112
</html>

install/cws-ui/workers.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,6 @@
286286
}
287287
}
288288
289-
$( window ).load(function() {
290-
console.log( "window loaded" );
291-
});
292289
</script>
293290
294291
<!-- Just for debugging purposes. Don''t actually copy this line! -->

0 commit comments

Comments
 (0)