Skip to content

Commit 9d0e2fc

Browse files
NOVAXIMNOVAXIM
authored
Updated to 2.1.3c0 version
1 parent ba368b6 commit 9d0e2fc

17 files changed

+4404
-4941
lines changed

‎www/css/bootstrap.css‎

Lines changed: 3925 additions & 4528 deletions
Large diffs are not rendered by default.

‎www/css/config.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,5 @@
410410
"popovers.less",
411411
"modals.less"
412412
],
413-
"js": [],
414-
"customizerUrl": "http://getbootstrap.com/customize/?id=4c7131e1a6b32f2835aea278b14c209d"
413+
"js": []
415414
}

‎www/css/menu.css‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
.dropbtn {
2-
padding: 16px;
3-
font-size: 14px;
2+
padding: 14px 16px;
3+
font-size: 16px;
44
border: none;
55
cursor: pointer;
6-
}
7-
8-
.dropdown {
9-
position: relative;
10-
display: inline-block;
11-
border-color: #000000;
6+
border-top-left-radius: 4px;
7+
border-top-right-radius: 4px;
128
}
139

1410
.dropdownselect {
@@ -58,7 +54,7 @@
5854

5955
.menu-divider {
6056
height: 1px;
61-
margin: 2px 0;
57+
margin: 4px 0;
6258
overflow: hidden;
6359
background-color: #e5e5e5;
6460
}

‎www/css/style.css‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ w25 {
291291

292292
.grid-container {
293293
display: inline-grid;
294-
grid-gap: 10px;
294+
grid-gap: 0px;
295295
padding: 10px;
296296
grid-template-columns: auto auto auto auto auto;
297297
}
@@ -319,7 +319,6 @@ w25 {
319319
.panel-flex-col {
320320
display: flex;
321321
flex-direction: column;
322-
width: 100%;
323322
}
324323

325324
.panel-flex-center {
@@ -425,3 +424,36 @@ w25 {
425424
}
426425

427426
.button_txt {}
427+
428+
.topnavbar {
429+
display: flow-root;
430+
padding-top: 5px;
431+
border-bottom: 1px solid #e7e7e7;
432+
}
433+
.lock_UI_label {
434+
margin-bottom: 0px;
435+
position: relative;
436+
top: -1px;
437+
min-width: 145px;
438+
}
439+
#controlPanel,
440+
#grblPanel,
441+
#temperaturesPanel,
442+
#extruderPanel,
443+
#filesPanel,
444+
#commandsPanel {
445+
margin: 8px;
446+
}
447+
#panel-title {
448+
color: #555555;
449+
font-size: 1.25em;
450+
font-weight: bold;
451+
letter-spacing: 0.5px;
452+
}
453+
#commands,
454+
#fileSource {
455+
color: #555555;
456+
font-size: 1.2em;
457+
font-weight: bold;
458+
letter-spacing: 0.25px;
459+
}

‎www/css/tabs.css‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,60 @@
11
/* Style the tab */
22
div.tab {
3-
overflow: hidden;
4-
border-left: 1px solid #ccc;
5-
border-right: 1px solid #ccc;
3+
float: left;
4+
background-color: #f1f1f1;
65
border-top: 1px solid #ccc;
76
border-bottom: 1px solid #ccc;
8-
background-color: #f1f1f1;
9-
border-top-left-radius: 6px;
10-
border-top-right-radius: 6px;
7+
padding: 10px 22px 0px 22px;
8+
width: 100%;
119
}
1210

13-
1411
/* Style the buttons inside the tab */
1512
div.tab button {
16-
background-color: inherit;
1713
float: left;
14+
background-color: inherit;
1815
border-top: 1px solid #f1f1f1;
1916
border-bottom: 1px solid #f1f1f1;
2017
border-left: 1px solid #f1f1f1;
2118
border-right: 1px solid #f1f1f1;
22-
outline: none;
2319
cursor: pointer;
24-
padding: 12px 14px;
20+
outline: none;
21+
padding: 14px 16px 10px;
2522
transition: 0.3s;
2623
color: #337AB7;
2724
}
2825

2926
/* Change background color of buttons on hover */
3027
div.tab button:hover {
3128
background-color: #ddd;
32-
border-top-left-radius: 6px;
33-
border-top-right-radius: 6px;
3429
border-top: 1px solid #ddd;
3530
border-bottom: 1px solid #ddd;
3631
border-left: 1px solid #ddd;
3732
border-right: 1px solid #ddd;
33+
border-top-left-radius: 6px;
34+
border-top-right-radius: 6px;
3835
}
3936

4037
/* Create an active/current tablink class */
4138
div.tab button.active {
42-
background-color: #ffffff;
39+
background-color: #fff;
4340
border-top: 1px solid #ccc;
4441
border-bottom: 1px solid #fff;
4542
border-left: 1px solid #ccc;
4643
border-right: 1px solid #ccc;
4744
border-top-left-radius: 6px;
4845
border-top-right-radius: 6px;
4946
color: #555555;
47+
position: relative;
48+
bottom: -1px;
49+
}
50+
51+
/* Style the tab title */
52+
div.tab button span {
53+
position: relative;
54+
bottom: 0.2em;
5055
}
5156

5257
/* Style the tab content */
5358
.tabcontent {
5459
display: none;
55-
padding: 6px 12px;
56-
57-
}
60+
}

‎www/index.html‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
var target_firmware = "";
1010
</script>
1111
<script>
12-
var web_ui_version = "2.1.3b0";
12+
var web_ui_version = "2.1.3c0";
1313
</script>
1414
<script>
15-
var direct_sd = false;
15+
var direct_sd = true;
1616
</script>
1717
<script>
1818
var fw_version = "";
@@ -23,14 +23,13 @@
2323
<script>
2424
var secondary_sd = "/sd/";
2525
</script>
26-
<!--removeIf(cleanheader)-->
26+
<!-- removeIf(cleanheader) -->
2727
<link href="css/bootstrap.css" rel="stylesheet" />
2828
<link href="css/menu.css" rel="stylesheet" />
2929
<link href="css/tabs.css" rel="stylesheet" />
3030
<link href="css/modaldlg.css" rel="stylesheet" />
3131
<link href="css/wizard.css" rel="stylesheet" />
32-
<!--endRemoveIf(cleanheader)-->
33-
32+
<!-- endRemoveIf(cleanheader) -->
3433
<!-- smoosh -->
3534
<link href="css/style.css" rel="stylesheet" />
3635
<!-- endsmoosh -->
@@ -39,15 +38,15 @@
3938
<body>
4039
<div id="loadingmsg">
4140
<center>
42-
<h3>Loading....</h3>
41+
<h3>Loading...</h3>
4342
</center>
4443
</div>
45-
<div id="main_ui" class="container-fluid hide_it">
44+
<div id="main_ui" class="hide_it">
4645
<!-- topnavbar -->
4746
<file-include w3-include-html="'sub/navbar.html'"></file-include>
4847
<!-- /topnavbar -->
4948
<!-- tabbar -->
50-
<file-include w3-include-html="'sub/tab_bar.html'"></file-include>
49+
<file-include w3-include-html="'sub/tabbar.html'"></file-include>
5150
<!-- / tabbar -->
5251
<!-- content -->
5352
<div id="mainuitabscontent">
@@ -76,7 +75,7 @@ <h3>Loading....</h3>
7675
<file-include w3-include-html="'sub/restartdlg.html'"></file-include>
7776
<file-include w3-include-html="'sub/UIdisableddlg.html'"></file-include>
7877
<!-- / template -->
79-
<!--removeIf(cleanheader)-->
78+
<!-- removeIf(cleanheader) -->
8079
<script src="js/wizard.js"></script>
8180
<script src="js/http.js"></script>
8281
<script src="js/icons.js"></script>
@@ -112,7 +111,7 @@ <h3>Loading....</h3>
112111
<script src="js/localstorage.js"></script>
113112
<script src="js/UIdisableddlg.js"></script>
114113
<script src="js/custom.js"></script>
115-
<!--endRemoveIf(cleanheader)-->
114+
<!-- endRemoveIf(cleanheader) -->
116115
<!-- smoosh -->
117116
<script src="js/app.js"></script>
118117
<!-- endsmoosh -->

‎www/js/app.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ function ontoggleLock(forcevalue) {
250250
if (typeof forcevalue != "undefined")
251251
document.getElementById("lock_UI").checked = forcevalue;
252252
if (document.getElementById("lock_UI").checked) {
253-
document.getElementById("lock_UI_btn_txt").innerHTML =
253+
document.getElementById("lock_UI_text").innerHTML =
254254
translate_text_item("Unlock interface");
255255
disable_items(document.getElementById("maintab"), true);
256256
disable_items(document.getElementById("configtab"), true);
@@ -263,7 +263,7 @@ function ontoggleLock(forcevalue) {
263263
disable_items(document.getElementById("JogUI"), false);
264264
document.getElementById("JogUI").style.pointerEvents = "none";
265265
} else {
266-
document.getElementById("lock_UI_btn_txt").innerHTML =
266+
document.getElementById("lock_UI_text").innerHTML =
267267
translate_text_item("Lock interface");
268268
disable_items(document.getElementById("maintab"), false);
269269
disable_items(document.getElementById("configtab"), false);
@@ -281,8 +281,8 @@ function Handle_DHT(data) {
281281
}
282282
var temp = convertDHT2Fahrenheit ? parseFloat(tdata[0]) * 1.8 + 32 : parseFloat(tdata[0]);
283283
document.getElementById("DHT_humidity").innerHTML =
284-
parseFloat(tdata[1]).toFixed(2).toString() + "%";
285-
var temps = temp.toFixed(2).toString() + "&deg;";
284+
parseFloat(tdata[1]).toFixed(2).toString() + " %";
285+
var temps = temp.toFixed(2).toString() + " &deg;";
286286
if (convertDHT2Fahrenheit) temps += "F";
287287
else temps += "C";
288288
document.getElementById("DHT_temperature").innerHTML = temps;

‎www/sub/commandpanel.html‎

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,49 @@
11
<div id="commandsPanel" class="panel panel-default panel-flex-col">
22
<div class="panel-heading">
3-
<b><span translate>Commands</span></b>
3+
<span id="commands" translate>Commands</span>
44
<button id="clear_monitor_btn" class="btn btn-primary btn-xs pull-right" onclick="Monitor_output_Clear()" translate>Clear</button>
55
</div>
66
<div id="command-body" class="panel-body panel-flex-main">
7-
<pre id="cmd_content" style="min-height: 350px; max-height: 350px;"></pre>
7+
<pre id="cmd_content" style="min-height:350px;max-height:350px;"></pre>
88
</div>
99
<div class="panel-footer">
1010
<div class="panel-flex-row">
11-
<div class="input-group">
12-
<div class="input-group">
13-
<form autocomplete="off" onsubmit="return false;">
14-
<input autocomplete="off" class="form-control w14" type="text" onkeyup="CustomCommand_OnKeyUp(event)" value="" id="custom_cmd_txt" translateph placeholder="Send Command..." />
15-
</form>
16-
<div class="input-group-btn">
17-
<button class="btn btn-success" onclick="SendCustomCommand();" translate>Send</button>
18-
</div>
19-
</div>
20-
</div>
11+
<table>
12+
<tr>
13+
<td>
14+
<div class="input-group">
15+
<form autocomplete="off" onsubmit="return false;">
16+
<input autocomplete="off" class="form-control w14" type="text" onkeyup="CustomCommand_OnKeyUp(event)" value="" id="custom_cmd_txt" translateph placeholder="Send Command…" />
17+
</form>
18+
<div class="input-group-btn">
19+
<button class="btn btn-success" onclick="SendCustomCommand();" translate>Send</button>
20+
</div>
21+
</div>
22+
</td>
23+
</tr>
24+
</table>
25+
&nbsp;&nbsp;&nbsp;
26+
<table>
27+
<tr>
28+
<td>
29+
<div class="input-group">
30+
<input type="checkbox" onclick="Monitor_check_autoscroll()" id="monitor_enable_autoscroll" />
31+
<span translate>Autoscroll</span>
32+
</div>
33+
</td>
34+
</tr>
35+
</table>
2136
&nbsp;&nbsp;
22-
<div class="form-group">
23-
<div class="checkbox">
24-
<label>
25-
<input type="checkbox" onclick=" Monitor_check_autoscroll()" id="monitor_enable_autoscroll" />
26-
<span translate>Autoscroll</span>
27-
</label>
28-
</div>
29-
</div>
30-
&nbsp;&nbsp;
31-
<div class="form-group" id="cmd_verbose">
32-
<div class="checkbox">
33-
<label>
34-
<input type="checkbox" onclick=" Monitor_check_verbose_mode()" id="monitor_enable_verbose_mode" />
35-
<span translate>Verbose mode</span>
36-
</label>
37-
</div>
38-
39-
</div>
37+
<table>
38+
<tr>
39+
<td>
40+
<div class="input-group">
41+
<input type="checkbox" onclick="Monitor_check_verbose_mode()" id="monitor_enable_verbose_mode" />
42+
<span translate>Verbose mode</span>
43+
</div>
44+
</td>
45+
</tr>
46+
</table>
4047
</div>
4148
</div>
42-
</div>
49+
</div>

‎www/sub/configtab.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
<div id="configtab" class="tabcontent">
22
<center>
3-
<h2 id='tab_title_configuration'>
3+
<h2>
44
<span translate>Printer configuration</span>
55
</h2>
6-
<button type="button" id="config_refresh_btn" class="btn btn-primary" onclick="refreshconfig();">
7-
<svg width="1.3em" height="1.2em" viewBox="0 0 1300 1200">
8-
<g transform="translate(50,1200) scale(1, -1)">
9-
<path fill="currentColor" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z"></path>
10-
</g>
11-
</svg>
12-
</button>
6+
<table>
7+
<tr>
8+
<td style="padding:10px">
9+
<button type="button" id="config_refresh_btn" class="btn btn-primary" onclick="refreshconfig();">
10+
<svg width="1.3em" height="1.2em" viewBox="0 0 1300 1200">
11+
<g transform="translate(50,1200) scale(1, -1)">
12+
<path fill="currentColor" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z"></path>
13+
</g>
14+
</svg>
15+
</button>
16+
</td>
17+
</tr>
18+
</table>
1319
<br>
1420
<span id="config_status"></span>
1521
<hr>
@@ -81,4 +87,4 @@ <h2 id='tab_title_configuration'>
8187
</table>
8288
</div>
8389
</center>
84-
</div>
90+
</div>

0 commit comments

Comments
 (0)