luci-theme-material: PR from Version 0.2.11

Signed-off-by: Lutty Yang <lutty@wcan.in>

diff --git a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css b/themes/luci-theme-material/htdocs/luci-static/material/css/style.css
index f11f1ca0fdc82a146f28b7a18ac9c0f409e809d7..8516595038d587e336e20e30cd9290783b04d776 100755 (executable)
--- a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/css/style.css
@@ -150,6 +150,9 @@ footer > a{
 .main {
     top: 4rem;
     bottom: 0rem;
+    position: relative;
+    height: 100%;
+    height: calc(100% - 4rem);
 }
 
 .main > .loading{
@@ -195,22 +198,29 @@ footer > a{
 
 .main-left {
     float: left;
+    top: 4rem;
     width: 15%;
     width: calc(0% + 17rem);
     height: 100%;
-    overflow-y: auto;
+    height: calc(100% - 4rem);
     background-color: white;
+
+    overflow-x: auto;
+    position: fixed;
 }
 
 .main-right {
     width: 85%;
     width: calc(100% - 17rem);
     float: right;
-    overflow-y: auto;
     height: 100%;
     background-color: #EEE;
 }
 
+.main-right > #maincontent{
+    background-color: #EEE;
+}
+
 .pull-right {
     float: right;
 }
@@ -1195,10 +1205,13 @@ body.lang_pl.node-main-login .cbi-value-title {
 
     .main {
         top: 3.5rem;
+        height: calc(100% - 3.5rem);
     }
 
     .main-left {
         width: calc(0% + 13rem);
+        top: 3.5rem;
+        height: calc(100% - 3.5rem);
     }
 
     .main-right {

diff --git a/themes/luci-theme-material/luasrc/view/themes/material/footer.htm b/themes/luci-theme-material/luasrc/view/themes/material/footer.htm
index 5cb74ce1e4784f8b5ced0c8297244887468b7503..3127855774416ed14e390191d42f892b78c7c70e 100755 (executable)
--- a/themes/luci-theme-material/luasrc/view/themes/material/footer.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/footer.htm
@@ -42,6 +42,6 @@
         </div>
 
     <script src="<%=media%>/js/jquery.min.js"></script>
-    <script src="<%=media%>/js/script.js"></script>
+    <script src="<%=media%>/js/script.js?<%= ver.luciversion %>"></script>
 </body>
 </html>

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 05d9419a80c70207e5c27494147db6737c38e492..99afc065b3ed8aba3426a3fb8f7027814571874f 100755 (executable)
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -19,6 +19,7 @@
 -%>
 
 <%
+       local ver = require "luci.version"
        local sys  = require "luci.sys"
        local util = require "luci.util"
        local http = require "luci.http"
@@ -121,7 +122,7 @@
     <meta name="msapplication-tap-highlight" content="no">
     <meta name="msapplication-TileColor" content="#0099CC">
     <meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
-    <link rel="stylesheet" href="<%=media%>/css/style.css">
+    <link rel="stylesheet" href="<%=media%>/css/style.css?<%= ver.luciversion %>">
     <link rel="shortcut icon" href="<%=media%>/favicon.ico">
     <% if node and node.css then %>
         <link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
@@ -154,7 +155,7 @@
                        end
                        %>
                        <% if ucichanges > 0 then %>
-                       <a class="label notice" href="<%=controller%>/<%=category%>/uci/changes"><span class="mobile-hide"><%:Unsaved Changes%>: </span><%=ucichanges%></a>
+                       <a class="label notice" href="<%=controller%>/<%=category%>/uci/changes?redir=<%=http.urlencode(http.formvalue("redir") or REQUEST_URI)%>"><span class="mobile-hide"><%:Unsaved Changes%>: </span><%=ucichanges%></a>
                        <% end %>
                        <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
                                <span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"><%:Auto Refresh%> </span><%:on%></span>