diff options
| author | Lutty Yang <lutty@wcan.in> | 2015-10-13 23:07:16 +0800 |
|---|---|---|
| committer | Lutty Yang <lutty@wcan.in> | 2015-10-13 23:07:16 +0800 |
| commit | 780778e6f98d0e8b5bd531f79636fd43b7b99c11 (patch) | |
| tree | 5aa69190c9486d497ba7a5d64a6095561d657276 /themes/luci-theme-material/luasrc/view | |
| parent | 7567f2d01f6e136abfa82e1b1ef85bfe287f13dc (diff) | |
luci-theme-material: PR from Version 0.2.11
Signed-off-by: Lutty Yang <lutty@wcan.in>
Diffstat (limited to 'themes/luci-theme-material/luasrc/view')
| -rwxr-xr-x | themes/luci-theme-material/luasrc/view/themes/material/footer.htm | 2 | ||||
| -rwxr-xr-x | themes/luci-theme-material/luasrc/view/themes/material/header.htm | 5 |
2 files changed, 4 insertions, 3 deletions
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 5cb74ce1e4..3127855774 100755 --- 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 05d9419a80..99afc065b3 100755 --- 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> |