Small fixes and ench. see changelog.

marelab · Mar 16, 2018 · 47b27bb · 47b27bb
1 parent f0f0696
commit 47b27bb
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,13 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+#### Added
+- [webui] Try to connect button upon inprogress complete.
+- [webui] Restart without saving changes.
+
 #### Fixed
-- [webui] wrong version is shown
+- [webui] wrong version is shown #80 .
+- [webui] whole html was shifted previous css change.
 
 ## [0.6.1] - 2018-03-14
 #### Added

diff --git a/bin/firmware.bin b/bin/firmware.bin
diff --git a/src/main.cpp b/src/main.cpp
@@ -712,6 +712,9 @@ void ICACHE_RAM_ATTR onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * c
             else if (strcmp(command, "status")  == 0) {
                 sendStatus();
             }
+            else if (strcmp(command, "restart")  == 0) {
+                ESP.restart();
+            }
             else if (strcmp(command, "destroy")  == 0) {
                 formatreq = true;
             }

diff --git a/src/webh/esprfid.htm.gz.h b/src/webh/esprfid.htm.gz.h
diff --git a/src/webh/esprfid.js.gz.h b/src/webh/esprfid.js.gz.h
diff --git a/src/webh/index.html.gz.h b/src/webh/index.html.gz.h
diff --git a/src/webh/required.css.gz.h b/src/webh/required.css.gz.h
diff --git a/src/websrc/3rdparty/css/sidebar.css b/src/websrc/3rdparty/css/sidebar.css
diff --git a/src/websrc/esprfid.htm b/src/websrc/esprfid.htm
@@ -4,21 +4,28 @@
     <div class="row">
         <div class="col-sm-6">
             <legend>Backup</legend>
-            <h6 class="text-muted">Please make sure that you have made a backup before updating the firmware.</h6>
+            <h6 class="text-muted">Please make sure that you have made a backup on regular basis.</h6>
             <div>
-                <button class="btn btn-link btn-sm" onclick="backupuser()">Backup User Data</button>
+                <button class="btn btn-link btn-sm" onclick="backupuser();">Backup User Data</button>
                 <a id="downloadUser" style="display:none"></a>
-                <button class="btn btn-link btn-sm" onclick="backupset()">Backup Settings</button>
+                <button class="btn btn-link btn-sm" onclick="backupset();">Backup Settings</button>
                 <a id="downloadSet" style="display:none"></a>
             </div>
             <br>
             <div>
                 <legend>Restore</legend>
                 <h6 class="text-muted">Click on links and choose your backup file to restore.</h6>
                 <label for="restoreUser" class="btn btn-link btn-sm">Restore User Data</label>
-                <input id="restoreUser" type="file" accept="text/json" onchange="restoreUser()" style="display:none;">
+                <input id="restoreUser" type="file" accept="text/json" onchange="restoreUser();" style="display:none;">
                 <label for="restoreSet" class="btn btn-link btn-sm">Restore Settings</label>
-                <input id="restoreSet" type="file" accept="text/json" onchange="restoreSet()" style="display:none;">
+                <input id="restoreSet" type="file" accept="text/json" onchange="restoreSet();" style="display:none;">
+            </div>
+            <br>
+                        <div>
+                <legend>Restart</legend>
+                <h6 class="text-muted">Click to restart your device without saving changes.</h6>
+                <label for="restart" class="btn btn-link btn-sm">Restart Device</label>
+                <button id="restart" class="btn btn-link btn-sm" onclick="restartESP();" style="display:none;"></button>
             </div>
             <br>
             <div id="restoremodal" class="modal fade" role="dialog">
@@ -50,7 +57,7 @@ <h4 class="modal-title">Please wait while restoring user data...</h4>
     <div class="container">
         <div class="row">
             <br>
-            <div class="col-md-4 col-md-offset-4">
+            <div class="col-md-8 col-md-offset-2">
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <h3 class="panel-title">Please wait while your ESP restarts...</h3>
@@ -61,6 +68,7 @@ <h3 class="panel-title">Please wait while your ESP restarts...</h3>
                             </div>
                         </div>
                     </div>
+                    <div class="panel-footer text-center" id="reconnect" style="display:none;"></div>
                 </div>
             </div>
         </div>

diff --git a/src/websrc/index.html b/src/websrc/index.html
@@ -80,7 +80,7 @@ <h1><i class="glyphicon glyphicon-tags" aria-hidden="true"></i>esp-rfid</h1>
                     <a href="#" class="article" onclick="logout();">Logout</a>
                 </li>
                 <li>
-                    <h6 class="text-center">esp-rfid v0.6</h6>
+                    <h6 id="mainver" class="text-center"></h6>
                 </li>
             </ul>
         </nav>

diff --git a/src/websrc/js/esprfid.js b/src/websrc/js/esprfid.js
@@ -777,8 +777,9 @@ function acctypefinder() {
     }
 }
 
-
-
+function restartESP() {
+    inProgress("restart");
+}
 
 function colorStatusbar(ref) {
     var percentage = ref.style.width.slice(0, -1);
@@ -805,6 +806,7 @@ function listStats() {
     document.getElementById("dns").innerHTML = ajaxobj.dns;
     document.getElementById("mac").innerHTML = ajaxobj.mac;
     document.getElementById("sver").innerText = config.general.version;
+    $("#mainver").text(config.general.version);
 }
 
 var nextIsNotJson = false;
@@ -861,7 +863,7 @@ function socketMessageListener(evt) {
                 break;
             case "configfile":
                 config = obj;
-                config.general.version = "v0.6.1";
+                config.general.version = "v0.6.2";
                 break;
             default:
                 break;
@@ -1132,6 +1134,11 @@ function inProgress(callback) {
                 i++;
                 if (i === 101) {
                     clearInterval(prg);
+                    var a = document.createElement("a");
+                    a.href = "https://" + config.general.hostnm + ".local";
+                    a.innerText = "Try to reconnect ESP";
+                    document.getElementById("reconnect").appendChild(a);
+                    document.getElementById("reconnect").style.display = "block";
                     document.getElementById("updateprog").className = "progress-bar progress-bar-success";
                     document.getElementById("updateprog").innerHTML = "Completed";
                 }
@@ -1152,6 +1159,9 @@ function inProgress(callback) {
                 case "destroy":
                     websock.send("{\"command\":\"destroy\"}");
                     break;
+                case "restart":
+                    websock.send("{\"command\":\"restart\"}");
+                    break;
                 default:
                     break;