mirror of
https://github.com/alexhopeoconnor/WiFiManager.git
synced 2026-10-04 02:48:13 +10:00
Portal UI: design tokens, cards, nav, WiFi scan rows
- Replace legacy centered stylesheet with CSS variables, layout shell, pill navigation with active state, cards, form fields, buttons. - Restructure SPA markup (hero, page heads, scan list as tap rows). - Shell dialog buttons use wm-btn classes for consistent styling.
This commit is contained in:
@@ -14,51 +14,169 @@
|
||||
#include <Arduino.h>
|
||||
|
||||
const char CSS_STYLE[] PROGMEM = "<style>"
|
||||
".c,body{text-align:center;font-family:verdana}div,input,select{padding:5px;font-size:1em;margin:5px 0;box-sizing:border-box}"
|
||||
"input,button,select,.msg{border-radius:.3rem;width: 100%}input[type=radio],input[type=checkbox]{width:auto}"
|
||||
"button,input[type='button'],input[type='submit']{cursor:pointer;border:0;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%}"
|
||||
"input[type='file']{border:1px solid #1fa3ec}"
|
||||
".wrap {text-align:left;display:inline-block;min-width:260px;max-width:500px}"
|
||||
// links
|
||||
"a{color:#000;font-weight:700;text-decoration:none}a:hover{color:#1fa3ec;text-decoration:underline}"
|
||||
/* Design tokens */
|
||||
":root{"
|
||||
"--wm-bg:#f0f4f8;"
|
||||
"--wm-surface:#ffffff;"
|
||||
"--wm-text:#0f172a;"
|
||||
"--wm-muted:#64748b;"
|
||||
"--wm-border:#e2e8f0;"
|
||||
"--wm-brand:#0ea5e9;"
|
||||
"--wm-brand-hover:#0284c7;"
|
||||
"--wm-danger:#dc2626;"
|
||||
"--wm-danger-hover:#b91c1c;"
|
||||
"--wm-success:#16a34a;"
|
||||
"--wm-radius:12px;"
|
||||
"--wm-radius-sm:8px;"
|
||||
"--wm-shadow:0 1px 3px rgba(15,23,42,.08),0 4px 16px rgba(15,23,42,.06);"
|
||||
"--wm-font:system-ui,-apple-system,'Segoe UI',Roboto,'Helvetica Neue',Arial,sans-serif;"
|
||||
"}"
|
||||
"body.invert{"
|
||||
"--wm-bg:#0c1222;"
|
||||
"--wm-surface:#151d2e;"
|
||||
"--wm-text:#f1f5f9;"
|
||||
"--wm-muted:#94a3b8;"
|
||||
"--wm-border:#334155;"
|
||||
"--wm-brand:#38bdf8;"
|
||||
"--wm-brand-hover:#7dd3fc;"
|
||||
"--wm-danger:#f87171;"
|
||||
"--wm-danger-hover:#fca5a5;"
|
||||
"--wm-success:#4ade80;"
|
||||
"--wm-shadow:0 4px 24px rgba(0,0,0,.45);"
|
||||
"}"
|
||||
/* Base */
|
||||
"*,*::before,*::after{box-sizing:border-box}"
|
||||
"body.portal{margin:0;min-height:100vh;background:var(--wm-bg);color:var(--wm-text);"
|
||||
"font-family:var(--wm-font);font-size:16px;line-height:1.5;-webkit-text-size-adjust:100%;text-align:left}"
|
||||
"a{color:var(--wm-brand);font-weight:600;text-decoration:none}"
|
||||
"a:hover{color:var(--wm-brand-hover);text-decoration:underline}"
|
||||
/* Layout shell */
|
||||
".wm-layout{width:100%;max-width:420px;margin:0 auto;padding:16px 18px 28px;}"
|
||||
"h1,h2,h3{margin:0 0 .35em;font-weight:700;letter-spacing:-.02em}"
|
||||
"h1{font-size:1.5rem}"
|
||||
"h2{font-size:1.15rem}"
|
||||
"h3{font-size:1rem}"
|
||||
"p{margin:.5em 0}"
|
||||
/* Top navigation */
|
||||
".wm-nav{display:flex;flex-wrap:wrap;gap:8px;margin:0 0 20px;padding:6px;"
|
||||
"background:var(--wm-surface);border-radius:var(--wm-radius);box-shadow:var(--wm-shadow);border:1px solid var(--wm-border)}"
|
||||
".wm-nav-link{display:inline-flex;align-items:center;justify-content:center;padding:10px 14px;border-radius:var(--wm-radius-sm);"
|
||||
"font-size:.9rem;font-weight:600;color:var(--wm-muted);text-decoration:none;border:1px solid transparent}"
|
||||
".wm-nav-link:hover{color:var(--wm-brand);background:rgba(14,165,233,.08);text-decoration:none}"
|
||||
"body.invert .wm-nav-link:hover{background:rgba(56,189,248,.12)}"
|
||||
".wm-nav-link--active{color:var(--wm-text);background:rgba(14,165,233,.15);border-color:rgba(14,165,233,.35)}"
|
||||
"body.invert .wm-nav-link--active{background:rgba(56,189,248,.2);border-color:rgba(56,189,248,.4)}"
|
||||
/* Hero / page chrome */
|
||||
".wm-hero{margin-bottom:20px}"
|
||||
".wm-hero-title{font-size:1.65rem;line-height:1.2;margin-bottom:.25em}"
|
||||
".wm-hero-sub{font-size:1rem;color:var(--wm-muted);font-weight:500;margin:0}"
|
||||
".wm-page-head{margin-bottom:16px}"
|
||||
".wm-page-head h1{font-size:1.45rem}"
|
||||
".wm-page-desc{font-size:.95rem;color:var(--wm-muted);margin:.35em 0 0}"
|
||||
/* Cards */
|
||||
".wm-card{background:var(--wm-surface);border:1px solid var(--wm-border);border-radius:var(--wm-radius);"
|
||||
"box-shadow:var(--wm-shadow);padding:18px 16px;margin-bottom:16px;text-align:left}"
|
||||
".wm-card-title{font-size:1rem;margin:0 0 12px;padding-bottom:10px;border-bottom:1px solid var(--wm-border);"
|
||||
"color:var(--wm-text)}"
|
||||
".wm-lead{margin:0 0 8px;font-size:.95rem;color:var(--wm-muted);line-height:1.5}"
|
||||
/* Callout / status */
|
||||
".wm-callout{padding:12px 14px;border-radius:var(--wm-radius-sm);border:1px solid var(--wm-border);"
|
||||
"background:rgba(14,165,233,.06);margin-bottom:16px}"
|
||||
"body.invert .wm-callout{background:rgba(56,189,248,.08)}"
|
||||
".wm-callout--info{border-left:4px solid var(--wm-brand)}"
|
||||
".wm-status{margin:0;font-size:.9rem}"
|
||||
/* Form fields */
|
||||
".wm-field{margin-bottom:14px;text-align:left}"
|
||||
".wm-field:last-child{margin-bottom:0}"
|
||||
".wm-field label{display:block;font-size:.82rem;font-weight:600;color:var(--wm-muted);margin-bottom:6px}"
|
||||
"input[type=text],input[type=password],input[type=number],input[type=email],select{"
|
||||
"display:block;width:100%;padding:12px 14px;font-size:1rem;font-family:inherit;"
|
||||
"color:var(--wm-text);background:var(--wm-bg);border:1px solid var(--wm-border);border-radius:var(--wm-radius-sm);"
|
||||
"-webkit-appearance:none;appearance:none}"
|
||||
"input:focus,select:focus{outline:2px solid var(--wm-brand);outline-offset:0;border-color:var(--wm-brand)}"
|
||||
"input[type=radio],input[type=checkbox]{width:auto;margin-right:8px;accent-color:var(--wm-brand)}"
|
||||
".wm-checkbox-row{display:flex;align-items:center;gap:8px;margin:12px 0;font-size:.92rem}"
|
||||
".wm-checkbox-row label{display:inline;margin:0;font-weight:500;color:var(--wm-text)}"
|
||||
".wm-form-actions{margin-top:16px}"
|
||||
/* Buttons */
|
||||
".wm-btn{display:inline-flex;align-items:center;justify-content:center;min-height:44px;padding:0 18px;"
|
||||
"font-size:1rem;font-weight:600;font-family:inherit;border-radius:var(--wm-radius-sm);border:0;cursor:pointer;"
|
||||
"transition:background .15s,transform .1s,opacity .15s}"
|
||||
".wm-btn:disabled{opacity:.5;cursor:not-allowed}"
|
||||
".wm-btn:active{transform:scale(.98)}"
|
||||
"a.wm-btn{box-sizing:border-box;text-decoration:none}"
|
||||
".wm-btn--block{width:100%}"
|
||||
".wm-btn--primary{background:var(--wm-brand);color:#fff}"
|
||||
".wm-btn--primary:hover{background:var(--wm-brand-hover)}"
|
||||
".wm-btn--secondary{background:var(--wm-bg);color:var(--wm-text);border:1px solid var(--wm-border)}"
|
||||
".wm-btn--secondary:hover{border-color:var(--wm-brand);color:var(--wm-brand)}"
|
||||
".wm-btn--danger{background:var(--wm-danger);color:#fff}"
|
||||
".wm-btn--danger:hover{background:var(--wm-danger-hover)}"
|
||||
"input[type=file]{width:100%;padding:10px;border:1px dashed var(--wm-border);border-radius:var(--wm-radius-sm);"
|
||||
"background:var(--wm-bg);font-size:.9rem}"
|
||||
/* Legacy: unclassed submit in forms */
|
||||
"button[type=submit],.wm-form-actions .wm-btn--primary{background:var(--wm-brand);color:#fff}"
|
||||
"button[type=submit]:hover{background:var(--wm-brand-hover)}"
|
||||
/* Device actions / button stack */
|
||||
".wm-actions-stack{display:flex;flex-direction:column;gap:10px;margin-top:4px}"
|
||||
".wm-btn-group{display:flex;flex-direction:column;gap:10px}"
|
||||
/* WiFi scan list */
|
||||
".wm-scan-list{margin:0 0 12px;border:1px solid var(--wm-border);border-radius:var(--wm-radius-sm);"
|
||||
"overflow:hidden;background:var(--wm-bg)}"
|
||||
".wm-scan-row{display:flex;align-items:center;gap:10px;min-height:48px;padding:10px 12px;"
|
||||
"border-bottom:1px solid var(--wm-border);text-decoration:none;color:inherit;cursor:pointer}"
|
||||
".wm-scan-row:last-child{border-bottom:0}"
|
||||
".wm-scan-row:hover{background:rgba(14,165,233,.1)}"
|
||||
"body.invert .wm-scan-row:hover{background:rgba(56,189,248,.12)}"
|
||||
".wm-scan-ssid{flex:1;min-width:0;font-weight:600;font-size:.95rem;text-align:left;word-break:break-word}"
|
||||
".wm-scan-signal{display:flex;align-items:center;gap:6px;flex-shrink:0;font-size:.8rem;color:var(--wm-muted);font-weight:600}"
|
||||
// quality icons
|
||||
".q{height:16px;margin:0;padding:0 5px;text-align:right;min-width:38px;float:right}.q.q-0:after{background-position-x:0}.q.q-1:after{background-position-x:-16px}.q.q-2:after{background-position-x:-32px}.q.q-3:after{background-position-x:-48px}.q.q-4:after{background-position-x:-64px}.q.l:before{background-position-x:-80px;padding-right:5px}.ql .q{float:left}.q:after,.q:before{content:'';width:16px;height:16px;display:inline-block;background-repeat:no-repeat;background-position: 16px 0;"
|
||||
".q{height:16px;width:16px;margin:0;padding:0;flex-shrink:0}.q.q-0:after{background-position-x:0}.q.q-1:after{background-position-x:-16px}.q.q-2:after{background-position-x:-32px}.q.q-3:after{background-position-x:-48px}.q.q-4:after{background-position-x:-64px}.q.l:before{background-position-x:-80px;padding-right:5px}.ql .q{float:left}.q:after,.q:before{content:'';width:16px;height:16px;display:inline-block;background-repeat:no-repeat;background-position:16px 0;"
|
||||
"background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAAQCAMAAADeZIrLAAAAJFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADHJj5lAAAAC3RSTlMAIjN3iJmqu8zd7vF8pzcAAABsSURBVHja7Y1BCsAwCASNSVo3/v+/BUEiXnIoXkoX5jAQMxTHzK9cVSnvDxwD8bFx8PhZ9q8FmghXBhqA1faxk92PsxvRc2CCCFdhQCbRkLoAQ3q/wWUBqG35ZxtVzW4Ed6LngPyBU2CobdIDQ5oPWI5nCUwAAAAASUVORK5CYII=');}"
|
||||
// icons @2x media query (32px rescaled)
|
||||
"@media (-webkit-min-device-pixel-ratio: 2),(min-resolution: 192dpi){.q:before,.q:after {"
|
||||
"background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALwAAAAgCAMAAACfM+KhAAAALVBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAOrOgAAAADnRSTlMAESIzRGZ3iJmqu8zd7gKjCLQAAACmSURBVHgB7dDBCoMwEEXRmKlVY3L//3NLhyzqIqSUggy8uxnhCR5Mo8xLt+14aZ7wwgsvvPA/ofv9+44334UXXngvb6XsFhO/VoC2RsSv9J7x8BnYLW+AjT56ud/uePMdb7IP8Bsc/e7h8Cfk912ghsNXWPpDC4hvN+D1560A1QPORyh84VKLjjdvfPFm++i9EWq0348XXnjhhT+4dIbCW+WjZim9AKk4UZMnnCEuAAAAAElFTkSuQmCC');"
|
||||
"background-size: 95px 16px;}}"
|
||||
// msg callouts
|
||||
".msg{padding:20px;margin:20px 0;border:1px solid #eee;border-left-width:5px;border-left-color:#777}.msg h4{margin-top:0;margin-bottom:5px}.msg.P{border-left-color:#1fa3ec}.msg.P h4{color:#1fa3ec}.msg.D{border-left-color:#dc3630}.msg.D h4{color:#dc3630}.msg.S{border-left-color: #5cb85c}.msg.S h4{color: #5cb85c}"
|
||||
// lists
|
||||
"dt{font-weight:bold}dd{margin:0;padding:0 0 0.5em 0;min-height:12px}"
|
||||
"td{vertical-align: top;}"
|
||||
// messages from firmware / server
|
||||
".msg{padding:16px;margin:12px 0;border-radius:var(--wm-radius-sm);border:1px solid var(--wm-border);"
|
||||
"border-left-width:4px;border-left-color:var(--wm-muted);background:var(--wm-surface);text-align:left}"
|
||||
".msg h4{margin:0 0 8px;font-size:1rem}"
|
||||
".msg.P{border-left-color:var(--wm-brand)}.msg.P h4{color:var(--wm-brand)}"
|
||||
".msg.D{border-left-color:var(--wm-danger)}.msg.D h4{color:var(--wm-danger)}"
|
||||
".msg.S{border-left-color:var(--wm-success)}.msg.S h4{color:var(--wm-success)}"
|
||||
"dt{font-weight:700;font-size:.85rem;color:var(--wm-muted)}dd{margin:2px 0 12px 0;padding:0;font-size:.95rem}"
|
||||
"td{vertical-align:top}"
|
||||
".h{display:none}"
|
||||
"button{transition: 0s opacity;transition-delay: 3s;transition-duration: 0s;cursor: pointer}"
|
||||
"button.D{background-color:#dc3630}"
|
||||
"button:active{opacity:50% !important;cursor:wait;transition-delay: 0s}"
|
||||
// invert
|
||||
"body.invert{background-color:#060606;}"
|
||||
"body.invert,body.invert a,body.invert h1 {color:#fff;}"
|
||||
"body.invert .msg{color:#fff;background-color:#282828;border-top:1px solid #555;border-right:1px solid #555;border-bottom:1px solid #555;}"
|
||||
"body.invert .q[role=img]{-webkit-filter:invert(1);filter:invert(1);}"
|
||||
":disabled {opacity: 0.5;}"
|
||||
// toast + modal (SPA-native feedback; no window.alert)
|
||||
".wm-toast{position:fixed;left:50%;top:12px;transform:translateX(-50%);z-index:10001;max-width:92%;padding:10px 14px;border-radius:.35rem;"
|
||||
"box-shadow:0 2px 8px rgba(0,0,0,.2);font-size:.95rem;text-align:center;font-weight:600}"
|
||||
".wm-toast.ok{background:#e8f7ef;border:1px solid #5cb85c;color:#1a3d24}"
|
||||
".wm-toast.err{background:#fdeaea;border:1px solid #dc3630;color:#5c1616}"
|
||||
/* Info page key-value grid */
|
||||
".wm-kv{margin:0;padding:0}"
|
||||
".wm-kv dt{padding-top:10px}"
|
||||
".wm-kv dt:first-of-type{padding-top:0}"
|
||||
".wm-kv dd{margin-left:0;padding-bottom:4px;border-bottom:1px solid var(--wm-border)}"
|
||||
".wm-kv dd:last-of-type{border-bottom:0}"
|
||||
/* Feedback areas */
|
||||
"#wm-wifi-msg,#wm-param-msg{font-size:.9rem;margin-top:12px;min-height:1.2em;color:var(--wm-muted)}"
|
||||
"#wm-ota-log{font-size:.8rem;background:var(--wm-bg);padding:12px;border-radius:var(--wm-radius-sm);"
|
||||
"border:1px solid var(--wm-border);overflow:auto;max-height:160px}"
|
||||
// invert legacy body
|
||||
"body.invert{background-color:var(--wm-bg)}"
|
||||
"body.invert .msg{border-color:var(--wm-border)}"
|
||||
"body.invert .q[role=img]{-webkit-filter:invert(1);filter:invert(1)}"
|
||||
":disabled{opacity:.55}"
|
||||
// toast + modal
|
||||
".wm-toast{position:fixed;left:50%;top:12px;transform:translateX(-50%);z-index:10001;max-width:92%;padding:12px 16px;border-radius:var(--wm-radius-sm);"
|
||||
"box-shadow:var(--wm-shadow);font-size:.95rem;text-align:center;font-weight:600}"
|
||||
".wm-toast.ok{background:rgba(22,163,74,.15);border:1px solid var(--wm-success);color:var(--wm-text)}"
|
||||
".wm-toast.err{background:rgba(220,38,38,.12);border:1px solid var(--wm-danger);color:var(--wm-text)}"
|
||||
".wm-dialog{position:fixed;inset:0;z-index:10000;display:none;align-items:center;justify-content:center;padding:16px;box-sizing:border-box}"
|
||||
".wm-dialog-backdrop{position:absolute;inset:0;background:rgba(0,0,0,.45)}"
|
||||
".wm-dialog-panel{position:relative;z-index:1;background:#fff;border-radius:.4rem;padding:16px 18px;max-width:420px;width:100%;box-shadow:0 4px 24px rgba(0,0,0,.25);text-align:left}"
|
||||
".wm-dialog-msg{margin:0 0 12px 0;line-height:1.35}"
|
||||
".wm-dialog-actions{display:flex;gap:10px;justify-content:flex-end}"
|
||||
".wm-dialog-actions button{width:auto;min-width:100px}"
|
||||
".wm-dialog-ok{background-color:#1fa3ec !important}"
|
||||
"body.invert .wm-dialog-panel{background:#222;color:#fff;border:1px solid #444}"
|
||||
"body.invert .wm-toast.ok{background:#1a3322;border-color:#5cb85c;color:#d8f5e4}"
|
||||
"body.invert .wm-toast.err{background:#3a1818;border-color:#dc3630;color:#ffd4d4}"
|
||||
".wm-dialog-backdrop{position:absolute;inset:0;background:rgba(15,23,42,.5)}"
|
||||
".wm-dialog-panel{position:relative;z-index:1;background:var(--wm-surface);border-radius:var(--wm-radius);padding:20px 18px;max-width:400px;width:100%;"
|
||||
"box-shadow:var(--wm-shadow);border:1px solid var(--wm-border);text-align:left}"
|
||||
".wm-dialog-msg{margin:0 0 16px;line-height:1.45;color:var(--wm-text)}"
|
||||
".wm-dialog-actions{display:flex;gap:10px;justify-content:flex-end;flex-wrap:wrap}"
|
||||
".wm-dialog-actions .wm-btn{min-width:108px}"
|
||||
".wm-dialog-ok,.wm-btn.wm-dialog-ok{background:var(--wm-brand)!important;color:#fff!important}"
|
||||
".wm-dialog-ok:hover{background:var(--wm-brand-hover)!important}"
|
||||
"body.invert .wm-toast.ok{background:rgba(22,163,74,.2)}"
|
||||
"body.invert .wm-toast.err{background:rgba(220,38,38,.2)}"
|
||||
"</style>";
|
||||
|
||||
#endif // _CSS_TEMPLATES_H_
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ function setView(html){
|
||||
if(!a)return;
|
||||
stopWifiScanPolling();
|
||||
stopWifiConnectPolling();
|
||||
a.innerHTML="<div class='wrap'>"+html+"</div>";
|
||||
a.innerHTML="<div class='wm-layout'>"+html+"</div>";
|
||||
bindPortalChromeEvents();
|
||||
bindFormSubmitHandlers();
|
||||
}
|
||||
@@ -90,13 +90,15 @@ function renderMetaField(f){
|
||||
var nm=f.name||f.id||'';
|
||||
var domId=(id==='s')?'wm-s':(id==='p')?'wm-p':('wm-f-'+id);
|
||||
var t=f.type||'text';
|
||||
var h='<label for="'+domId+'">'+esc(f.label||'')+'</label>';
|
||||
var h='<div class="wm-field">';
|
||||
h+='<label for="'+domId+'">'+esc(f.label||'')+'</label>';
|
||||
h+='<input id="'+domId+'" name="'+esc(nm)+'" type="'+esc(t)+'"';
|
||||
if(f.maxlength)h+=' maxlength="'+f.maxlength+'"';
|
||||
if(f.value!==undefined&&f.value!==null)h+=' value="'+esc(f.value)+'"';
|
||||
if(f.placeholder)h+=' placeholder="'+esc(f.placeholder)+'"';
|
||||
if(f.customAttrs)h+=' '+f.customAttrs;
|
||||
h+='/>';
|
||||
h+='</div>';
|
||||
return h;
|
||||
}
|
||||
|
||||
@@ -107,36 +109,43 @@ function renderFieldList(arr){
|
||||
return h;
|
||||
}
|
||||
|
||||
function navBar(){
|
||||
function navBar(active){
|
||||
active=active||'home';
|
||||
var f=boot.features||{};
|
||||
var h="<p style='text-align:center'>";
|
||||
h+="<a href='#/'>Home</a> · ";
|
||||
h+="<a href='#/wifi'>WiFi</a>";
|
||||
if(!f.paramsInWifi){h+=" · <a href='#/setup'>Setup</a>";}
|
||||
if(f.showInfo!==false){h+=" · <a href='#/info'>Info</a>";}
|
||||
if(f.showUpdate){h+=" · <a href='#/update'>Update</a>";}
|
||||
if(boot.showBack){h+=" · <a href='#' id='wm-nav-back'>Back</a>";}
|
||||
h+="</p><hr/>";
|
||||
var h="<nav class='wm-nav' aria-label='Configuration'>";
|
||||
h+="<a class='wm-nav-link"+(active==='home'?' wm-nav-link--active':'')+"' href='#/'>Home</a>";
|
||||
h+="<a class='wm-nav-link"+(active==='wifi'?' wm-nav-link--active':'')+"' href='#/wifi'>WiFi</a>";
|
||||
if(!f.paramsInWifi){h+="<a class='wm-nav-link"+(active==='setup'?' wm-nav-link--active':'')+"' href='#/setup'>Setup</a>";}
|
||||
if(f.showInfo!==false){h+="<a class='wm-nav-link"+(active==='info'?' wm-nav-link--active':'')+"' href='#/info'>Info</a>";}
|
||||
if(f.showUpdate){h+="<a class='wm-nav-link"+(active==='update'?' wm-nav-link--active':'')+"' href='#/update'>Update</a>";}
|
||||
if(boot.showBack){h+="<a href='#' class='wm-nav-link' id='wm-nav-back'>Back</a>";}
|
||||
h+="</nav>";
|
||||
return h;
|
||||
}
|
||||
|
||||
function deviceActionsHtml(){
|
||||
var f=boot.features||{};
|
||||
var h='', ok=false;
|
||||
if(f.showRestart){h+="<p><button type='button' id='wm-restart-btn'>Restart</button></p>";ok=true;}
|
||||
if(f.showExitPortal){h+="<p><button type='button' id='wm-exit-btn'>Exit portal</button></p>";ok=true;}
|
||||
if(f.showCloseCaptive){h+="<p><button type='button' id='wm-close-captive-btn'>Stop captive portal detection</button></p>";ok=true;}
|
||||
if(f.showRestart){h+="<button type='button' class='wm-btn wm-btn--secondary wm-btn--block' id='wm-restart-btn'>Restart device</button>";ok=true;}
|
||||
if(f.showExitPortal){h+="<button type='button' class='wm-btn wm-btn--secondary wm-btn--block' id='wm-exit-btn'>Exit portal</button>";ok=true;}
|
||||
if(f.showCloseCaptive){h+="<button type='button' class='wm-btn wm-btn--secondary wm-btn--block' id='wm-close-captive-btn'>Stop captive portal</button>";ok=true;}
|
||||
if(!ok)return'';
|
||||
return "<div class='device-actions'><h3>Device actions</h3>"+h+"</div>";
|
||||
return "<div class='wm-card'><h2 class='wm-card-title'>Device</h2><div class='wm-btn-group'>"+h+"</div></div>";
|
||||
}
|
||||
|
||||
function viewHome(){
|
||||
var sub=esc(boot.subtitle||'');
|
||||
var t=esc(boot.title||'WiFiManager');
|
||||
var html=navBar();
|
||||
html+="<h1>"+t+"</h1><h3>"+sub+"</h3>";
|
||||
if(boot.initialStatus)html+="<p class='status'>"+esc(boot.initialStatus)+"</p>";
|
||||
html+="<p>Use the links above to configure WiFi, view device info, or update firmware.</p>";
|
||||
var html=navBar('home');
|
||||
html+="<header class='wm-hero'><h1 class='wm-hero-title'>"+t+"</h1>";
|
||||
if(sub)html+="<p class='wm-hero-sub'>"+sub+"</p>";
|
||||
html+="</header>";
|
||||
if(boot.initialStatus){
|
||||
html+="<div class='wm-callout wm-callout--info'><p class='wm-status'>"+esc(boot.initialStatus)+"</p></div>";
|
||||
}
|
||||
html+="<div class='wm-card'><h2 class='wm-card-title'>Get started</h2>";
|
||||
html+="<p class='wm-lead'>Use <strong>WiFi</strong> to scan networks and connect. Open <strong>Info</strong> for addresses and firmware actions";
|
||||
html+=".</p></div>";
|
||||
html+=deviceActionsHtml();
|
||||
setView(html);
|
||||
}
|
||||
@@ -171,27 +180,38 @@ function startWifiScanPolling(box){
|
||||
}
|
||||
|
||||
function renderScanList(data){
|
||||
if(!data||data.scanning){return '<p>Scanning for networks...</p>';}
|
||||
if(data.error==='timeout')return '<p>Scan timed out. Try Refresh.</p>';
|
||||
if(data.error==='failed')return '<p>Scan failed.</p>';
|
||||
if(!data.networks||data.count===0)return '<p>No networks found.</p>';
|
||||
var html='',i,n,q,pct,qi,enc;
|
||||
if(!data||data.scanning){
|
||||
return "<div class='wm-scan-list'><p class='wm-lead' style='margin:0;padding:14px 12px'>Scanning for networks…</p></div>";
|
||||
}
|
||||
if(data.error==='timeout'){
|
||||
return "<div class='wm-scan-list'><p class='wm-lead' style='margin:0;padding:14px 12px'>Scan timed out. Try Scan again.</p></div>";
|
||||
}
|
||||
if(data.error==='failed'){
|
||||
return "<div class='wm-scan-list'><p class='wm-lead' style='margin:0;padding:14px 12px'>Scan failed.</p></div>";
|
||||
}
|
||||
if(!data.networks||data.count===0){
|
||||
return "<div class='wm-scan-list'><p class='wm-lead' style='margin:0;padding:14px 12px'>No networks found.</p></div>";
|
||||
}
|
||||
var html="<div class='wm-scan-list'>",i,n,pct,qi,enc;
|
||||
for(i=0;i<data.networks.length;i++){
|
||||
n=data.networks[i];
|
||||
pct=(n.quality||0)+'%';
|
||||
qi=Math.round((n.quality/100)*3)+1;if(qi<1)qi=1;if(qi>4)qi=4;
|
||||
enc=n.encrypted?'l':'';
|
||||
html+="<div><a href='#p' data-ssid='"+esc(n.ssid)+"'>"+esc(n.ssid)+"</a>";
|
||||
html+="<div role='img' aria-label='"+pct+"' title='"+pct+"' class='q q-"+qi+" "+enc+"'></div>";
|
||||
html+="<div class='q'>"+pct+"</div></div>";
|
||||
html+="<a class='wm-scan-row' href='#p' data-ssid='"+esc(n.ssid)+"'>";
|
||||
html+="<span class='wm-scan-ssid'>"+esc(n.ssid)+"</span>";
|
||||
html+="<span role='img' aria-label='"+pct+"' title='"+pct+"' class='q q-"+qi+" "+enc+"'></span>";
|
||||
html+="<span class='wm-scan-signal'>"+pct+"</span>";
|
||||
html+="</a>";
|
||||
}
|
||||
html+="</div>";
|
||||
return html;
|
||||
}
|
||||
|
||||
function wifiRefresh(){
|
||||
var box=document.getElementById('wm-scan-results');
|
||||
if(!box)return;
|
||||
box.innerHTML='<p>Starting scan...</p>';
|
||||
box.innerHTML="<div class='wm-scan-list'><p class='wm-lead' style='margin:0;padding:14px 12px'>Starting scan…</p></div>";
|
||||
api('/api/wifi/scan',{method:'POST'}).then(function(){
|
||||
startWifiScanPolling(box);
|
||||
});
|
||||
@@ -229,11 +249,15 @@ function bindWifiViewEvents(){
|
||||
}
|
||||
|
||||
function viewWifi(){
|
||||
setView(navBar()+"<h2>WiFi</h2><p>Loading...</p>");
|
||||
setView(navBar('wifi')+"<div class='wm-card'><p class='wm-lead'>Loading WiFi options…</p></div>");
|
||||
api('/api/wifi/meta').then(function(res){
|
||||
try{var m=JSON.parse(res.body);}catch(e){m={};}
|
||||
var html=navBar()+"<h2>WiFi</h2>";
|
||||
var html=navBar('wifi');
|
||||
html+="<div class='wm-page-head'><h1>WiFi</h1><p class='wm-page-desc'>Pick a network below, confirm SSID and password, then connect.</p></div>";
|
||||
html+="<div class='wm-card'><h2 class='wm-card-title'>Networks nearby</h2>";
|
||||
html+="<div id='wm-scan-results'></div>";
|
||||
html+="<button type='button' class='wm-btn wm-btn--secondary wm-btn--block' id='wm-refresh-scan'>Scan again</button></div>";
|
||||
html+="<div class='wm-card'><h2 class='wm-card-title'>Network details</h2>";
|
||||
html+="<form id='wm-wifi-form'>";
|
||||
html+=renderFieldList(m.wifiFields||[]);
|
||||
var wf=m.wifiFields||[];
|
||||
@@ -241,13 +265,12 @@ function viewWifi(){
|
||||
var i;
|
||||
for(i=0;i<wf.length;i++){if(wf[i]&&wf[i].id==='p'){hasPass=true;break;}}
|
||||
if(hasPass){
|
||||
html+="<input type='checkbox' id='wm-showpass'/> <label for='wm-showpass'>Show password</label>";
|
||||
html+="<div class='wm-checkbox-row'><input type='checkbox' id='wm-showpass'/> <label for='wm-showpass'>Show password</label></div>";
|
||||
}
|
||||
html+=renderFieldList(m.staticFields||[]);
|
||||
html+=renderFieldList(m.params||[]);
|
||||
html+="<button type='submit'>Save</button></form>";
|
||||
html+="<br/><button type='button' id='wm-refresh-scan'>Refresh scan</button>";
|
||||
html+="<div id='wm-wifi-msg'></div>";
|
||||
html+="<div class='wm-form-actions'><button type='submit' class='wm-btn wm-btn--primary wm-btn--block'>Save and connect</button></div></form>";
|
||||
html+="<div id='wm-wifi-msg'></div></div>";
|
||||
setView(html);
|
||||
bindWifiViewEvents();
|
||||
api('/api/wifi/scan-status').then(function(r2){
|
||||
@@ -311,28 +334,29 @@ window.portalWifiSave=function(ev){
|
||||
|
||||
// --- Info view ---
|
||||
function viewInfo(){
|
||||
setView(navBar()+"<p>Loading info...</p>");
|
||||
setView(navBar('info')+"<div class='wm-card'><p class='wm-lead'>Loading device info…</p></div>");
|
||||
api('/api/info').then(function(res){
|
||||
try{var d=JSON.parse(res.body);}catch(e){d={};}
|
||||
var html=navBar()+"<h2>Info</h2>";
|
||||
var html=navBar('info');
|
||||
html+="<div class='wm-page-head'><h1>Device info</h1><p class='wm-page-desc'>Connection status, hardware, and actions.</p></div>";
|
||||
function section(title,rows){
|
||||
if(!rows||!rows.length)return'';
|
||||
var h="<h3>"+esc(title)+"</h3><hr/><dl>";
|
||||
var h="<div class='wm-card'><h2 class='wm-card-title'>"+esc(title)+"</h2><dl class='wm-kv'>";
|
||||
for(var i=0;i<rows.length;i++){
|
||||
h+="<dt>"+esc(rows[i].label)+"</dt><dd>"+rows[i].value+"</dd>";
|
||||
}
|
||||
h+="</dl>";
|
||||
h+="</dl></div>";
|
||||
return h;
|
||||
}
|
||||
var st=d.status;
|
||||
if(st && typeof st==='object' && !Array.isArray(st)){
|
||||
html+="<h3>Status</h3><hr/><dl>";
|
||||
html+="<div class='wm-card'><h2 class='wm-card-title'>Status</h2><dl class='wm-kv'>";
|
||||
html+="<dt>Connected</dt><dd>"+esc(String(st.connected))+"</dd>";
|
||||
if(st.ssid!==undefined)html+="<dt>SSID</dt><dd>"+esc(st.ssid)+"</dd>";
|
||||
if(st.stationIp)html+="<dt>Station IP</dt><dd>"+esc(st.stationIp)+"</dd>";
|
||||
if(st.apIp)html+="<dt>AP IP</dt><dd>"+esc(st.apIp)+"</dd>";
|
||||
if(st.summary)html+="<dt>Summary</dt><dd>"+esc(st.summary)+"</dd>";
|
||||
html+="</dl>";
|
||||
html+="</dl></div>";
|
||||
} else {
|
||||
html+=section('Status',d.status||[]);
|
||||
}
|
||||
@@ -340,12 +364,13 @@ function viewInfo(){
|
||||
html+=section('WiFi',d.wifi||[]);
|
||||
html+=section('About',d.about||[]);
|
||||
var act=d.actions||{};
|
||||
html+="<h3>Actions</h3><hr/>";
|
||||
if(act.showRestart)html+="<p><button type='button' id='wm-restart-btn'>Restart</button></p>";
|
||||
if(act.showExitPortal)html+="<p><button type='button' id='wm-exit-btn'>Exit portal</button></p>";
|
||||
if(act.showCloseCaptive)html+="<p><button type='button' id='wm-close-captive-btn'>Stop captive portal detection</button></p>";
|
||||
if(act.showUpdate)html+="<p><a href='#/update'>Firmware update</a></p>";
|
||||
if(act.showErase)html+="<p><button type='button' class='D' id='wm-erase-btn'>Erase WiFi config</button></p>";
|
||||
html+="<div class='wm-card'><h2 class='wm-card-title'>Actions</h2><div class='wm-btn-group'>";
|
||||
if(act.showRestart)html+="<button type='button' class='wm-btn wm-btn--secondary wm-btn--block' id='wm-restart-btn'>Restart device</button>";
|
||||
if(act.showExitPortal)html+="<button type='button' class='wm-btn wm-btn--secondary wm-btn--block' id='wm-exit-btn'>Exit portal</button>";
|
||||
if(act.showCloseCaptive)html+="<button type='button' class='wm-btn wm-btn--secondary wm-btn--block' id='wm-close-captive-btn'>Stop captive portal</button>";
|
||||
if(act.showUpdate)html+="<a class='wm-btn wm-btn--secondary wm-btn--block' href='#/update'>Firmware update</a>";
|
||||
if(act.showErase)html+="<button type='button' class='wm-btn wm-btn--danger wm-btn--block' id='wm-erase-btn'>Erase WiFi config</button>";
|
||||
html+="</div></div>";
|
||||
setView(html);
|
||||
});
|
||||
}
|
||||
@@ -375,14 +400,15 @@ window.portalErase=function(){
|
||||
|
||||
// --- Params / OTA ---
|
||||
function viewSetup(){
|
||||
setView(navBar()+"<p>Loading...</p>");
|
||||
setView(navBar('setup')+"<div class='wm-card'><p class='wm-lead'>Loading parameters…</p></div>");
|
||||
api('/api/params').then(function(res){
|
||||
try{var d=JSON.parse(res.body);}catch(e){d={};}
|
||||
var html=navBar()+"<h2>Parameters</h2>";
|
||||
html+="<form id='wm-param-form'>";
|
||||
var html=navBar('setup');
|
||||
html+="<div class='wm-page-head'><h1>Setup</h1><p class='wm-page-desc'>Custom parameters stored on this device.</p></div>";
|
||||
html+="<div class='wm-card'><form id='wm-param-form'>";
|
||||
html+=renderFieldList(d.params||[]);
|
||||
html+="<button type='submit'>Save</button></form>";
|
||||
html+="<div id='wm-param-msg'></div>";
|
||||
html+="<div class='wm-form-actions'><button type='submit' class='wm-btn wm-btn--primary wm-btn--block'>Save parameters</button></div>";
|
||||
html+="</form><div id='wm-param-msg'></div></div>";
|
||||
setView(html);
|
||||
});
|
||||
}
|
||||
@@ -401,13 +427,20 @@ window.portalParamSave=function(ev){
|
||||
|
||||
function viewUpdate(){
|
||||
var f=boot.features||{};
|
||||
var html=navBar()+"<h2>Firmware update</h2>";
|
||||
if(!f.showUpdate){html+="<p>Firmware update is disabled.</p>";setView(html);return;}
|
||||
html+="<form id='wm-ota-form'>";
|
||||
html+="<input type='file' id='wm-ota-file' name='update'/>";
|
||||
html+="<button type='submit'>Upload</button></form>";
|
||||
html+="<p><small>Upload a .bin firmware. The device restarts after a successful update.</small></p>";
|
||||
html+="<pre id='wm-ota-log'></pre>";
|
||||
var html=navBar('update');
|
||||
html+="<div class='wm-page-head'><h1>Firmware update</h1><p class='wm-page-desc'>Flash a new firmware build (.bin). The device reboots when done.</p></div>";
|
||||
if(!f.showUpdate){
|
||||
html+="<div class='wm-card'><p class='wm-lead'>Firmware update is disabled for this configuration.</p></div>";
|
||||
setView(html);
|
||||
return;
|
||||
}
|
||||
html+="<div class='wm-card'><form id='wm-ota-form'>";
|
||||
html+="<div class='wm-field'><label for='wm-ota-file'>Firmware file</label>";
|
||||
html+="<input type='file' id='wm-ota-file' name='update' accept='.bin,.bin.gz'/></div>";
|
||||
html+="<div class='wm-form-actions'><button type='submit' class='wm-btn wm-btn--primary wm-btn--block'>Upload firmware</button></div>";
|
||||
html+="</form>";
|
||||
html+="<p class='wm-lead' style='margin-top:14px;margin-bottom:8px'>Choose the correct binary for this chip. Upload progress appears below.</p>";
|
||||
html+="<pre id='wm-ota-log'></pre></div>";
|
||||
setView(html);
|
||||
}
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ const char WM_ROOT_SHELL_TEMPLATE[] PROGMEM =
|
||||
"<div class='wm-dialog-panel'>"
|
||||
"<p class='wm-dialog-msg' id='wm-dialog-msg'></p>"
|
||||
"<div class='wm-dialog-actions'>"
|
||||
"<button type='button' id='wm-dialog-cancel'>Cancel</button>"
|
||||
"<button type='button' id='wm-dialog-ok' class='wm-dialog-ok'>OK</button>"
|
||||
"<button type='button' id='wm-dialog-cancel' class='wm-btn wm-btn--secondary'>Cancel</button>"
|
||||
"<button type='button' id='wm-dialog-ok' class='wm-btn wm-btn--primary wm-dialog-ok'>OK</button>"
|
||||
"</div></div></div>"
|
||||
"<div id='app'></div>"
|
||||
"<script id='wm-bootstrap' type='application/json'>%BOOTSTRAP_JSON%</script>"
|
||||
|
||||
Reference in New Issue
Block a user