GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-11 17:09:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix trailing spaces thanks @patrickelectric

Browse Source
This commit is contained in:
luc lebosse 2016-10-09 11:13:53 +02:00
parent d30ddc4ecf
commit 318a3050d1
7 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
esp3d/data/404.tpl
View File

@ -1,6 +1,6 @@
<HTML> <HTML>
<HEAD> <HEAD>
<title>Redirecting...</title> <title>Redirecting...</title>
</HEAD> </HEAD>
<BODY> <BODY>
<CENTER>Unknown page - you will be redirected... <CENTER>Unknown page - you will be redirected...
@ -10,14 +10,14 @@ if not redirected, <a href='http://$WEB_ADDRESS$'>click here</a>
<PROGRESS name='prg' id='prg'></PROGRESS> <PROGRESS name='prg' id='prg'></PROGRESS>
<script> <script>
var i = 0; var i = 0;
var x = document.getElementById("prg"); var x = document.getElementById("prg");
x.max=5; x.max=5;
var interval=setInterval(function(){ var interval=setInterval(function(){
i=i+1; i=i+1;
var x = document.getElementById("prg"); var x = document.getElementById("prg");
x.value=i; x.value=i;
if (i>5) if (i>5)
{ {
clearInterval(interval); clearInterval(interval);
window.location.href='/'; window.location.href='/';

2
esp3d/data/header.inc
View File

@ -19,7 +19,7 @@ $INCLUDE[css.inc]$
<td width=100%>&nbsp;</td> <td width=100%>&nbsp;</td>
<td class="$MENU_ADMIN$"><a href="/PASSWORD" style="$DISCONNECT_VISIBILITY$">$LOGIN_ID$</a></td> <td class="$MENU_ADMIN$"><a href="/PASSWORD" style="$DISCONNECT_VISIBILITY$">$LOGIN_ID$</a></td>
<td style="padding:0px;"><a href="/LOGIN?DISCONNECT=YES"><div class="btnroundimg" style="$DISCONNECT_VISIBILITY$"><svg width="30" height="30" viewBox="0 0 40 40"> <td style="padding:0px;"><a href="/LOGIN?DISCONNECT=YES"><div class="btnroundimg" style="$DISCONNECT_VISIBILITY$"><svg width="30" height="30" viewBox="0 0 40 40">
<circle style="fill:white" cx="20" cy="20" r="20"/> <circle style="fill:white" cx="20" cy="20" r="20"/>
<circle style="fill:white;stroke:black;stroke-width:4" cx="20" cy="15" r="10"/> <circle style="fill:white;stroke:black;stroke-width:4" cx="20" cy="15" r="10"/>
<rect style="fill:black;stroke-width:4;stroke:black" width="20" height="15" x="10" y="17" /> <rect style="fill:black;stroke-width:4;stroke:black" width="20" height="15" x="10" y="17" />
<circle style="fill:white" cx="20" cy="22" r="2.5"/> <circle style="fill:white" cx="20" cy="22" r="2.5"/>

8
esp3d/data/password.tpl
View File

@ -32,7 +32,7 @@ function checkpassword()
haserror=true; haserror=true;
hassuccess=false; hassuccess=false;
} }
if (password1.length>16) if (password1.length>16)
{ {
msg+="Password too long<br>"; msg+="Password too long<br>";
@ -40,7 +40,7 @@ function checkpassword()
haserror=true; haserror=true;
hassuccess=false; hassuccess=false;
} }
if (password2.length<1) if (password2.length<1)
{ {
msg+="Confirmation Password too short<br>"; msg+="Confirmation Password too short<br>";
@ -48,7 +48,7 @@ function checkpassword()
haserror=true; haserror=true;
hassuccess=false; hassuccess=false;
} }
if (password2.length>16) if (password2.length>16)
{ {
msg+="Confirmation Password too long<br>"; msg+="Confirmation Password too long<br>";
@ -56,7 +56,7 @@ function checkpassword()
haserror=true; haserror=true;
hassuccess=false; hassuccess=false;
} }
if (password2!=password1) if (password2!=password1)
{ {
msg+="Passwords do not matches<br>"; msg+="Passwords do not matches<br>";

38
esp3d/data/printer.tpl
View File

@ -2,10 +2,10 @@ $INCLUDE[header.inc]$
$INCLUDE[css2.inc]$ $INCLUDE[css2.inc]$
<div class="panel"> <div class="panel">
<div class="panel-heading" ><div class="btnimg" style="float:left;" onclick="control_expanded = expand_collapse(control_expanded,'pin_control','control')" id="pin_control">&#9660;</div>&nbsp;&nbsp;Control</div> <div class="panel-heading" ><div class="btnimg" style="float:left;" onclick="control_expanded = expand_collapse(control_expanded,'pin_control','control')" id="pin_control">&#9660;</div>&nbsp;&nbsp;Control</div>
<div class="panel-body" id="control"> <div class="panel-body" id="control">
<table> <table>
<tr><td style="padding:0px;"> <tr><td style="padding:0px;">
<div id="Extruder1" style="visibility:hidden;height:0px;"> <div id="Extruder1" style="visibility:hidden;height:0px;">
<table><tr><td><label>E1:&nbsp;</label></td> <table><tr><td><label>E1:&nbsp;</label></td>
<td id="data_extruder1" style="overflow: hidden;"></td><td>0<input id="rangeinput1" type="range" min=0 max=270 onchange="Updatenumber('1');">270</td> <td id="data_extruder1" style="overflow: hidden;"></td><td>0<input id="rangeinput1" type="range" min=0 max=270 onchange="Updatenumber('1');">270</td>
<td><input class="form-control" id="numberinput1" type="number" min=0 max=270 step=1 value=0 onchange="Updaterange('1');"></td><td> &#176;C <td><input class="form-control" id="numberinput1" type="number" min=0 max=270 step=1 value=0 onchange="Updaterange('1');"></td><td> &#176;C
@ -79,7 +79,7 @@ $INCLUDE[css2.inc]$
<div class="panel"> <div class="panel">
<div class="panel-heading"><div class="btnimg" style="float:left;" onclick="command_expanded = expand_collapse(command_expanded,'pin_command','command')" id="pin_command">&#9660;</div>&nbsp;&nbsp;Command</div> <div class="panel-heading"><div class="btnimg" style="float:left;" onclick="command_expanded = expand_collapse(command_expanded,'pin_command','command')" id="pin_command">&#9660;</div>&nbsp;&nbsp;Command</div>
<div class="panel-body" id="command"> <div class="panel-body" id="command">
<table width="100%"><tr> <table width="100%"><tr>
<td width="100%"><input class="form-control" id="cmd" type="text" style="width: 100%;"></td> <td width="100%"><input class="form-control" id="cmd" type="text" style="width: 100%;"></td>
<td width="auto"><input type="button" class="btn btn-primary" value="Send" onclick="Sendcustomcommand();"></td></tr></table> <td width="auto"><input type="button" class="btn btn-primary" value="Send" onclick="Sendcustomcommand();"></td></tr></table>
@ -88,7 +88,7 @@ $INCLUDE[css2.inc]$
<div class="panel"> <div class="panel">
<div class="panel-heading"><div class="btnimg" style="float:left;" onclick="information_expanded = expand_collapse(information_expanded,'pin_information','information')" id="pin_information">&#9660;</div>&nbsp;&nbsp;Information</div> <div class="panel-heading"><div class="btnimg" style="float:left;" onclick="information_expanded = expand_collapse(information_expanded,'pin_information','information')" id="pin_information">&#9660;</div>&nbsp;&nbsp;Information</div>
<div class="panel-body" id="information"> <div class="panel-body" id="information">
<table><tr><td> <table><tr><td>
<center><table><tr><td><div class="btnimg" onclick="if(confirm('Clear Info log ?'))Sendcommand('[ESP999]INFO');"> <center><table><tr><td><div class="btnimg" onclick="if(confirm('Clear Info log ?'))Sendcommand('[ESP999]INFO');">
<svg height="20" width="20" viewBox="0 0 40 40" >"; <svg height="20" width="20" viewBox="0 0 40 40" >";
@ -100,7 +100,7 @@ $INCLUDE[css2.inc]$
</div> </div>
<div class="panel"> <div class="panel">
<div class="panel-heading"><div class="btnimg" style="float:left;" onclick="error_expanded = expand_collapse(error_expanded,'pin_error','error')" id="pin_error">&#9660;</div>&nbsp;&nbsp;Error</div> <div class="panel-heading"><div class="btnimg" style="float:left;" onclick="error_expanded = expand_collapse(error_expanded,'pin_error','error')" id="pin_error">&#9660;</div>&nbsp;&nbsp;Error</div>
<div class="panel-body" id="error"> <div class="panel-body" id="error">
<table><tr><td> <table><tr><td>
<center><table><tr><td><div class="btnimg" onclick="if(confirm('Clear Error log ?'))Sendcommand('[ESP999]ERROR');"> <center><table><tr><td><div class="btnimg" onclick="if(confirm('Clear Error log ?'))Sendcommand('[ESP999]ERROR');">
<svg height="20" width="20" viewBox="0 0 40 40" >"; <svg height="20" width="20" viewBox="0 0 40 40" >";
@ -112,7 +112,7 @@ $INCLUDE[css2.inc]$
</div> </div>
<div class="panel"> <div class="panel">
<div class="panel-heading"><div class="btnimg" style="float:left;" onclick="status_expanded = expand_collapse(status_expanded,'pin_status','statusdisplay')" id="pin_status">&#9660;</div>&nbsp;&nbsp;Status</div> <div class="panel-heading"><div class="btnimg" style="float:left;" onclick="status_expanded = expand_collapse(status_expanded,'pin_status','statusdisplay')" id="pin_status">&#9660;</div>&nbsp;&nbsp;Status</div>
<div class="panel-body" id="statusdisplay"> <div class="panel-body" id="statusdisplay">
<table><tr><td> <table><tr><td>
<center><table><tr><td><div class="btnimg" onclick="if(confirm('Clear Status log ?'))Sendcommand('[ESP999]STATUS');"> <center><table><tr><td><div class="btnimg" onclick="if(confirm('Clear Status log ?'))Sendcommand('[ESP999]STATUS');">
<svg height="20" width="20" viewBox="0 0 40 40" >"; <svg height="20" width="20" viewBox="0 0 40 40" >";
@ -371,14 +371,14 @@ var printcommands_expanded = true;
var jog_expanded = true; var jog_expanded = true;
function expand_collapse(flag, targetpin,targetdiv){ function expand_collapse(flag, targetpin,targetdiv){
if (flag) { if (flag) {
document.getElementById(targetpin).innerHTML = '&#9658;'; document.getElementById(targetpin).innerHTML = '&#9658;';
document.getElementById(targetdiv).style.display = 'none'; document.getElementById(targetdiv).style.display = 'none';
return false; return false;
} else { } else {
document.getElementById(targetpin).innerHTML = '&#9660;'; document.getElementById(targetpin).innerHTML = '&#9660;';
document.getElementById(targetdiv).style.display = 'block'; document.getElementById(targetdiv).style.display = 'block';
return true; return true;
} }
} }
var XYfeedrate=$XY_FEEDRATE$; var XYfeedrate=$XY_FEEDRATE$;
var Zfeedrate=$Z_FEEDRATE$; var Zfeedrate=$Z_FEEDRATE$;
@ -393,7 +393,7 @@ xmlhttp.send();
function delay(ms) { function delay(ms) {
ms += new Date().getTime(); ms += new Date().getTime();
while (new Date() < ms){} while (new Date() < ms){}
} }
function SendJogcommand( cmd, feedrate){ function SendJogcommand( cmd, feedrate){
Sendcommand("G91"); Sendcommand("G91");
@ -527,20 +527,20 @@ document.getElementById("posy").innerHTML=jsonresponse.Ypos;
document.getElementById("posz").innerHTML=jsonresponse.Zpos; document.getElementById("posz").innerHTML=jsonresponse.Zpos;
displaystatus(jsonresponse.status); displaystatus(jsonresponse.status);
var content=""; var content="";
for (i = 0; i < jsonresponse.InformationMsg.length; i++) { for (i = 0; i < jsonresponse.InformationMsg.length; i++) {
if (i==jsonresponse.InformationMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.InformationMsg[i].line+ "</b>"; if (i==jsonresponse.InformationMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.InformationMsg[i].line+ "</b>";
else content +="<li style='list-style-type: circle;'>"+jsonresponse.InformationMsg[i].line; else content +="<li style='list-style-type: circle;'>"+jsonresponse.InformationMsg[i].line;
content += "</li>";} content += "</li>";}
document.getElementById("infomsg").innerHTML=content; document.getElementById("infomsg").innerHTML=content;
content=""; content="";
for (i = 0; i < jsonresponse.ErrorMsg.length; i++){ for (i = 0; i < jsonresponse.ErrorMsg.length; i++){
if (i==jsonresponse.ErrorMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.ErrorMsg[i].line+ "</b>"; if (i==jsonresponse.ErrorMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.ErrorMsg[i].line+ "</b>";
else content +="<li style='list-style-type: circle;'>"+jsonresponse.ErrorMsg[i].line; else content +="<li style='list-style-type: circle;'>"+jsonresponse.ErrorMsg[i].line;
content +="</li>";} content +="</li>";}
document.getElementById("errormsg").innerHTML=content; document.getElementById("errormsg").innerHTML=content;
content=""; content="";
for (i = 0; i < jsonresponse.StatusMsg.length; i++) for (i = 0; i < jsonresponse.StatusMsg.length; i++)
{ {
if (i==jsonresponse.StatusMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.StatusMsg[i].line+ "</b>"; if (i==jsonresponse.StatusMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.StatusMsg[i].line+ "</b>";
else content +="<li style='list-style-type: circle;'>"+jsonresponse.StatusMsg[i].line; else content +="<li style='list-style-type: circle;'>"+jsonresponse.StatusMsg[i].line;
content +="</li>"; content +="</li>";
@ -585,7 +585,7 @@ xmlhttp.send();
} }
} }
var currentpath = "/"; var currentpath = "/";
function navbar(){ function navbar(){
var content="<table><tr>"; var content="<table><tr>";
var tlist = currentpath.split("/"); var tlist = currentpath.split("/");
@ -741,7 +741,7 @@ if (String(jsonresponse.files[i].size) == "-1")
content +="<TD width='0%'><div class=\"btnimg\" onclick=\"Deletedir('"+jsonresponse.files[i].name+"','line"+linenumber+"')\">"; content +="<TD width='0%'><div class=\"btnimg\" onclick=\"Deletedir('"+jsonresponse.files[i].name+"','line"+linenumber+"')\">";
content +=trash_icon(); content +=trash_icon();
content +="</div></TD>"; content +="</div></TD>";
} }
content +="<td></td><td></td></TR>"; content +="<td></td><td></td></TR>";
linenumber++; linenumber++;
} }
@ -749,7 +749,7 @@ if (String(jsonresponse.files[i].size) == "-1")
} }
document.getElementById('file_list').innerHTML=content; document.getElementById('file_list').innerHTML=content;
document.getElementById('path').innerHTML=navbar();} document.getElementById('path').innerHTML=navbar();}
function Delete(filename,icon){ function Delete(filename,icon){
if (confirm("Confirm deletion of file: " + filename)) { if (confirm("Confirm deletion of file: " + filename)) {
document.getElementById(icon).innerHTML = "<div id=\"loader\" class=\"loader\"></div>"; document.getElementById(icon).innerHTML = "<div id=\"loader\" class=\"loader\"></div>";
@ -757,10 +757,10 @@ if (confirm("Confirm deletion of file: " + filename)) {
{ {
Sendcommand("M30 " + filename); Sendcommand("M30 " + filename);
refreshSDfiles(); refreshSDfiles();
} }
else{ else{
SendFileCommand("delete",filename); SendFileCommand("delete",filename);
} }
} }
} }
function Deletedir(filename,icon){ function Deletedir(filename,icon){

16
esp3d/data/restart.tpl
View File

@ -1,6 +1,6 @@
<HTML> <HTML>
<HEAD> <HEAD>
<title>Restarting...</title> <title>Restarting...</title>
</HEAD> </HEAD>
<BODY> <BODY>
<CENTER>Restarting, please wait.... <CENTER>Restarting, please wait....
@ -9,14 +9,14 @@
</CENTER> </CENTER>
<script> <script>
var i = 0; var i = 0;
var interval; var interval;
var x = document.getElementById("prg"); var x = document.getElementById("prg");
x.max=40; x.max=40;
interval = setInterval(function(){ interval = setInterval(function(){
i=i+1; i=i+1;
var x = document.getElementById("prg"); var x = document.getElementById("prg");
x.value=i; x.value=i;
if (i>40) if (i>40)
{ {
clearInterval(interval); clearInterval(interval);
window.location.href='/'; window.location.href='/';

2
esp3d/data/settings.tpl
View File

@ -47,7 +47,7 @@ $SUCCESS_MSG$
</div> </div>
</div> </div>
<script> <script>
var currentpath = "/"; var currentpath = "/";
function navbar(){ function navbar(){
var content="<table><tr>"; var content="<table><tr>";
var tlist = currentpath.split("/"); var tlist = currentpath.split("/");

14
esp3d/data/system.tpl
View File

@ -85,14 +85,14 @@ if (jsonresponse.status=='2')alert('Update canceled!');
else if (jsonresponse.status=='3') else if (jsonresponse.status=='3')
{ {
var i = 0; var i = 0;
var interval; var interval;
var x = document.getElementById("prg"); var x = document.getElementById("prg");
x.max=40; x.max=40;
interval = setInterval(function(){ interval = setInterval(function(){
i=i+1; i=i+1;
var x = document.getElementById("prg"); var x = document.getElementById("prg");
x.value=i; x.value=i;
if (i>40) if (i>40)
{ {
clearInterval(interval); clearInterval(interval);
location.reload(); location.reload();