From f9e590aa4741bf337029be3f374a33543cc3f37b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 22 Oct 2015 21:07:40 +0200 Subject: [PATCH] luci-theme-material: do not infer login state from url (#520) Checking for `;` in the url is no good indicator whether a user is logged in, instead query the dispatcher and set a `logged-in` CSS class on the `` element if a session exists. Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/material/js/script.js | 5 ++--- .../luasrc/view/themes/material/header.htm | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js index a0f067595..fdd23e8cd 100755 --- a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js +++ b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js @@ -144,11 +144,10 @@ function getCurrentNodeByUrl() { var ret = false; var getUrlNode = function (href){ - var linkPos = href.indexOf(";"); - if (linkPos == -1){ + if (!$('body').hasClass('logged-in')){ return "login"; }else{ - linkPos = href.indexOf("/", linkPos); + var linkPos = href.indexOf("/", linkPos); if (linkPos == -1){ return "overview"; }else{ diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm index 99afc065b..153be101a 100755 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -135,7 +135,7 @@ - +

-- 2.25.1