modules/admin-full: unify style of headings accross system menus, remove orphaned...

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua b/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
index 22258a93729855ec589ec7fc33f96ab487ee6eae..a063ec0aa4b65b961182119dbbe3343737fd6d8b 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
@@ -21,7 +21,7 @@ elseif luci.http.formvalue("cbid.luci.1._edit") then
        return
 end
 
-m = SimpleForm("luci", "%s - %s - %s" %{ translate("System"), translate("Flash operations"), translate("Backup file list") })
+m = SimpleForm("luci", translate("Backup file list"))
 m:append(Template("admin_system/backupfiles"))
 
 if luci.http.formvalue("display") ~= "list" then

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index ed7701222e90ed2092e132e1d9e88dffa444c47b..1f488dac265192789cce4aa0e2f3134b595b4de2 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -19,16 +19,12 @@ require("luci.tools.webadmin")
 require("luci.fs")
 require("luci.config")
 
-m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
-m:chain("luci")
+local m, s, o
+local has_ntpd = luci.fs.access("/usr/sbin/ntpd")
 
-local has_rdate = false
 
-m.uci:foreach("system", "rdate",
-       function()
-               has_rdate = true
-               return false
-       end)
+m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
+m:chain("luci")
 
 
 s = m:section(TypedSection, "system", translate("System Properties"))
@@ -44,27 +40,27 @@ s:tab("language", translate("Language and Style"))
 -- System Properties
 --
 
-clock = s:taboption("general", DummyValue, "_systime", translate("Local Time"))
-clock.template = "admin_system/clock_status"
+o = s:taboption("general", DummyValue, "_systime", translate("Local Time"))
+o.template = "admin_system/clock_status"
 
 
-hn = s:taboption("general", Value, "hostname", translate("Hostname"))
-hn.datatype = "hostname"
+o = s:taboption("general", Value, "hostname", translate("Hostname"))
+o.datatype = "hostname"
 
-function hn.write(self, section, value)
+function o.write(self, section, value)
        Value.write(self, section, value)
        luci.sys.hostname(value)
 end
 
 
-tz = s:taboption("general", ListValue, "zonename", translate("Timezone"))
-tz:value("UTC")
+o = s:taboption("general", ListValue, "zonename", translate("Timezone"))
+o:value("UTC")
 
 for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
-       tz:value(zone[1])
+       o:value(zone[1])
 end
 
-function tz.write(self, section, value)
+function o.write(self, section, value)
        local function lookup_zone(title)
                for _, zone in ipairs(luci.sys.zoneinfo.TZ) do
                        if zone[1] == title then return zone[2] end
@@ -155,31 +151,40 @@ end
 
 
 --
--- Rdate
+-- NTP
 --
 
-if has_rdate then
-       m2 = Map("timeserver", translate("Time Server (rdate)"))
-       s = m2:section(TypedSection, "timeserver")
+if has_ntpd then
+       s = m:section(TypedSection, "timeserver", translate("Time Synchronization"))
        s.anonymous = true
-       s.addremove = true
-       s.template = "cbi/tblsection"
-
-       h = s:option(Value, "hostname", translate("Name"))
-       h.rmempty = true
-       h.datatype = host
-       i = s:option(ListValue, "interface", translate("Interface"))
-       i.rmempty = true
-       i:value("", translate("Default"))
-       m2.uci:foreach("network", "interface",
-               function (section)
-                       local ifc = section[".name"]
-                       if ifc ~= "loopback" then
-                               i:value(ifc)
-                       end
+       s.addremove = false
+
+       o = s:option(Flag, "enable", translate("Enable builtin NTP server"))
+       o.rmempty = false
+
+       function o.cfgvalue(self)
+               return luci.sys.init.enabled("sysntpd")
+                       and self.enabled or self.disabled
+       end
+
+       function o.write(self, section, value)
+               if value == self.enabled then
+                       luci.sys.init.enable("sysntpd")
+                       luci.sys.call("env -i /etc/init.d/sysntpd start >/dev/null")
+               else
+                       luci.sys.call("env -i /etc/init.d/sysntpd stop >/dev/null")
+                       luci.sys.init.disable("sysntpd")
                end
-       )
+       end
+
+
+       o = s:option(DynamicList, "server", translate("NTP server candidates"))
+       o.datatype = "host"
+       o:depends("enable", "1")
+
+       -- retain server list even if disabled
+       function o.remove() end
 end
 
 
-return m, m2
+return m

diff --git a/modules/admin-full/luasrc/view/admin_system/backup.htm b/modules/admin-full/luasrc/view/admin_system/backup.htm
deleted file mode 100644 (file)
index 47b513b..0000000
--- a/modules/admin-full/luasrc/view/admin_system/backup.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>
-<%+header%>
-<h2><a id="content" name="content"><%:System%></a></h2>
-<h3><%:Backup / Restore%></h3>
-<p><%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%></p>
-<br />
-<div>
-       <ul>
-       <li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li>
-       <% if reset_avail then -%>
-       <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset router to defaults%></a></li>
-       <% end -%>
-       </ul>
-</div>
-
-<br />
-
-<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
-       <div class="left"><%:Backup Archive%>:</div>
-       <div>
-               <input type="file" size="30" name="archive" />
-       </div>
-       <div>
-               <input type="submit" class="cbi-button cbi-input-apply" value="<%:Restore backup%>" />
-       </div>
-</form>
-<%+footer%>

diff --git a/modules/admin-full/luasrc/view/admin_system/flashops.htm b/modules/admin-full/luasrc/view/admin_system/flashops.htm
index 628ede7728fa5cd3eee85ca4606a25d775ce9888..0ba22a5e01c43c341ad052f9ec895d6ccb1e99c3 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/admin-full/luasrc/view/admin_system/flashops.htm
@@ -15,7 +15,7 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:System%> - <%:Flash operations%></a></h2>
+<h2><a id="content" name="content"><%:Flash operations%></a></h2>
 
 <ul class="cbi-tabmenu">
        <li class="cbi-tab"><a href="#"><%:Actions%></a></li>

diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index aff582e7f9ac3ddec2ab626319051be78b039466..73a35bec98ef201cfb07febe7ad2ebc130afb66f 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -48,8 +48,10 @@ else
 end
 
 -%>
+
 <%+header%>
-<h2><a id="content" name="content"><%:System%> - <%:Software%></a></h2>
+
+<h2><a id="content" name="content"><%:Software%></a></h2>
 
 <form method="post" action="<%=REQUEST_URI%>">
        <div class="cbi-map">

diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 950eba8e75c05ee958073d4aca8462aa668d9eb4..69fde9a683c6774e143c3f2660784c7e44b85739 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -15,7 +15,7 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:System%> - <%:Flash Firmware%> - <%:Verify%></a></h2>
+<h2><a id="content" name="content"><%:Flash Firmware%> - <%:Verify%></a></h2>
 <p>
        <%_ The flash image was uploaded.
                Below is the checksum and file size listed,
@@ -54,14 +54,14 @@ $Id$
 </fieldset>
 
 <div class="cbi-page-actions right">
+       <form style="display:inline" action="<%=REQUEST_URI%>" method="post">
+               <input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
+       </form>
        <form style="display:inline" action="<%=REQUEST_URI%>" method="post">
                <input type="hidden" name="step" value="2" />
                <input type="hidden" name="keep" value="<%=keep and "1" or ""%>" />
                <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />
        </form>
-       <form style="display:inline" action="<%=REQUEST_URI%>" method="post">
-               <input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
-       </form>
 </div>
 
 <%+footer%>