mirror of https://github.com/jeelabs/esp-link.git
converted the unconditional downloading of YUI compressor and HTML compressor to be conditional - only if they are not already present moved all Javascript blocks from HTML files into separate JS files - otherwise HTML compressor does not compress the inlined Javascript code changed the place of inclusion of JS files into HTML - it is now at the end of BODY instead of beginning (this speeds up the page loading a little) added a page "Firmware" which allows for OTA upgrades - so the utility "wiflash" is no more needed improved the Makefile to show firmware size as a percentage of the available ROM space improved the Makefile to show the espFS size as a percentage of the raw uncompressed size of web assets combined the 2 invokations of HTML compressor in Makefile (once for main folder and once for WIFI folder) into a single one changed 4-5 CSS rules for better visual readability fixed a bug in "cgiGetFirmwareNext" - it was not sending the No-Cache headers and so the browser shows wrong (older, cached) info added "\n" in several DBG() statements I had to rename "base64_decode" because there is same named function inside "ssl_crypto_misc" from the SSL librarypull/173/head
parent
65534229f2
commit
95d7e8e391
@ -1,120 +1,121 @@ |
|||||||
|
<!doctype html> |
||||||
|
<html><head> |
||||||
|
<title>esp-link</title> |
||||||
|
<link rel="stylesheet" href="pure.css"> |
||||||
|
<link rel="stylesheet" href="style.css"> |
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1"> |
||||||
|
</head> |
||||||
|
<body> |
||||||
|
<div id="layout"> |
||||||
<div id="main"> |
<div id="main"> |
||||||
<div class="header"> |
<div class="header"> |
||||||
<h1>Services</h1> |
<h1>Services</h1> |
||||||
</div> |
</div> |
||||||
|
|
||||||
<div class="content"> |
<div class="content"> |
||||||
<div class="pure-g"> |
<div style="float:left; padding:2px"> |
||||||
<div class="pure-u-1 pure-u-md-1-2"> |
<div class="card"> |
||||||
<div class="card"> |
<h1> |
||||||
<h1> |
Syslog |
||||||
Syslog |
<div id="syslog-spinner" class="spinner spinner-small"></div> |
||||||
<div id="syslog-spinner" class="spinner spinner-small"></div> |
</h1> |
||||||
</h1> |
<form action="#" id="Syslog-form" class="pure-form" hidden> |
||||||
<form action="#" id="Syslog-form" class="pure-form" hidden> |
<div class="pure-form-stacked"> |
||||||
<div class="pure-form-stacked"> |
<label>Syslog Host</label> |
||||||
<label>Syslog Host</label> |
<input type="text" name="syslog_host" /> |
||||||
<input type="text" name="syslog_host" /> |
<div class="popup">Esp-link sends event/debug info to this syslog host |
||||||
<div class="popup">Esp-link sends event/debug info to this syslog host |
(hostname:port). Leave empty to disable syslog.</div> |
||||||
(hostname:port). Leave empty to disable syslog.</div> |
</div> |
||||||
</div> |
<div class="pure-form-stacked"> |
||||||
<div class="pure-form-stacked"> |
<label>Min Heap</label> |
||||||
<label>Min Heap</label> |
|
||||||
<div> |
|
||||||
<input type="text" name="syslog_minheap" /> |
|
||||||
<div class="popup">Stop sending syslog if free heap drops below this many bytes</div> |
|
||||||
</div> |
|
||||||
<div> |
|
||||||
<label>Filter</label> |
|
||||||
<select name="syslog_filter" href="#"> |
|
||||||
<option value="0">EMERG</option> |
|
||||||
<option value="1">ALERT</option> |
|
||||||
<option value="2">CRIT</option> |
|
||||||
<option value="3">ERR</option> |
|
||||||
<option value="4">WARNING</option> |
|
||||||
<option value="5">NOTICE</option> |
|
||||||
<option value="6">INFO</option> |
|
||||||
<option value="7">DEBUG</option> |
|
||||||
</select> |
|
||||||
<div class="popup">Minimum severity to send</div> |
|
||||||
</div> |
|
||||||
</div> |
|
||||||
<div> |
<div> |
||||||
<input type="checkbox" name="syslog_showtick" /> |
<input type="text" name="syslog_minheap" /> |
||||||
<label>Include esp-link millisecond ticker</label> |
<div class="popup">Stop sending syslog if free heap drops below this many bytes</div> |
||||||
</div> |
</div> |
||||||
<div> |
<div> |
||||||
<input type="checkbox" name="syslog_showdate" /> |
<label>Filter</label> |
||||||
<label>Include esp-link datetime</label> |
<select name="syslog_filter" href="#"> |
||||||
<div class="popup">Some syslog servers rotate log if timestamp is in the past so disable to prevent this</div> |
<option value="0">EMERG</option> |
||||||
</div> |
<option value="1">ALERT</option> |
||||||
<button id="Syslog-button" type="submit" class="pure-button button-primary"> |
<option value="2">CRIT</option> |
||||||
Update Syslog settings! |
<option value="3">ERR</option> |
||||||
</button> |
<option value="4">WARNING</option> |
||||||
</form> |
<option value="5">NOTICE</option> |
||||||
</div> |
<option value="6">INFO</option> |
||||||
<div class="card"> |
<option value="7">DEBUG</option> |
||||||
<h1> |
</select> |
||||||
mDNS |
<div class="popup">Minimum severity to send</div> |
||||||
<div id="mdns-spinner" class="spinner spinner-small"></div> |
|
||||||
</h1> |
|
||||||
<form action="#" id="mDNS-form" class="pure-form" hidden> |
|
||||||
<div class="form-horizontal"> |
|
||||||
<input type="checkbox" name="mdns_enable"/> |
|
||||||
<label>Enable mDNS</label> |
|
||||||
<div class="popup">Esp-link can advertise its hostname and service name (both |
|
||||||
with a .local suffix) via multicast DNS.</div> |
|
||||||
</div> |
</div> |
||||||
<br> |
</div> |
||||||
<div class="pure-form-stacked"> |
<div> |
||||||
<label>Service Name</label> |
<input type="checkbox" name="syslog_showtick" /> |
||||||
<input type="text" name="mdns_servername"/> |
<label>Include esp-link millisecond ticker</label> |
||||||
<div class="popup">The default service is http. For the arduino IDE use arduino</div> |
</div> |
||||||
</div> |
<div> |
||||||
<button id="mDNS-button" type="submit" class="pure-button button-primary"> |
<input type="checkbox" name="syslog_showdate" /> |
||||||
Update mDNS settings! |
<label>Include esp-link datetime</label> |
||||||
</button> |
<div class="popup">Some syslog servers rotate log if timestamp is in the past so disable to prevent this</div> |
||||||
</form> |
</div> |
||||||
</div> |
<button id="Syslog-button" type="submit" class="pure-button button-primary"> |
||||||
|
Update Syslog settings! |
||||||
|
</button> |
||||||
|
</form> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
<div style="float:left; padding:2px"> |
||||||
|
<div class="card"> |
||||||
|
<h1> |
||||||
|
mDNS |
||||||
|
<div id="mdns-spinner" class="spinner spinner-small"></div> |
||||||
|
</h1> |
||||||
|
<form action="#" id="mDNS-form" class="pure-form" hidden> |
||||||
|
<div class="form-horizontal"> |
||||||
|
<input type="checkbox" name="mdns_enable"/> |
||||||
|
<label>Enable mDNS</label> |
||||||
|
<div class="popup">Esp-link can advertise its hostname and service name (both |
||||||
|
with a .local suffix) via multicast DNS.</div> |
||||||
|
</div> |
||||||
|
<br> |
||||||
|
<div class="pure-form-stacked"> |
||||||
|
<label>Service Name</label> |
||||||
|
<input type="text" name="mdns_servername"/> |
||||||
|
<div class="popup">The default service is http. For the arduino IDE use arduino</div> |
||||||
|
</div> |
||||||
|
<button id="mDNS-button" type="submit" class="pure-button button-primary"> |
||||||
|
Update mDNS settings! |
||||||
|
</button> |
||||||
|
</form> |
||||||
</div> |
</div> |
||||||
<div class="pure-u-1 pure-u-md-1-2"> |
</div> |
||||||
<div class="card"> |
<div style="float:left; padding:2px"> |
||||||
<h1> |
<div class="card"> |
||||||
SNTP |
<h1> |
||||||
<div id="sntp-spinner" class="spinner spinner-small"></div> |
SNTP |
||||||
</h1> |
<div id="sntp-spinner" class="spinner spinner-small"></div> |
||||||
<form action="#" id="SNTP-form" class="pure-form" hidden> |
</h1> |
||||||
<div class="pure-form-stacked"> |
<form action="#" id="SNTP-form" class="pure-form" hidden> |
||||||
<div> |
<div class="pure-form-stacked"> |
||||||
<label>SNTP Server</label> |
<div> |
||||||
<input type="text" name="sntp_server" /> |
<label>SNTP Server</label> |
||||||
<div class="popup">Simple Network Time Protocol server to query. |
<input type="text" name="sntp_server" /> |
||||||
Leave empty to disable SNTP</div> |
<div class="popup">Simple Network Time Protocol server to query. |
||||||
</div> |
Leave empty to disable SNTP</div> |
||||||
<div> |
|
||||||
<label>Timezone Offset</label> |
|
||||||
<input type="text" name="timezone_offset" /> |
|
||||||
<div class="popup">Offset hours to apply (no daylight savings support)</div> |
|
||||||
</div> |
|
||||||
</div> |
</div> |
||||||
<button id="SNTP-button" type="submit" class="pure-button button-primary"> |
<div> |
||||||
Update SNTP settings! |
<label>Timezone Offset (+/- hours)</label> |
||||||
</button> |
<input type="text" name="timezone_offset" /> |
||||||
</form> |
<div class="popup">Offset hours to apply (no daylight savings support)</div> |
||||||
</div> |
</div> |
||||||
|
</div> |
||||||
|
<button id="SNTP-button" type="submit" class="pure-button button-primary"> |
||||||
|
Update SNTP settings! |
||||||
|
</button> |
||||||
|
</form> |
||||||
</div> |
</div> |
||||||
</div> |
</div> |
||||||
</div> |
</div> |
||||||
</div> |
</div> |
||||||
</div> |
</div> |
||||||
|
<script src="ui.js"></script> |
||||||
<script src="services.js"></script> |
<script src="services.js"></script> |
||||||
<script type="text/javascript"> |
|
||||||
onLoad(function() { |
|
||||||
fetchServices(); |
|
||||||
bnd($("#Syslog-form"), "submit", changeServices); |
|
||||||
bnd($("#SNTP-form"), "submit", changeServices); |
|
||||||
bnd($("#mDNS-form"), "submit", changeServices); |
|
||||||
}); |
|
||||||
</script> |
|
||||||
</body></html> |
</body></html> |
||||||
|
@ -1,6 +1,6 @@ |
|||||||
#ifndef BASE64_H |
#ifndef BASE64_H |
||||||
#define BASE64_H |
#define BASE64_H |
||||||
|
|
||||||
int base64_decode(size_t in_len, const char *in, size_t out_len, unsigned char *out); |
int ubase64_decode(size_t in_len, const char *in, size_t out_len, unsigned char *out); |
||||||
|
|
||||||
#endif |
#endif |
Loading…
Reference in new issue