projects / project / luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c4341e)
luci-theme-material: do not infer login state from url (#520)
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 22 Oct 2015 19:07:40 +0000 (21:07 +0200)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 22 Oct 2015 19:08:22 +0000 (21:08 +0200)
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 `<body>`
element if a session exists.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
themes/luci-theme-material/htdocs/luci-static/material/js/script.js patch | blob | history
themes/luci-theme-material/luasrc/view/themes/material/header.htm patch | blob | history

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 a0f067595b5918dad8c1b3d202ac70e08f4dc38a..fdd23e8cd2d6b67498a6246be1c62c301471b275 100755 (executable)
--- 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 99afc065b3ed8aba3426a3fb8f7027814571874f..153be101a56095bc5c81592e4b77a76b0be16c95 100755 (executable)
--- 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 @@
     <script src="<%=resource%>/xhr.js"></script>
 </head>
 
-<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %>">
+<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
 
 <header>
        <div class="container">
Lua Configuration Interface (mirror)