1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-20 02:52:11 +00:00

Updated login, logout flow to show navbar links

This commit is contained in:
engineertdog 2019-09-01 10:57:53 -04:00
parent 5aeced5c2e
commit d4320e296e
2 changed files with 48 additions and 29 deletions

View File

@ -82,6 +82,7 @@
<a class="navbar-brand" href="#">{{hostname}}</a> <a class="navbar-brand" href="#">{{hostname}}</a>
</div> </div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse">
<span id="loggedInNav" class="hidden">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">System <b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">System <b class="caret"></b></a>
@ -110,6 +111,12 @@
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="#" onclick="do_logout(); return false;" style="color: white">Log out</a></li> <li><a href="#" onclick="do_logout(); return false;" style="color: white">Log out</a></li>
</ul> </ul>
</span>
<span id="guestNav">
<ul class="nav navbar-nav navbar-right">
<li><a href="#" onclick="return show_panel('login');" style="color: white">Log in</a></li>
</ul>
</span>
</div><!--/.navbar-collapse --> </div><!--/.navbar-collapse -->
</div> </div>
</div> </div>
@ -383,6 +390,11 @@ $(function() {
else if (typeof localStorage != 'undefined' && localStorage.getItem("miab-cp-credentials")) else if (typeof localStorage != 'undefined' && localStorage.getItem("miab-cp-credentials"))
api_credentials = localStorage.getItem("miab-cp-credentials").split(":"); api_credentials = localStorage.getItem("miab-cp-credentials").split(":");
if (api_credentials[0].length !== 0) {
$("#guestNav").addClass("hidden");
$("#loggedInNav").removeClass("hidden");
}
// Recall what the user was last looking at. // Recall what the user was last looking at.
if (typeof localStorage != 'undefined' && localStorage.getItem("miab-cp-lastpanel")) { if (typeof localStorage != 'undefined' && localStorage.getItem("miab-cp-lastpanel")) {
show_panel(localStorage.getItem("miab-cp-lastpanel")); show_panel(localStorage.getItem("miab-cp-lastpanel"));

View File

@ -117,7 +117,11 @@ function do_login() {
// Open the next panel the user wants to go to. Do this after the XHR response // Open the next panel the user wants to go to. Do this after the XHR response
// is over so that we don't start a new XHR request while this one is finishing, // is over so that we don't start a new XHR request while this one is finishing,
// which confuses the loading indicator. // which confuses the loading indicator.
setTimeout(function() { show_panel(!switch_back_to_panel || switch_back_to_panel == "login" ? 'system_status' : switch_back_to_panel) }, 300); setTimeout(function() {
$("#guestNav").addClass("hidden");
$("#loggedInNav").removeClass("hidden");
show_panel(!switch_back_to_panel || switch_back_to_panel == "login" ? 'system_status' : switch_back_to_panel)
}, 300);
} }
}) })
} }
@ -128,6 +132,9 @@ function do_logout() {
localStorage.removeItem("miab-cp-credentials"); localStorage.removeItem("miab-cp-credentials");
if (typeof sessionStorage != 'undefined') if (typeof sessionStorage != 'undefined')
sessionStorage.removeItem("miab-cp-credentials"); sessionStorage.removeItem("miab-cp-credentials");
$("#guestNav").addClass("hidden");
$("#loggedInNav").removeClass("hidden");
show_panel('login'); show_panel('login');
} }