Merge pull request #3024 from TDT-AG/pr/20190829-material-logo

luci-theme-material: show logo also on login page

diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
index d74077853a60973c3b793e794d58499a67446a2d..91f87c69c1a1175675215d50f2dcf461da177e1a 100644 (file)
--- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
@@ -401,10 +401,6 @@ header > .fill > .container > #logo > img {
        margin-top: -.1rem;
 }
 
-body:not(.logged-in) > header > .fill > .container > #logo {
-       display: none;
-}
-
 header > .fill > .container > .brand {
        font-size: 1.4rem;
        position: absolute;

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 7ce195cc9f8cfa13c6e6ee132c56d38713ab478d..76eeec05eba97d1b9aeedf12c403e48b74021287 100644 (file)
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -186,7 +186,7 @@
        <div class="fill">
                <div class="container">
                        <span class="showSide"></span>
-                       <a id="logo" href="<%=url("admin/status/overview")%>"><img src="<%=media%>/brand.png" alt="OpenWrt"></a>
+                       <a id="logo" href="<% if luci.dispatcher.context.authsession then %><%=url('admin/status/overview')%><% else %>#<% end %>"><img src="<%=media%>/brand.png" alt="OpenWrt"></a>
                        <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
                        <div class="status">
                                <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">