Various small tweeks

KipK · Sep 15, 2017 · 1171319 · 1171319
1 parent b38cc0f
commit 1171319
Show file tree

Hide file tree

Showing 13 changed files with 363 additions and 729 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1 @@
-src/lib/js/*.min.js
-src/data/lib.js
+src/data/*.js
diff --git a/src/data/home.htm b/src/data/home.htm
diff --git a/src/data/home.js b/src/data/home.js
diff --git a/src/data/lib.js b/src/data/lib.js
diff --git a/src/data/wifi_portal.htm b/src/data/wifi_portal.htm
@@ -1 +1 @@
-<!doctype html> <html lang=en > <meta charset=utf-8 > <title>OpenEVSE</title> <meta name=viewport  content="width=device-width, initial-scale=1.0"> <meta name=viewport  content="width=device-width, user-scalable=no" /> <meta name=description  content=OpenEVSE > <meta name=author  content=OpenEVSE > <meta name=theme-color  content="#000000" /> <link rel=stylesheet  type="text/css" href=style.css > <div id=page > <div class=header > <h1>Open<span>EVSE</span></h1> <h3>WiFi</h3> </div> <div class=container > <div> <div class=box > <h2>WiFi Setup</h2> <p><b>Mode:</b> <span id=mode  data-bind="text: status.fullMode"></span></p> <div id=client-view  data-bind="visible: status.isWifiClient"> <button id=apoff  data-bind="click: wifi.turnOffAccessPoint, disable: wifi.turnOffAccessPointFetching">Continue</button> </div> <div id=ap-view  data-bind="visible: !status.isWifiClient() &amp;&amp; !wifi.wifiConnecting()"> <p>Connect to network:</p> <table> <thead> <tr> <th>Select <th>Network <th>RSSI dBm <tbody id=networks  data-bind="foreach: scan.results"> <tr> <td><input class='networkcheckbox' name='network' data-bind="checkedValue: bssid(), checked: $root.bssid" type='radio'> <td data-bind="text: ssid"> <td data-bind="text: rssi"> <tfoot data-bind="visible: 0 == scan.results().length"> <tr> <td colspan=3 >Scanning... </table> <p data-bind="text: config.ssid"></p> <p> <b>Passkey:</b><br> <input type=password  autocapitalize=none  autocapitalize=none  data-bind="textInput: config.pass"> <button data-bind="click: wifi.saveNetwork, text: (wifi.saveNetworkFetching() ? 'Saving' : (wifi.saveNetworkSuccess() ? 'Saved' : 'Connect')), disable: wifi.saveNetworkFetching">Connect</button> </p> </div> <div data-bind="visible: wifi.wifiConnecting"> <p>Connecting to WIFI Network...</p> </div> </div> </div> <div id=footer > <br><b> Powered by <a href="http://www.openevse.com">OpenEVSE</a> and <a href="https://openenergymonitor.org">OpenEnergyMonitor</a></b> <br> by Chris Howell, Trystan Lea, Glyn Hudson </div> </div> <!--end container --> </div> <!--end page --> <script src=lib.js ></script> <script src=wifi_portal.js ></script>
+<!doctype html> <html lang=en > <meta charset=utf-8 > <title>OpenEVSE</title> <meta name=viewport  content="width=device-width, initial-scale=1.0"> <meta name=viewport  content="width=device-width, user-scalable=no" /> <meta name=description  content=OpenEVSE > <meta name=author  content=OpenEVSE > <meta name=theme-color  content="#000000" /> <link rel=stylesheet  type="text/css" href=style.css > <div id=page > <div class=header > <h1>Open<span>EVSE</span></h1> <h3>WiFi</h3> </div> <div class=container > <div> <div class=box > <h2>WiFi Setup</h2> <p><b>Mode:</b> <span id=mode  data-bind="text: status.fullMode"></span></p> <div id=client-view  data-bind="visible: status.isWifiClient"> <button id=apoff  data-bind="click: wifi.turnOffAccessPoint, disable: wifi.turnOffAccessPointFetching">Continue</button> </div> <div id=ap-view  data-bind="visible: !status.isWifiClient() &amp;&amp; !wifi.wifiConnecting()"> <p>Connect to network:</p> <table> <thead> <tr> <th>Select <th>Network <th>RSSI dBm <tbody id=networks  data-bind="foreach: scan.results"> <tr> <td><input class='networkcheckbox' name='network' data-bind="checkedValue: bssid(), checked: $root.bssid" type='radio'> <td data-bind="text: ssid"> <td data-bind="text: rssi"> <tfoot data-bind="visible: 0 == scan.results().length"> <tr> <td colspan=3 >Scanning... </table> <p data-bind="text: config.ssid"></p> <p> <b>Passkey:</b><br> <input type=password  autocapitalize=none  autocapitalize=none  data-bind="textInput: config.pass"> <button data-bind="click: wifi.saveNetwork, text: (wifi.saveNetworkFetching() ? 'Saving' : (wifi.saveNetworkSuccess() ? 'Saved' : 'Connect')), disable: wifi.saveNetworkFetching">Connect</button> </p> </div> <div data-bind="visible: wifi.wifiConnecting"> <h2>Connecting to <span data-bind="text: config.ssid"></span> ...</h2> <p>Please connect this device to <span data-bind="text: config.ssid"></span> and navigate to the IP address displayed on your OpenEVSE display.</p> <p>Alternatively you can use <a href="http://openevse.local/">http://openevse.local/</a> or <a href="http://openevse/">http://openevse/</a></p> </div> </div> </div> <div id=footer > <br><b> Powered by <a href="http://www.openevse.com">OpenEVSE</a> and <a href="https://openenergymonitor.org">OpenEnergyMonitor</a></b> <br> by Chris Howell, Trystan Lea, Glyn Hudson </div> </div> <!--end container --> </div> <!--end page --> <script src=lib.js ></script> <script src=wifi_portal.js ></script>
diff --git a/src/html/manifest.json b/src/html/manifest.json
@@ -3,6 +3,7 @@
   "home.js": [
     "openevse.js",
     "view_models/RapiViewModel.js",
+    "view_models/TimeViewModel.js",
     "view_models/OpenEvseViewModel.js",
     "view_models/OpenEvseWiFiViewModel.js",
     "home.js"

diff --git a/src/html/wifi_portal.htm b/src/html/wifi_portal.htm
@@ -66,7 +66,11 @@ <h2>WiFi Setup</h2>
           </div>
 
           <div data-bind="visible: wifi.wifiConnecting">
-            <p>Connecting to WIFI Network...</p>
+            <h2>Connecting to <span data-bind="text: config.ssid"></span> ...</h2>
+            <p>Please connect this device to <span data-bind="text: config.ssid"></span> and navigate
+               to the IP address displayed on your OpenEVSE display.</p>
+            <p>Alternatively you can use <a href="http://openevse.local/">http://openevse.local/</a> or
+               <a href="http://openevse/">http://openevse/</a></p>
           </div>
         </div>
       </div>

diff --git a/src/web_server.home.htm.h b/src/web_server.home.htm.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html> <html lang=en > <meta charset=utf-8 > <title>OpenEVSE</title> <meta name=viewport content="width=device-width, initial-scale=1.0"> <meta name=viewport content="width=device-width, user-scalable=no" /> <meta name=description content=OpenEVSE > <meta name=author content=OpenEVSE > <meta name=theme-color content="#000000" /> <link rel=stylesheet type="text/css" href=style.css > <div id=page > <div class=header > <h1>Open<span>EVSE</span></h1> <h3>WiFi</h3> </div> <div class=container > <div> <div class=box > <h2>WiFi Setup</h2> <p><b>Mode:</b> <span id=mode data-bind="text: status.fullMode"></span></p> <div id=client-view data-bind="visible: status.isWifiClient"> <button id=apoff data-bind="click: wifi.turnOffAccessPoint, disable: wifi.turnOffAccessPointFetching">Continue</button> </div> <div id=ap-view data-bind="visible: !status.isWifiClient() && !wifi.wifiConnecting()"> <p>Connect to network:</p> <table> <thead> <tr> <th>Select <th>Network <th>RSSI dBm <tbody id=networks data-bind="foreach: scan.results"> <tr> <td><input class='networkcheckbox' name='network' data-bind="checkedValue: bssid(), checked: $root.bssid" type='radio'> <td data-bind="text: ssid"> <td data-bind="text: rssi"> <tfoot data-bind="visible: 0 == scan.results().length"> <tr> <td colspan=3 >Scanning... </table> <p data-bind="text: config.ssid"></p> <p> <b>Passkey:</b><br> <input type=password autocapitalize=none autocapitalize=none data-bind="textInput: config.pass"> <button data-bind="click: wifi.saveNetwork, text: (wifi.saveNetworkFetching() ? 'Saving' : (wifi.saveNetworkSuccess() ? 'Saved' : 'Connect')), disable: wifi.saveNetworkFetching">Connect</button> </p> </div> <div data-bind="visible: wifi.wifiConnecting"> <p>Connecting to WIFI Network...</p> </div> </div> </div> <div id=footer > <br><b> Powered by <a href="http://www.openevse.com">OpenEVSE</a> and <a href="https://openenergymonitor.org">OpenEnergyMonitor</a></b> <br> by Chris Howell, Trystan Lea, Glyn Hudson </div> </div> <!--end container --> </div> <!--end page --> <script src=lib.js ></script> <script src=wifi_portal.js ></script>
		<!doctype html> <html lang=en > <meta charset=utf-8 > <title>OpenEVSE</title> <meta name=viewport content="width=device-width, initial-scale=1.0"> <meta name=viewport content="width=device-width, user-scalable=no" /> <meta name=description content=OpenEVSE > <meta name=author content=OpenEVSE > <meta name=theme-color content="#000000" /> <link rel=stylesheet type="text/css" href=style.css > <div id=page > <div class=header > <h1>Open<span>EVSE</span></h1> <h3>WiFi</h3> </div> <div class=container > <div> <div class=box > <h2>WiFi Setup</h2> <p><b>Mode:</b> <span id=mode data-bind="text: status.fullMode"></span></p> <div id=client-view data-bind="visible: status.isWifiClient"> <button id=apoff data-bind="click: wifi.turnOffAccessPoint, disable: wifi.turnOffAccessPointFetching">Continue</button> </div> <div id=ap-view data-bind="visible: !status.isWifiClient() && !wifi.wifiConnecting()"> <p>Connect to network:</p> <table> <thead> <tr> <th>Select <th>Network <th>RSSI dBm <tbody id=networks data-bind="foreach: scan.results"> <tr> <td><input class='networkcheckbox' name='network' data-bind="checkedValue: bssid(), checked: $root.bssid" type='radio'> <td data-bind="text: ssid"> <td data-bind="text: rssi"> <tfoot data-bind="visible: 0 == scan.results().length"> <tr> <td colspan=3 >Scanning... </table> <p data-bind="text: config.ssid"></p> <p> <b>Passkey:</b><br> <input type=password autocapitalize=none autocapitalize=none data-bind="textInput: config.pass"> <button data-bind="click: wifi.saveNetwork, text: (wifi.saveNetworkFetching() ? 'Saving' : (wifi.saveNetworkSuccess() ? 'Saved' : 'Connect')), disable: wifi.saveNetworkFetching">Connect</button> </p> </div> <div data-bind="visible: wifi.wifiConnecting"> <h2>Connecting to <span data-bind="text: config.ssid"></span> ...</h2> <p>Please connect this device to <span data-bind="text: config.ssid"></span> and navigate to the IP address displayed on your OpenEVSE display.</p> <p>Alternatively you can use <a href="http://openevse.local/">http://openevse.local/</a> or <a href="http://openevse/">http://openevse/</a></p> </div> </div> </div> <div id=footer > <br><b> Powered by <a href="http://www.openevse.com">OpenEVSE</a> and <a href="https://openenergymonitor.org">OpenEnergyMonitor</a></b> <br> by Chris Howell, Trystan Lea, Glyn Hudson </div> </div> <!--end container --> </div> <!--end page --> <script src=lib.js ></script> <script src=wifi_portal.js ></script>