Fixed login / logout

diff --git a/application/views/main_view.php b/application/views/main_view.php
index aa3d228e84f71c988bc0d3b1bc188b4ddc175b57..29d2ba53e7c1e6336ed7c044de3f5b15e35f860d 100644 (file)
--- a/application/views/main_view.php
+++ b/application/views/main_view.php
@@ -19,9 +19,11 @@
                                <div class="container-fluid">\r
                                        <a class="brand" href="#">WebOS Dev</a>\r
                                        <div class="nav-collapse collapse menudiv">\r
-                                       <p class="navbar-text pull-right">\r
-                                               Logged in as <a href="#" class="navbar-link" id="username"><em>unauthenticated</em></a>\r
-                                       </p>\r
+                                               <div class="menuitems">\r
+                                               </div>\r
+                                               <p class="navbar-text pull-right">\r
+                                                       Logged in as <a href="#" class="navbar-link" id="username"><em>unauthenticated</em></a>\r
+                                               </p>\r
                                        </div>\r
                                </div>\r
                        </div>\r

diff --git a/public/js/application.js b/public/js/application.js
index 1a9895b22f283ade24d6774d6a9c242beb47cf79..b150ac49107e378df4899d315f05bdebac39b832 100644 (file)
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -3,6 +3,8 @@ var state
 function loadDefaults() {
        jQuery.getJSON("/backend/logged_in", function(resp) {
                if (!resp.contents) {
+                       hideMenu();
+                       hideBackground();
                        loadLoginModal();
                } else {
                        loadUsername();
@@ -17,6 +19,10 @@ function loadBackground() {
        jQuery('body').append(background);
 }
 
+function hideBackground() {
+       jQuery('style').remove();
+}
+
 function loadLoginModal() {
        jQuery.ajax({
                url: "/backend/login_modal",
@@ -47,7 +53,7 @@ function loadMenu() {
                        jQuery('<ul/>', {
                                'class': 'nav',
                                html: menuitems.join('')
-                       }).appendTo('.menudiv');
+                       }).appendTo('.menuitems');
                } else {
                        throwError(resp.error, 'error', '#desktop');
                }
@@ -55,6 +61,10 @@ function loadMenu() {
 
 }
 
+function hideMenu() {
+       jQuery('.menuitems').empty();
+}
+
 function submitLogin() {
        loginData = {
                'username': jQuery('#inputUsername').val(),