diff --git a/app/templates/layout/default.php b/app/templates/layout/default.php index 537fe2e2b..daab66227 100644 --- a/app/templates/layout/default.php +++ b/app/templates/layout/default.php @@ -71,11 +71,7 @@ $bodyClasses = $controller_stripped . ' ' .$action_stripped; // add further body classes as needed - if($this->getRequest()->getSession()->check('Auth.User') != NULL) { - $bodyClasses .= ' logged-in'; - } else { - $bodyClasses .= ' logged-out'; - } + $bodyClasses .= !empty($vv_user) ? ' logged-in' : ' logged-out'; ?>
diff --git a/app/webroot/js/comanage/match-onload.js b/app/webroot/js/comanage/match-onload.js index 637a1ff50..8b8a295a8 100644 --- a/app/webroot/js/comanage/match-onload.js +++ b/app/webroot/js/comanage/match-onload.js @@ -187,4 +187,10 @@ $(function() { } }); + + // Dismiss the loading animation on pagehide so that browser caching (specifically Chrome) + // will not retain it in the DOM when a user hits the back-button. + $(window).on('pagehide', function() { + stopSpinner(); + }); }); \ No newline at end of file