* luci/themes: little title fix for openwrt.org theme

[project/luci.git] / themes / openwrt.org / luasrc / view / themes / openwrt.org / header.htm

diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
index 5aed18f..9feb8c0 100644 (file)
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -20,6 +20,7 @@ local category = request[1]
 local tree     = luci.dispatcher.node()
 local cattree  = category and luci.dispatcher.node(category)
 local node     = luci.dispatcher.context.dispatched
+local hostname = luci.sys.hostname()
 
 local c = tree
 for i,r in ipairs(request) do
@@ -30,8 +31,8 @@ for i,r in ipairs(request) do
 end
 
 require("luci.i18n").loadc("default")
-
 require("luci.http").prepare_content("text/html")
+
 -%>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -42,7 +43,7 @@ require("luci.http").prepare_content("text/html")
        <% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %>
        <meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8" />
        <meta http-equiv="content-script-type" content="text/javascript" />
-       <title>LuCI - Lua Configuration Interface - <%=(node and node.title)%></title>
+       <title><%= hostname .. ( node.title and ' - ' .. node.title or '') %> - LuCI</title>
 
        <!--[if lt IE 7]>
                <script type="text/javascript">
@@ -67,7 +68,7 @@ require("luci.http").prepare_content("text/html")
        <%=luci.config.brand.firmware%><br />
        <%=luci.config.brand.distro%><br />
        <%:load%>: <%=load1%> <%=load5%> <%=load15%><br />
-       <%:hostname%>: <%=luci.sys.hostname()%>
+       <%:hostname%>: <%=hostname%>
        </div>
        <div class="title">
                <span class="headertitle"><%=luci.config.brand.title%></span><br />
@@ -91,7 +92,7 @@ end
 
 <div class="menubar">
        <div id="mainmenu" class="mainmenu">
-<%
+<%-
 local function submenu(prefix, node)
        if not node.nodes then
                return false
@@ -110,18 +111,20 @@ local function submenu(prefix, node)
        if count > 0 then
 %>
        <ul>
-       <% for j, v in pairs(index) do
-               local nnode = node.nodes[v.name]
-               local href = controller .. prefix .. v.name
-               href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
+       <%- for j, v in pairs(index) do
+               if #v.name > 0 then
+                       local nnode = node.nodes[v.name]
+                       local href = controller .. prefix .. v.name
+                       href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
                %>
                <li>
                        <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>
-                       <% submenu(prefix .. v.name .. "/", nnode) %>
+                       <%- submenu(prefix .. v.name .. "/", nnode) %>
                </li>
-       <% end %>
+               <%- end %>
+       <%- end %>
        </ul>
-<%
+<%-
        end
 end
 
@@ -170,7 +173,7 @@ end
        <div class="mainmenu" style="float:right; margin-right:2em">
                <div>
                        <% if ucic > 0 then %>
-                       <a href="<%=controller%>/<%=category%>/uci/changes"><%:changes%>: <%=ucic%></a>
+                       <a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:unsavedchanges%>: <%=ucic%></a>
                        <ul>
                                <li><a href="<%=controller%>/<%=category%>/uci/apply"><%:apply%></a></li>
                                <li><a href="<%=controller%>/<%=category%>/uci/revert"><%:revert%></a></li>