projects / project / luci.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
themes/*: Use application/xhtml+xml as Mime-Type
[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 df31154..b26b68a 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"?>
@@ -40,9 +41,9 @@ require("luci.http").prepare_content("text/html")
 <head>
        <link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" />
        <% 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-type" content="application/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 and 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 />
@@ -173,10 +174,7 @@ end
                <div>
                        <% if ucic > 0 then %>
                        <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>
-                       </ul>
+                       <% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
                        <% else %>
                        <a href="#"><%:changes%>: 0</a>
                        <% end %>
Lua Configuration Interface (mirror)