projects / project / luci.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
modules: Make luci-base sufficient to use luci apps
[project/luci.git] / themes / luci-theme-material / luasrc / view / themes / material / header.htm
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 b6341a2c35ae26ab0092f7ea9f6b1ca28faa74b9..564c680f1d59c5fd16c94396cd7fa569015a7364 100644 (file)
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -160,13 +160,9 @@
                -- calculate the number of unsaved changes
                if tree.nodes[category] and tree.nodes[category].ucidata then
                        local ucichanges = 0
-
+                       local i, j
                        for i, j in pairs(require("luci.model.uci").cursor():changes()) do
-                               for k, l in pairs(j) do
-                                       for m, n in pairs(l) do
-                                               ucichanges = ucichanges + 1;
-                                       end
-                               end
+                               ucichanges = ucichanges + #j
                        end
 
                        if ucichanges > 0 then
@@ -203,7 +199,7 @@
        <link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
        <link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
 
-       <link rel="stylesheet" href="<%=media%>/css/style.css">
+       <link rel="stylesheet" href="<%=media%>/cascade.css">
        <link rel="shortcut icon" href="<%=media%>/favicon.ico">
        <% if node and node.css then %>
                <link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
@@ -211,19 +207,22 @@
        <% if css then %>
                <style title="text/css"><%= css %></style>
        <% end -%>
+       <script src="<%=resource%>/cbi.js"></script>
        <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 %>">
 <header>
-       <div class="container">
-               <span class="showSide"></span>
-               <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
-               <div class="pull-right">
-                       <% render_changes() %>
-                       <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>
-                               <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
-                       </span>
+       <div class="fill">
+               <div class="container">
+                       <span class="showSide"></span>
+                       <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
+                       <div class="pull-right">
+                               <% render_changes() %>
+                               <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>
+                                       <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
+                               </span>
+                       </div>
                </div>
        </div>
 </header>
@@ -240,7 +239,9 @@
                                        <div class="alert-message warning">
                                                <h4><%:No password set!%></h4>
                                                <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
-                                               <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
+                                               <% if disp.lookup("admin/system/admin") then %>
+                                                       <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div>
+                                               <% end %>
                                        </div>
                                <%- end -%>
 
Lua Configuration Interface (mirror)