diff --git a/public/exit.html b/public/exit.html index ce7da91952b8accb4f3aacd227fe827314202cf8..406503321eb1349d39ebd09a01427aaa2f26f4c0 100755 --- a/public/exit.html +++ b/public/exit.html @@ -25,19 +25,9 @@ <h1>Leaving Setup</h1> <div class='section'> <div class="content" style="padding: 30px; padding-bottom: 0px"> - Please wait while we setup your device. Note that if WiFi is being setup, <b>the device will disconnect - momentarily. When that happens, please reconnect by joining <i>this</i> machine to the 'params_new_wifi' - network</b> and wait while we try to reach your device at - <a href="http://params_hostname">http://params_hostname</a>. + Please wait while we setup your device. Once the setup is complete the user LED on the Rigado Gateway will turn solid green. <b> When that happens, please reconnect by joining <i>this</i> machine to the 'params_new_wifi' + network</b> <br><br> - - <hr class="progressbar" id="progressbar" align="left"> - <textarea class="progresstext" id="progresstext" readonly rows="1" cols="200"></textarea><br><br> - <textarea class="cmdout" id="cmdout" readonly rows="10"></textarea> - </div> -</div> -<div class='section'> - <div class="content" id="errbox" style="padding: 30px; padding-bottom: 0px; padding-top: 0px; display: none"> </div> </div> </body> diff --git a/public/index.html b/public/index.html index 520d0188e14c9480dda3b3e20454c6539990d4ae..35e3f7660da02cd63860a76cc73dc57b92212a31 100755 --- a/public/index.html +++ b/public/index.html @@ -228,8 +228,6 @@ </table> </td> <td class="right"> - <button type="button" class="linkbutton" id="backToAutomatic" style="visibility: hidden" - onclick="switchToAutomaticSetup();">Back to automatic setup</button> <input type="text" id="newwifi" name="newwifi" class="textbox" style="display: none"> <select id="newwifis" name="newwifis" class="selector" onchange="setSsidsRelatedFields()" style="display: inline-block"> diff --git a/public/rigado-logo.png b/public/rigado-logo.png old mode 100644 new mode 100755 diff --git a/server.js b/server.js index ac4b535e652a5880dc8db84fb7724dba55f044bd..0f9a16929358dce393d24fbc4407c0055844cb19 100755 --- a/server.js +++ b/server.js @@ -73,10 +73,10 @@ function injectStatus(in_text, statusmsg, iserr) { if (statusmsg) { if (iserr){ - status = '<div id="statusarea" name="statusarea" class="status errmsg">' + '</div>'; + status = '<div id="statusarea" name="statusarea" class="status errmsg">' + statusmsg + '</div>'; //console.log("status errmsg"); }else{ - status = '<div id="statusarea" name="statusarea" class="status">' + '</div>'; + status = '<div id="statusarea" name="statusarea" class="status">' + statusmsg + '</div>'; //console.log("status good"); } } @@ -227,14 +227,11 @@ function submitForm(params, res, req) { res.end(injectStatus(getStateBasedIndexPage(), result.failure, true)); return; } - else - { - res.end(injectStatus(getStateBasedIndexPage(), params, true)); - } + if (result.cmd){ console.log(result); commands.push(result); - } + } } // no errors occurred. Do success response.