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
index f97db257510214e3058219c0d30170ca72058d36..76eeec05eba97d1b9aeedf12c403e48b74021287 100644 (file)
 
                        for i, r in ipairs(childs) do
                                local nnode = node.nodes[r]
-                               local title = pcdata(striptags(translate(nnode.title)))
+                               local title = striptags(translate(nnode.title))
 
                                write('<li><a data-title="%s" href="%s">%s</a></li>' %{
                                        title,
                                local grandchildren = disp.node_childs(nnode)
 
                                if #grandchildren > 0 then
-                                       local title = pcdata(striptags(translate(nnode.title)))
+                                       local title = striptags(translate(nnode.title))
 
                                        write('<li class="slide"><a class="menu" data-title="%s" href="#">%s</a>' %{
                                                title,
                                        render_submenu(category .. "/" .. r, nnode)
                                        write('</li>')
                                else
-                                       local title = pcdata(striptags(translate(nnode.title)))
+                                       local title = striptags(translate(nnode.title))
 
                                        write('<li><a data-title="%s" href="%s">%s</a></li>' %{
                                                title,
                        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
-
-                       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
-                       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%>">
        <meta charset="utf-8">
        <title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
        <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
-       <meta name="format-detection" content="telephone=no, email=no"/>
        <meta name="apple-mobile-web-app-capable" content="yes">
        <meta name="mobile-web-app-capable" content="yes">
-       <meta name="x5-fullscreen" content="true">
-       <meta name="full-screen" content="yes">
-       <meta name="x5-page-mode" content="app">
-       <meta name="browsermode" content="application">
-       <meta name="theme-color" content="#0099CC">
+       <meta name="theme-color" content="#09c">
        <meta name="msapplication-tap-highlight" content="no">
-       <meta name="msapplication-TileColor" content="#0099CC">
-
+       <meta name="msapplication-TileColor" content="#09c">
        <meta name="application-name" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
        <meta name="apple-mobile-web-app-title" content="<%=striptags( (boardinfo.hostname or "?") ) %> - LuCI">
-       <meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
-       <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%>">
        <% if css then %>
                <style title="text/css"><%= css %></style>
        <% end -%>
+       <script src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script>
        <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 %>">
+<body class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><% end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>" data-page="<%= table.concat(disp.context.requestpath, "-") %>">
 <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 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()">
+                                       <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>
 <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>
                                        <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 -%>