Skip to content

Updated to 2.1.3c0 version #418

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

Open
wants to merge 1 commit into
base: 2.1
Choose a base branch
from
Open

Updated to 2.1.3c0 version #418

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
8,453 changes: 3,925 additions & 4,528 deletions www/css/bootstrap.css
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions www/css/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,5 @@
"popovers.less",
"modals.less"
],
"js": [],
"customizerUrl": "http://getbootstrap.com/customize/?id=4c7131e1a6b32f2835aea278b14c209d"
"js": []
}
14 changes: 5 additions & 9 deletions www/css/menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
.dropbtn {
padding: 16px;
font-size: 14px;
padding: 14px 16px;
font-size: 16px;
border: none;
cursor: pointer;
}

.dropdown {
position: relative;
display: inline-block;
border-color: #000000;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}

.dropdownselect {
Expand Down Expand Up @@ -58,7 +54,7 @@

.menu-divider {
height: 1px;
margin: 2px 0;
margin: 4px 0;
overflow: hidden;
background-color: #e5e5e5;
}
Expand Down
36 changes: 34 additions & 2 deletions www/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ w25 {

.grid-container {
display: inline-grid;
grid-gap: 10px;
grid-gap: 0px;
padding: 10px;
grid-template-columns: auto auto auto auto auto;
}
Expand Down Expand Up @@ -319,7 +319,6 @@ w25 {
.panel-flex-col {
display: flex;
flex-direction: column;
width: 100%;
}

.panel-flex-center {
Expand Down Expand Up @@ -425,3 +424,36 @@ w25 {
}

.button_txt {}

.topnavbar {
display: flow-root;
padding-top: 5px;
border-bottom: 1px solid #e7e7e7;
}
.lock_UI_label {
margin-bottom: 0px;
position: relative;
top: -1px;
min-width: 145px;
}
#controlPanel,
#grblPanel,
#temperaturesPanel,
#extruderPanel,
#filesPanel,
#commandsPanel {
margin: 8px;
}
#panel-title {
color: #555555;
font-size: 1.25em;
font-weight: bold;
letter-spacing: 0.5px;
}
#commands,
#fileSource {
color: #555555;
font-size: 1.2em;
font-weight: bold;
letter-spacing: 0.25px;
}
35 changes: 19 additions & 16 deletions www/css/tabs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,60 @@
/* Style the tab */
div.tab {
overflow: hidden;
border-left: 1px solid #ccc;
border-right: 1px solid #ccc;
float: left;
background-color: #f1f1f1;
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
background-color: #f1f1f1;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
padding: 10px 22px 0px 22px;
width: 100%;
}


/* Style the buttons inside the tab */
div.tab button {
background-color: inherit;
float: left;
background-color: inherit;
border-top: 1px solid #f1f1f1;
border-bottom: 1px solid #f1f1f1;
border-left: 1px solid #f1f1f1;
border-right: 1px solid #f1f1f1;
outline: none;
cursor: pointer;
padding: 12px 14px;
outline: none;
padding: 14px 16px 10px;
transition: 0.3s;
color: #337AB7;
}

/* Change background color of buttons on hover */
div.tab button:hover {
background-color: #ddd;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
border-left: 1px solid #ddd;
border-right: 1px solid #ddd;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
}

/* Create an active/current tablink class */
div.tab button.active {
background-color: #ffffff;
background-color: #fff;
border-top: 1px solid #ccc;
border-bottom: 1px solid #fff;
border-left: 1px solid #ccc;
border-right: 1px solid #ccc;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
color: #555555;
position: relative;
bottom: -1px;
}

/* Style the tab title */
div.tab button span {
position: relative;
bottom: 0.2em;
}

/* Style the tab content */
.tabcontent {
display: none;
padding: 6px 12px;

}
}
19 changes: 9 additions & 10 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
var target_firmware = "";
</script>
<script>
var web_ui_version = "2.1.3b0";
var web_ui_version = "2.1.3c0";
</script>
<script>
var direct_sd = false;
var direct_sd = true;
</script>
<script>
var fw_version = "";
Expand All @@ -23,14 +23,13 @@
<script>
var secondary_sd = "/sd/";
</script>
<!--removeIf(cleanheader)-->
<!-- removeIf(cleanheader) -->
<link href="css/bootstrap.css" rel="stylesheet" />
<link href="css/menu.css" rel="stylesheet" />
<link href="css/tabs.css" rel="stylesheet" />
<link href="css/modaldlg.css" rel="stylesheet" />
<link href="css/wizard.css" rel="stylesheet" />
<!--endRemoveIf(cleanheader)-->

<!-- endRemoveIf(cleanheader) -->
<!-- smoosh -->
<link href="css/style.css" rel="stylesheet" />
<!-- endsmoosh -->
Expand All @@ -39,15 +38,15 @@
<body>
<div id="loadingmsg">
<center>
<h3>Loading....</h3>
<h3>Loading...</h3>
</center>
</div>
<div id="main_ui" class="container-fluid hide_it">
<div id="main_ui" class="hide_it">
<!-- topnavbar -->
<file-include w3-include-html="'sub/navbar.html'"></file-include>
<!-- /topnavbar -->
<!-- tabbar -->
<file-include w3-include-html="'sub/tab_bar.html'"></file-include>
<file-include w3-include-html="'sub/tabbar.html'"></file-include>
<!-- / tabbar -->
<!-- content -->
<div id="mainuitabscontent">
Expand Down Expand Up @@ -76,7 +75,7 @@ <h3>Loading....</h3>
<file-include w3-include-html="'sub/restartdlg.html'"></file-include>
<file-include w3-include-html="'sub/UIdisableddlg.html'"></file-include>
<!-- / template -->
<!--removeIf(cleanheader)-->
<!-- removeIf(cleanheader) -->
<script src="js/wizard.js"></script>
<script src="js/http.js"></script>
<script src="js/icons.js"></script>
Expand Down Expand Up @@ -112,7 +111,7 @@ <h3>Loading....</h3>
<script src="js/localstorage.js"></script>
<script src="js/UIdisableddlg.js"></script>
<script src="js/custom.js"></script>
<!--endRemoveIf(cleanheader)-->
<!-- endRemoveIf(cleanheader) -->
<!-- smoosh -->
<script src="js/app.js"></script>
<!-- endsmoosh -->
Expand Down
8 changes: 4 additions & 4 deletions www/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ function ontoggleLock(forcevalue) {
if (typeof forcevalue != "undefined")
document.getElementById("lock_UI").checked = forcevalue;
if (document.getElementById("lock_UI").checked) {
document.getElementById("lock_UI_btn_txt").innerHTML =
document.getElementById("lock_UI_text").innerHTML =
translate_text_item("Unlock interface");
disable_items(document.getElementById("maintab"), true);
disable_items(document.getElementById("configtab"), true);
Expand All @@ -263,7 +263,7 @@ function ontoggleLock(forcevalue) {
disable_items(document.getElementById("JogUI"), false);
document.getElementById("JogUI").style.pointerEvents = "none";
} else {
document.getElementById("lock_UI_btn_txt").innerHTML =
document.getElementById("lock_UI_text").innerHTML =
translate_text_item("Lock interface");
disable_items(document.getElementById("maintab"), false);
disable_items(document.getElementById("configtab"), false);
Expand All @@ -281,8 +281,8 @@ function Handle_DHT(data) {
}
var temp = convertDHT2Fahrenheit ? parseFloat(tdata[0]) * 1.8 + 32 : parseFloat(tdata[0]);
document.getElementById("DHT_humidity").innerHTML =
parseFloat(tdata[1]).toFixed(2).toString() + "%";
var temps = temp.toFixed(2).toString() + "&deg;";
parseFloat(tdata[1]).toFixed(2).toString() + " %";
var temps = temp.toFixed(2).toString() + " &deg;";
if (convertDHT2Fahrenheit) temps += "F";
else temps += "C";
document.getElementById("DHT_temperature").innerHTML = temps;
Expand Down
69 changes: 38 additions & 31 deletions www/sub/commandpanel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,49 @@
<div id="commandsPanel" class="panel panel-default panel-flex-col">
<div class="panel-heading">
<b><span translate>Commands</span></b>
<span id="commands" translate>Commands</span>
<button id="clear_monitor_btn" class="btn btn-primary btn-xs pull-right" onclick="Monitor_output_Clear()" translate>Clear</button>
</div>
<div id="command-body" class="panel-body panel-flex-main">
<pre id="cmd_content" style="min-height: 350px; max-height: 350px;"></pre>
<pre id="cmd_content" style="min-height:350px;max-height:350px;"></pre>
</div>
<div class="panel-footer">
<div class="panel-flex-row">
<div class="input-group">
<div class="input-group">
<form autocomplete="off" onsubmit="return false;">
<input autocomplete="off" class="form-control w14" type="text" onkeyup="CustomCommand_OnKeyUp(event)" value="" id="custom_cmd_txt" translateph placeholder="Send Command..." />
</form>
<div class="input-group-btn">
<button class="btn btn-success" onclick="SendCustomCommand();" translate>Send</button>
</div>
</div>
</div>
<table>
<tr>
<td>
<div class="input-group">
<form autocomplete="off" onsubmit="return false;">
<input autocomplete="off" class="form-control w14" type="text" onkeyup="CustomCommand_OnKeyUp(event)" value="" id="custom_cmd_txt" translateph placeholder="Send Command…" />
</form>
<div class="input-group-btn">
<button class="btn btn-success" onclick="SendCustomCommand();" translate>Send</button>
</div>
</div>
</td>
</tr>
</table>
&nbsp;&nbsp;&nbsp;
<table>
<tr>
<td>
<div class="input-group">
<input type="checkbox" onclick="Monitor_check_autoscroll()" id="monitor_enable_autoscroll" />
<span translate>Autoscroll</span>
</div>
</td>
</tr>
</table>
&nbsp;&nbsp;
<div class="form-group">
<div class="checkbox">
<label>
<input type="checkbox" onclick=" Monitor_check_autoscroll()" id="monitor_enable_autoscroll" />
<span translate>Autoscroll</span>
</label>
</div>
</div>
&nbsp;&nbsp;
<div class="form-group" id="cmd_verbose">
<div class="checkbox">
<label>
<input type="checkbox" onclick=" Monitor_check_verbose_mode()" id="monitor_enable_verbose_mode" />
<span translate>Verbose mode</span>
</label>
</div>

</div>
<table>
<tr>
<td>
<div class="input-group">
<input type="checkbox" onclick="Monitor_check_verbose_mode()" id="monitor_enable_verbose_mode" />
<span translate>Verbose mode</span>
</div>
</td>
</tr>
</table>
</div>
</div>
</div>
</div>
24 changes: 15 additions & 9 deletions www/sub/configtab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
<div id="configtab" class="tabcontent">
<center>
<h2 id='tab_title_configuration'>
<h2>
<span translate>Printer configuration</span>
</h2>
<button type="button" id="config_refresh_btn" class="btn btn-primary" onclick="refreshconfig();">
<svg width="1.3em" height="1.2em" viewBox="0 0 1300 1200">
<g transform="translate(50,1200) scale(1, -1)">
<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>
</g>
</svg>
</button>
<table>
<tr>
<td style="padding:10px">
<button type="button" id="config_refresh_btn" class="btn btn-primary" onclick="refreshconfig();">
<svg width="1.3em" height="1.2em" viewBox="0 0 1300 1200">
<g transform="translate(50,1200) scale(1, -1)">
<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>
</g>
</svg>
</button>
</td>
</tr>
</table>
<br>
<span id="config_status"></span>
<hr>
Expand Down Expand Up @@ -81,4 +87,4 @@ <h2 id='tab_title_configuration'>
</table>
</div>
</center>
</div>
</div>
Loading