Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/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 052c174dcadf2da9f8a364feda3a31cee83c2a6b..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
@@ -155,26 +155,6 @@
                         write('</ul>')
                 end
         end
-
-       local function render_changes()
-               -- 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
-                               ucichanges = ucichanges + #j
-                       end
-
-                       if ucichanges > 0 then
-                               write('<a class="uci_change_indicator label notice" href="%s?redir=%s">%s: %d</a>' %{
-                                       url(category, 'uci/changes'),
-                                       http.urlencode(http.formvalue('redir') or table.concat(disp.context.request, "/")),
-                                       translate('Unsaved Changes'),
-                                       ucichanges
-                               })
-                       end
-               end
-       end
  -%>
  <!DOCTYPE html>
  <html lang="<%=luci.i18n.context.lang%>">
@@ -206,10 +186,9 @@
         <div class="fill">
                 <div class="container">
                         <span class="showSide"></span>
-                       <img src="<%=media%>/brand.png"/>
+                       <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">
-                               <% 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>
@@ -219,7 +198,7 @@
         </div>
  </header>
  <div class="main">
-       <div style="" class="loading"><span><div class="loading-img"></div>Loading...</span></div>
+       <div style="" class="loading"><span><div class="loading-img"></div><%:Collecting data...%></span></div>
         <div class="main-left">
                 <% render_topmenu() %>
         </div>