Skip to content

Commit 56b274e

Browse files
committed
Updated theme on old pages
1 parent 4835f53 commit 56b274e

File tree

4 files changed

+135
-191
lines changed

4 files changed

+135
-191
lines changed

web/build/blank.html

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
<html>
2-
<head>
3-
<link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
4-
<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
5-
</head>
6-
<body class="theme-panelContainer">
7-
<pre class="theme-panelContainer">{{ content }}</pre>
8-
</body>
9-
</html>
1+
{% extends "main.html" %}
102

3+
{% block head %}
4+
{{ jimi.jquery() }}
5+
{{ jimi.tables() }}
6+
<link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
7+
<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
8+
{% endblock %}
9+
10+
{% block main %}
11+
{{ content }}
12+
{% endblock %}

web/build/blankPage.html

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
1-
<!DOCTYPE html>
2-
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
3-
<head>
4-
<meta charset="utf-8" />
5-
<title>jimi</title>
1+
{% extends "main.html" %}
62

7-
<!-- Includes Default -->
8-
<script src="{{ url_for('static', filename='/includes/jquery-3.6.0/js/jquery-3.6.0.min.js') }}"></script>
9-
<script src="{{ url_for('static', filename='includes/jqueryui-1.12.1/jquery-ui-1.12.1.js') }}"></script>
10-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/jqueryui-1.12.1/jquery-ui.theme.min.css') }}">
11-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/jqueryui-1.12.1/jquery-ui.min.css') }}">
12-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/jqueryui-1.12.1/jquery-ui.structure.min.css') }}">
13-
<script src="{{ url_for('static', filename='includes/bootstrap-4.5.3/bootstrap.min.js') }}"></script>
14-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/bootstrap-4.5.3/bootstrap.min.css') }}">
3+
{% block head %}
4+
{{ jimi.jquery() }}
5+
{{ jimi.tables() }}
6+
<script src="{{ url_for('static', filename='javascript/alert.js') }}"></script>
7+
<link rel="stylesheet" href="{{ url_for('static', filename='css/alert.css') }}">
8+
<link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
9+
<link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
10+
{% endblock %}
1511

16-
<!-- jimi -->
17-
<script src="{{ url_for('static', filename='javascript/alert.js') }}"></script>
18-
<link rel="stylesheet" href="{{ url_for('static', filename='css/alert.css') }}">
19-
<link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
20-
<link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
21-
22-
{% block head %}
23-
{% endblock %}
24-
</head>
25-
<body class="theme-content">
26-
{% block body %}
27-
{% endblock %}
28-
</body>
12+
{% block main %}
13+
{% block body %}
14+
{% endblock %}
2915
{% block html %}
3016
{% endblock %}
31-
</html>
17+
{% endblock %}

web/build/cleanupObjects.html

Lines changed: 85 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,92 @@
1-
<script src="{{ url_for('static', filename='/includes/jquery-3.6.0/js/jquery-3.6.0.min.js') }}"></script>
2-
<script src="{{ url_for('static', filename='includes/jquery/js/jquery.datatables.min.js') }}"></script>
1+
{% extends "main.html" %}
32

4-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/datatables/css/dataTables.bootstrap.css') }}">
5-
<script src="{{ url_for('static', filename='includes/datatables/js/dataTables.bootstrap.js') }}"></script>
6-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/datatables/css/fixedHeader.dataTables.min.css') }}">
7-
<script src="{{ url_for('static', filename='includes/datatables/js/dataTables.fixedHeader.min.js') }}"></script>
3+
{% block head %}
4+
{{ jimi.jquery() }}
5+
{{ jimi.tables() }}
6+
<script src="{{ url_for('static', filename='includes/jquery/js/jquery.datatables.min.js') }}"></script>
7+
<link rel="stylesheet" href="{{ url_for('static', filename='includes/datatables/css/dataTables.bootstrap.css') }}">
8+
<script src="{{ url_for('static', filename='includes/datatables/js/dataTables.bootstrap.js') }}"></script>
9+
<link rel="stylesheet" href="{{ url_for('static', filename='includes/datatables/css/fixedHeader.dataTables.min.css') }}">
10+
<script src="{{ url_for('static', filename='includes/datatables/js/dataTables.fixedHeader.min.js') }}"></script>
11+
<script src="{{ url_for('static', filename='javascript/helpers.js') }}"></script>
12+
<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
13+
<link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
14+
<link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
15+
{% endblock %}
816

9-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/bootstrap-3.3.7/css/bootstrap.min.css') }}">
10-
<script src="{{ url_for('static', filename='includes/visjs/js/moment.js') }}"></script>
11-
<script src="{{ url_for('static', filename='includes/datatables/js/datetime.moment.js') }}"></script>
12-
<script src="{{ url_for('static', filename='includes/bootstrap-3.3.7/js/bootstrap.min.js') }}"></script>
13-
14-
<script src="{{ url_for('static', filename='javascript/helpers.js') }}"></script>
15-
16-
17-
<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
18-
19-
<link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
20-
<link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
21-
22-
<script>
23-
var CSRF = "{{CSRF}}"
24-
</script>
25-
26-
<html>
27-
<head>
28-
<title>JIMI - cleanup Unused Objects</title>
29-
</head>
30-
<body class="theme-panelContainer">
31-
<b>Triggers:</b>
32-
<table id="orderTableTrigger" class="table table-sm theme-table" cellspacing="0" width="100%">
33-
<thead class="theme-tableHeader">
17+
{% block main %}
18+
<b>Triggers:</b>
19+
<table id="orderTableTrigger" class="table table-sm theme-table" cellspacing="0" width="100%">
20+
<thead class="theme-tableHeader">
21+
<tr>
22+
<th class="th-sm">_id</th>
23+
<th class="th-sm">name</th>
24+
</tr>
25+
</thead>
26+
<tbody class="theme-tableBody">
27+
{% for data in unusedTriggerObjects %}
3428
<tr>
35-
<th class="th-sm">_id</th>
36-
<th class="th-sm">name</th>
29+
<td>{{ data['_id'] }}</td>
30+
<td>{{ data['name'] }}</td>
3731
</tr>
38-
</thead>
39-
<tbody class="theme-tableBody">
40-
{% for data in unusedTriggerObjects %}
41-
<tr>
42-
<td>{{ data['_id'] }}</td>
43-
<td>{{ data['name'] }}</td>
44-
</tr>
45-
{% endfor %}
46-
</tbody>
47-
</table>
48-
<br>
49-
<br>
50-
<b>Actions:</b>
51-
<table id="orderTableAction" class="table table-sm theme-table" cellspacing="0" width="100%">
52-
<thead class="theme-tableHeader">
32+
{% endfor %}
33+
</tbody>
34+
</table>
35+
<br>
36+
<br>
37+
<b>Actions:</b>
38+
<table id="orderTableAction" class="table table-sm theme-table" cellspacing="0" width="100%">
39+
<thead class="theme-tableHeader">
40+
<tr>
41+
<th class="th-sm">_id</th>
42+
<th class="th-sm">name</th>
43+
</tr>
44+
</thead>
45+
<tbody class="theme-tableBody">
46+
{% for data in unusedActionObjects %}
5347
<tr>
54-
<th class="th-sm">_id</th>
55-
<th class="th-sm">name</th>
48+
<td>{{ data['_id'] }}</td>
49+
<td>{{ data['name'] }}</td>
5650
</tr>
57-
</thead>
58-
<tbody class="theme-tableBody">
59-
{% for data in unusedActionObjects %}
60-
<tr>
61-
<td>{{ data['_id'] }}</td>
62-
<td>{{ data['name'] }}</td>
63-
</tr>
64-
{% endfor %}
65-
</tbody>
66-
</table>
67-
<br>
68-
<br>
69-
<input class='btn btn-primary theme-panelButton' id="clearbutton" type="submit" value="Cleanup">
70-
</body>
71-
</html>
72-
73-
<script>
74-
$(document).ready(function () {
75-
$('#orderTableTrigger').DataTable({
76-
"stripeClasses" : [ 'theme-tableRowOdd', 'theme-tableRowEven' ],
77-
fixedHeader: {
78-
header: true,
79-
footer: true
80-
},
81-
"paging" : false,
82-
"order" : [[ 0, "desc" ]],
83-
"autoWidth": false,
51+
{% endfor %}
52+
</tbody>
53+
</table>
54+
<br>
55+
<br>
56+
<input class='btn btn-primary theme-panelButton' id="clearbutton" type="submit" value="Cleanup">
57+
<script>
58+
$(document).ready(function () {
59+
$('#orderTableTrigger').DataTable({
60+
"stripeClasses" : [ 'theme-tableRowOdd', 'theme-tableRowEven' ],
61+
fixedHeader: {
62+
header: true,
63+
footer: true
64+
},
65+
"paging" : false,
66+
"order" : [[ 0, "desc" ]],
67+
"autoWidth": false,
68+
});
69+
$('#orderTableAction').DataTable({
70+
"stripeClasses" : [ 'theme-tableRowOdd', 'theme-tableRowEven' ],
71+
fixedHeader: {
72+
header: true,
73+
footer: true
74+
},
75+
"paging" : false,
76+
"order" : [[ 0, "desc" ]],
77+
"autoWidth": false,
78+
});
79+
$('.dataTables_length').addClass('bs-select');
80+
$('.dataTables_filter input[type="search"]').css({'width':'200px'});
81+
$('.dataTables_filter input[type="search"]').addClass("theme-panelTextbox")
82+
8483
});
85-
$('#orderTableAction').DataTable({
86-
"stripeClasses" : [ 'theme-tableRowOdd', 'theme-tableRowEven' ],
87-
fixedHeader: {
88-
header: true,
89-
footer: true
90-
},
91-
"paging" : false,
92-
"order" : [[ 0, "desc" ]],
93-
"autoWidth": false,
94-
});
95-
$('.dataTables_length').addClass('bs-select');
96-
$('.dataTables_filter input[type="search"]').css({'width':'200px'});
97-
$('.dataTables_filter input[type="search"]').addClass("theme-panelTextbox")
98-
99-
});
100-
101-
$('#clearbutton').on('click', function(e){
102-
$.ajax({url:"", type:"DELETE", data : JSON.stringify({CSRF: CSRF}), contentType:"application/json", success: function ( result ) {
103-
location.reload();
104-
}
105-
});
106-
})
107-
</script>
84+
85+
$('#clearbutton').on('click', function(e){
86+
$.ajax({url:"", type:"DELETE", data : JSON.stringify({CSRF: CSRF}), contentType:"application/json", success: function ( result ) {
87+
location.reload();
88+
}
89+
});
90+
})
91+
</script>
92+
{% endblock %}

web/build/import.html

Lines changed: 26 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,26 @@
1-
<!DOCTYPE html>
2-
3-
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
4-
<head>
5-
<meta charset="utf-8" />
6-
<title></title>
7-
<script src="{{ url_for('static', filename='/includes/jquery-3.6.0/js/jquery-3.6.0.min.js') }}"></script>
8-
<script src="{{ url_for('static', filename='includes/jquery/js/jquery-ui-1.12.1.js') }}"></script>
9-
10-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/jquery/css/jquery-ui.theme.css') }}">
11-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/jquery/css/jquery-ui.css') }}">
12-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/jquery/css/jquery-ui.structure.css') }}">
13-
14-
<link rel="stylesheet" href="{{ url_for('static', filename='includes/bootstrap-3.3.7/css/bootstrap.min.css') }}">
15-
<script src="{{ url_for('static', filename='includes/bootstrap-3.3.7/js/bootstrap.min.js') }}"></script>
16-
17-
<link rel="stylesheet" href="{{ url_for('static', filename='css/datatable.css') }}">
18-
19-
<script src="{{ url_for('static', filename='javascript/helpers.js') }}"></script>
20-
<script src="{{ url_for('static', filename='javascript/alert.js') }}"></script>
21-
22-
<script src="{{ url_for('static', filename='javascript/hotkeys.js') }}"></script>
23-
24-
<link rel="stylesheet" href="{{ url_for('static', filename='css/alert.css') }}">
25-
<link rel="stylesheet" href="{{ url_for('static', filename='css/codify.css') }}">
26-
27-
<link rel="stylesheet" href="{{ url_for('static', filename='themes/default/default.css') }}">
28-
29-
30-
</head>
31-
<body class="theme-panelContainer">
32-
<div class="container-fluid theme-panelContainer">
33-
Import Data:<br>
34-
<textarea id="importData" class="inputFullWidth theme-panelTextArea" style="height: 150px;"></textarea></br>
35-
<input class="theme-panelCheckbox" type="checkbox" checked id="appendObjects">Append</input></br>
36-
<input class="theme-panelCheckbox" type="checkbox" id="duplicateObjects">Duplicate all objects</input></br>
37-
Offset UI x by: <input class="theme-panelTextbox" value="0" id="offsetX"></input></br>
38-
Offset UI y by: <input class="theme-panelTextbox" value="0" id="offsetY"></input></br>
39-
<button id="import" class="btn btn-primary theme-panelButton">Import</button></br>
40-
</div>
41-
</body>
42-
</html>
43-
44-
<script>
45-
var CSRF = "{{CSRF}}"
46-
</script>
47-
48-
<script>
49-
$("#import").click(function () {
50-
$.ajax({type:"POST", data:JSON.stringify({ importData: $('#importData').val(), duplicateObjects: $("#duplicateObjects").is(":checked"), appendObjects: $("#appendObjects").is(":checked"), offsetX : $('#offsetX').val(), offsetY : $('#offsetY').val(), CSRF: CSRF }), contentType:"application/json", success: function(result) {
51-
alert("Imported!");
52-
}
53-
});
54-
});
55-
</script>
1+
{% extends "main.html" %}
2+
3+
{% block head %}
4+
{{ jimi.jquery() }}
5+
{{ jimi.tables() }}
6+
{% endblock %}
7+
8+
{% block main %}
9+
<div class="container-fluid theme-panelContainer">
10+
Import Data:<br>
11+
<textarea id="importData" class="inputFullWidth theme-panelTextArea" style="height: 150px;"></textarea></br>
12+
<input class="theme-panelCheckbox" type="checkbox" checked id="appendObjects">Append</input></br>
13+
<input class="theme-panelCheckbox" type="checkbox" id="duplicateObjects">Duplicate all objects</input></br>
14+
Offset UI x by: <input class="theme-panelTextbox" value="0" id="offsetX"></input></br>
15+
Offset UI y by: <input class="theme-panelTextbox" value="0" id="offsetY"></input></br>
16+
<button id="import" class="btn btn-primary theme-panelButton">Import</button></br>
17+
</div>
18+
<script>
19+
$("#import").click(function () {
20+
$.ajax({type:"POST", data:JSON.stringify({ importData: $('#importData').val(), duplicateObjects: $("#duplicateObjects").is(":checked"), appendObjects: $("#appendObjects").is(":checked"), offsetX : $('#offsetX').val(), offsetY : $('#offsetY').val(), CSRF: CSRF }), contentType:"application/json", success: function(result) {
21+
alert("Imported!");
22+
}
23+
});
24+
});
25+
</script>
26+
{% endblock %}

0 commit comments

Comments
 (0)