projects / project / luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f9e590a)
Revert "luci-theme-material: do not infer login state from url (#520)"
authorHannu Nyman <hannu.nyman@iki.fi>
Fri, 23 Oct 2015 17:16:04 +0000 (20:16 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Fri, 23 Oct 2015 17:16:04 +0000 (20:16 +0300)
This reverts commit f9e590aa4741bf337029be3f374a33543cc3f37b
in order to enable a clean merge of the PR #521 from the theme author.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
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 fdd23e8..a0f0675 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,10 +144,11 @@
     function getCurrentNodeByUrl() {
         var ret = false;
         var getUrlNode = function (href){
     function getCurrentNodeByUrl() {
         var ret = false;
         var getUrlNode = function (href){
-            if (!$('body').hasClass('logged-in')){
+            var linkPos = href.indexOf(";");
+            if (linkPos == -1){
                 return "login";
             }else{
                 return "login";
             }else{
-                var linkPos = href.indexOf("/", linkPos);
+                linkPos = href.indexOf("/", linkPos);
                 if (linkPos == -1){
                     return "overview";
                 }else{
                 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 153be10..99afc06 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>
 
     <script src="<%=resource%>/xhr.js"></script>
 </head>
 
-<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
+<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %>">
 
 <header>
        <div class="container">
 
 <header>
        <div class="container">
Lua Configuration Interface (mirror)