Skip to content

Commit 1e88fc6

Browse files
committed
fixed status info table
1 parent cda2cb3 commit 1e88fc6

File tree

8 files changed

+20
-18
lines changed

8 files changed

+20
-18
lines changed

src/webh/esprfid.js.gz.h

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

src/webh/index.html.gz.h

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

src/websrc/process/final/esprfid.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/websrc/process/final/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
#openinghours td:nth-child(2n), #openinghours th:nth-child(2n),
88
#openinghours2 td:nth-child(2n), #openinghours2 th:nth-child(2n) {
99
background-color: #bbb;
10-
}</style></head><body><div class="wrapper"><!-- Sidebar Holder --><nav id="sidebar"><div id="dismiss"><i class="bi bi-arrow-left"></i></div><div class="sidebar-header"><h2><i class="bi bi-key-fill" aria-hidden="true"></i>esp32-actl</h2><div id="systemname" style="text-align: center;"></div></div><ul class="list-unstyled components"><li id="listatus" class="active"><a href="#" id="status"><i class="bi bi-info-circle"></i>Status</a></li><li id="lisettings"><a href="#homeSubmenu" data-bs-toggle="collapse" aria-expanded="false"><i class="bi bi-gear"></i>Settings</a><ul class="collapse list-unstyled" id="homeSubmenu"><li id="liwifi"><a href="#" id="network"><i class="bi bi-wifi"></i>Wireless Network</a></li><li id="ethernet"><a href="#" id="networketh"><i class="bi bi-ethernet"></i>Ethernet Network</a></li><li id="lihardware"><a href="#" id="hardware"><i class="bi bi-wrench"></i>Hardware Settings</a></li><li id="ligeneral"><a href="#" id="general"><i class="bi bi-card-list"></i>General Settings</a></li><li id="limqtt"><a href="#" id="mqtt"><i class="bi bi-link"></i>MQTT Settings</a></li><li id="lintp"><a href="#" id="ntp"><i class="bi bi-clock"></i>NTP (Time) Settings</a></li></ul></li><li id="liusers"><a href="#" id="users"><i class="bi bi-person"></i>Users</a></li><li id="lilogs"><a href="#logsSubmenu" data-bs-toggle="collapse" aria-expanded="false"><i class="bi bi-folder2-open"></i>Logs</a><ul class="collapse list-unstyled" id="logsSubmenu"><li id="lilatest"><a href="#" id="latestlog"><i class="bi bi-calendar"></i>Access Log</a></li><li id="lievent"><a href="#" id="eventlog"><i class="bi bi-arrows-move"></i>Event Log</a></li><li id="lilogmain"><a href="#" id="logmaintenance"><i class="bi bi-wrench"></i>Logfile Maintenance</a></li></ul></li><li></li><li id="libackup"><a href="#" id="backup"><i class="bi bi-save"></i>Backup & Restore</a></li><li id="lireset"><a href="#" id="reset"><i class="bi bi-arrow-repeat"></i>Factory Reset</a></li><li id="liupdate"><a data-bs-toggle="modal" href="#update"><i class="bi bi-box-arrow-in-up"></i>Update</a></li></ul><ul class="list-unstyled CTAs"><li><a href="https://codeberg.org/tctlrd/esp32-actl" class="download" target="_new">Project's Git Page</a></li><li><a href="#" class="article" onclick="logout()">Logout</a></li><li class="text-center"><h6 id="mainver" class="text-center" style="display:inline-flex;"></h6><h6 id="maindebug" class="text-center" style="padding-left:10px;display:inline-flex;"></h6></li></ul></nav><!-- Page Content Holder --><div id="content"><button type="button" id="sidebarCollapse" class="btn btn-info navbar-btn"><i class="bi bi-list"></i> <span>Menu</span></button><div class="float-right" id="ws-connection-status"><div class="alert alert-warning" role="alert"><i class="bi bi-exclamation-triangle"></i> <span>Connection with esp32-rfid absent. Reconnecting...</span></div></div><div id="ajaxcontent"></div><div id="revcommit" class="modal fade" tabindex="-1" aria-labelledby="revcommitLabel" aria-hidden="true"><div class="modal-dialog"><!-- Modal content--><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="revcommitLabel">Please review changes</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><pre id="jsonholder"></pre></div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button> <button type="button" onclick="commit()" class="btn btn-success" data-bs-dismiss="modal">Save & Reboot</button></div></div></div></div><div id="destroy" class="modal fade" tabindex="-1" aria-labelledby="destroyLabel" aria-hidden="true"><div class="modal-dialog"><!-- Modal content--><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="destroyLabel">Are you absolutely sure?</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="alert alert-warning"><h5><strong>Warning!</strong> Unexpected bad things will happen if you don’t read this!</h5></div><div class="modal-body"><h5>This action <strong>cannot</strong> be undone. This will permanently delete <strong>all the user data, settings and logs.</strong> Please make sure you made a backup first.</h5><div style="clear:both;"><br></div><h5>Please type in the hostname of the device to confirm.</h5><div style="clear:both;"><br></div><p><input type="text" class="form-control input-block" id="compare" oninput="compareDestroy()"></p></div><div class="modal-footer"><button id="destroybtn" type="button" disabled="" onclick="destroy()" class="btn btn-block btn-danger">I understand the consequences.</button></div></div></div></div><div id="signin" class="modal fade" tabindex="-1" aria-labelledby="signinLabel" aria-hidden="true"><div class="modal-dialog"><!-- Modal content--><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="signinLabel">Please Sign In</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="row"><br><div class="col-md-8 col-md-offset-2"><div class="login-panel panel panel-default"><div class="panel-body"><form role="form" onsubmit="return login(),!1"><fieldset><div class="form-group"><input id="password" class="form-control" placeholder="Password" name="password" type="password" value="" required="" title="Please enter your password"></div><button type="submit" class="btn btn-success btn-md float-right">Login</button></fieldset></form></div></div></div></div></div></div></div><div id="update" class="modal fade" tabindex="-1" aria-labelledby="updateLabel" aria-hidden="true"><div class="modal-dialog"><!-- Modal content--><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="updateLabel">Update Firmware</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="alert alert-warning"><strong>Warning!</strong> Please make sure you made a backup first</div><div class="modal-body"><div><h4>Latest Version Online</h4><div id="onlineupdate"><h5 id="releasehead"></h5><div style="clear:both;"><br></div><!-- <pre id="releasebody">Getting update information from GitHub...</pre> --><div class="float-right"><a class="float-right" id="downloadupdate"><button type="button" class="btn btn-primary">Download</button></a></div></div></div><div style="clear:both;"><br></div><div><h4>Current Version:</h4><h5 id="versionhead"></h5><div class="form-group"><input id="binform" onchange="allowUpload()" type="file" name="update" accept=".bin"></div><div class="float-right"><button onclick="upload()" class="btn btn-primary" id="upbtn" disabled="">Update</button></div></div></div><div style="clear:both;"><br></div><div class="modal-footer"></div></div></div></div></div><footer class="footer"><div id="commit" class="container"></div></footer><div class="overlay"></div><script src="js/required.js"></script><script src="js/esprfid.js"></script><script src="js/boards.js"></script><script>start()</script></div></body></html>
10+
}</style></head><body><div class="wrapper"><!-- Sidebar Holder --><nav id="sidebar"><div id="dismiss"><i class="bi bi-arrow-left"></i></div><div class="sidebar-header"><h2><i class="bi bi-key-fill" aria-hidden="true"></i></h2><div id="systemname" style="text-align: center;"></div></div><ul class="list-unstyled components"><li id="listatus" class="active"><a href="#" id="status"><i class="bi bi-info-circle"></i>Status</a></li><li id="lisettings"><a href="#homeSubmenu" data-bs-toggle="collapse" aria-expanded="false"><i class="bi bi-gear"></i>Settings</a><ul class="collapse list-unstyled" id="homeSubmenu"><li id="liwifi"><a href="#" id="network"><i class="bi bi-wifi"></i>Wireless Network</a></li><li id="ethernet"><a href="#" id="networketh"><i class="bi bi-ethernet"></i>Ethernet Network</a></li><li id="lihardware"><a href="#" id="hardware"><i class="bi bi-wrench"></i>Hardware Settings</a></li><li id="ligeneral"><a href="#" id="general"><i class="bi bi-card-list"></i>General Settings</a></li><li id="limqtt"><a href="#" id="mqtt"><i class="bi bi-link"></i>MQTT Settings</a></li><li id="lintp"><a href="#" id="ntp"><i class="bi bi-clock"></i>NTP (Time) Settings</a></li></ul></li><li id="liusers"><a href="#" id="users"><i class="bi bi-person"></i>Users</a></li><li id="lilogs"><a href="#logsSubmenu" data-bs-toggle="collapse" aria-expanded="false"><i class="bi bi-folder2-open"></i>Logs</a><ul class="collapse list-unstyled" id="logsSubmenu"><li id="lilatest"><a href="#" id="latestlog"><i class="bi bi-calendar"></i>Access Log</a></li><li id="lievent"><a href="#" id="eventlog"><i class="bi bi-arrows-move"></i>Event Log</a></li><li id="lilogmain"><a href="#" id="logmaintenance"><i class="bi bi-wrench"></i>Logfile Maintenance</a></li></ul></li><li></li><li id="libackup"><a href="#" id="backup"><i class="bi bi-save"></i>Backup & Restore</a></li><li id="lireset"><a href="#" id="reset"><i class="bi bi-arrow-repeat"></i>Factory Reset</a></li><li id="liupdate"><a data-bs-toggle="modal" href="#update"><i class="bi bi-box-arrow-in-up"></i>Update</a></li></ul><ul class="list-unstyled CTAs"><li><a href="https://codeberg.org/tctlrd/esp32-actl" class="download" target="_new">Project's Git Page</a></li><li><a href="#" class="article" onclick="logout()">Logout</a></li><li class="text-center"><h6 id="mainver" class="text-center" style="display:inline-flex;"></h6><h6 id="maindebug" class="text-center" style="padding-left:10px;display:inline-flex;"></h6></li></ul></nav><!-- Page Content Holder --><div id="content"><button type="button" id="sidebarCollapse" class="btn btn-info navbar-btn"><i class="bi bi-list"></i> <span>Menu</span></button><div class="float-right" id="ws-connection-status"><div class="alert alert-warning" role="alert"><i class="bi bi-exclamation-triangle"></i> <span>Connection with esp32-rfid absent. Reconnecting...</span></div></div><div id="ajaxcontent"></div><div id="revcommit" class="modal fade" tabindex="-1" aria-labelledby="revcommitLabel" aria-hidden="true"><div class="modal-dialog"><!-- Modal content--><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="revcommitLabel">Please review changes</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><pre id="jsonholder"></pre></div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button> <button type="button" onclick="commit()" class="btn btn-success" data-bs-dismiss="modal">Save & Reboot</button></div></div></div></div><div id="destroy" class="modal fade" tabindex="-1" aria-labelledby="destroyLabel" aria-hidden="true"><div class="modal-dialog"><!-- Modal content--><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="destroyLabel">Are you absolutely sure?</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="alert alert-warning"><h5><strong>Warning!</strong> Unexpected bad things will happen if you don’t read this!</h5></div><div class="modal-body"><h5>This action <strong>cannot</strong> be undone. This will permanently delete <strong>all the user data, settings and logs.</strong> Please make sure you made a backup first.</h5><div style="clear:both;"><br></div><h5>Please type in the hostname of the device to confirm.</h5><div style="clear:both;"><br></div><p><input type="text" class="form-control input-block" id="compare" oninput="compareDestroy()"></p></div><div class="modal-footer"><button id="destroybtn" type="button" disabled="" onclick="destroy()" class="btn btn-block btn-danger">I understand the consequences.</button></div></div></div></div><div id="signin" class="modal fade" tabindex="-1" aria-labelledby="signinLabel" aria-hidden="true"><div class="modal-dialog"><!-- Modal content--><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="signinLabel">Please Sign In</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="row"><br><div class="col-md-8 col-md-offset-2"><div class="login-panel panel panel-default"><div class="panel-body"><form role="form" onsubmit="return login(),!1"><fieldset><div class="form-group"><input id="password" class="form-control" placeholder="Password" name="password" type="password" value="" required="" title="Please enter your password"></div><button type="submit" class="btn btn-success btn-md float-right">Login</button></fieldset></form></div></div></div></div></div></div></div><div id="update" class="modal fade" tabindex="-1" aria-labelledby="updateLabel" aria-hidden="true"><div class="modal-dialog"><!-- Modal content--><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="updateLabel">Update Firmware</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="alert alert-warning"><strong>Warning!</strong> Please make sure you made a backup first</div><div class="modal-body"><div><h4>Latest Version Online</h4><div id="onlineupdate"><h5 id="releasehead"></h5><div style="clear:both;"><br></div><!-- <pre id="releasebody">Getting update information from GitHub...</pre> --><div class="float-right"><a class="float-right" id="downloadupdate"><button type="button" class="btn btn-primary">Download</button></a></div></div></div><div style="clear:both;"><br></div><div><h4>Current Version:</h4><h5 id="versionhead"></h5><div class="form-group"><input id="binform" onchange="allowUpload()" type="file" name="update" accept=".bin"></div><div class="float-right"><button onclick="upload()" class="btn btn-primary" id="upbtn" disabled="">Update</button></div></div></div><div style="clear:both;"><br></div><div class="modal-footer"></div></div></div></div></div><footer class="footer"><div id="commit" class="container"></div></footer><div class="overlay"></div><script src="js/required.js"></script><script src="js/esprfid.js"></script><script src="js/boards.js"></script><script>start()</script></div></body></html>
3 Bytes
Binary file not shown.
-3 Bytes
Binary file not shown.

src/websrc/ui/esprfid.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,10 @@ function colorStatusbar(ref) {
852852
}
853853

854854
function removeModal() {
855-
var myModal = bootstrap.Modal.getInstance(document.getElementById("restoremodal"));
856-
myModal.hide();
855+
const modal = bootstrap.Modal.getInstance(document.getElementById("restoremodal"));
856+
if (modal) {
857+
modal.hide();
858+
}
857859
$("body").removeClass("modal-open");
858860
$("body").css("padding-right", "0px");
859861
$(".modal-backdrop").remove();

src/websrc/ui/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<i class="bi bi-arrow-left"></i>
3636
</div>
3737
<div class="sidebar-header">
38-
<h2><i class="bi bi-key-fill" aria-hidden="true"></i>esp32-actl</h2>
38+
<h2><i class="bi bi-key-fill" aria-hidden="true"></i></h2>
3939
<div id="systemname" style='text-align: center;'></div>
4040
</div>
4141
<ul class="list-unstyled components">

0 commit comments

Comments
 (0)