* Added DHCP page
* Prepared Status section * Minor changes
This commit is contained in:
parent
338f4598eb
commit
b864e2933d
8 changed files with 53 additions and 6 deletions
|
@ -1,3 +1,3 @@
|
|||
#!/usr/bin/haserl --shell=luac
|
||||
print("Status: 302 Found")
|
||||
print("Location: ffluci\n")
|
||||
print("Location: ffluci/admin\n")
|
||||
|
|
1
src/ffluci/controller/admin/status.lua
Normal file
1
src/ffluci/controller/admin/status.lua
Normal file
|
@ -0,0 +1 @@
|
|||
module("ffluci.controller.admin.status", package.seeall)
|
37
src/ffluci/model/cbi/admin_network/dhcp.lua
Normal file
37
src/ffluci/model/cbi/admin_network/dhcp.lua
Normal file
|
@ -0,0 +1,37 @@
|
|||
-- ToDo: Translate, Add descriptions and help texts
|
||||
require("ffluci.model.uci")
|
||||
require("ffluci.sys")
|
||||
|
||||
m = Map("dhcp", "DHCP")
|
||||
|
||||
s = m:section(TypedSection, "dhcp")
|
||||
s.addremove = true
|
||||
s.anonymous = true
|
||||
|
||||
iface = s:option(ListValue, "interface", "Schnittstelle")
|
||||
for k, v in pairs(ffluci.model.uci.show("network").network) do
|
||||
if v[".type"] == "interface" and k ~= "loopback" then
|
||||
iface:value(k)
|
||||
end
|
||||
end
|
||||
|
||||
s:option(Value, "start", "Start").rmempty = true
|
||||
|
||||
s:option(Value, "limit", "Limit").rmempty = true
|
||||
|
||||
s:option(Flag, "dynamicdhcp", "Dynamisches DHCP").rmempty = true
|
||||
|
||||
s:option(Value, "name", "Name").optional = true
|
||||
|
||||
s:option(Flag, "ignore", "Schnittstelle ignorieren").optional = true
|
||||
|
||||
s:option(Value, "netmask", "Netzmaske").optional = true
|
||||
|
||||
s:option(Flag, "force", "Start erzwingen").optional = true
|
||||
|
||||
for i, line in pairs(ffluci.sys.execl("dnsmasq --help dhcp")) do
|
||||
k, v = line:match("([^ ]+) +([^ ]+)")
|
||||
s:option(Value, "dhcp"..k, v).optional = true
|
||||
end
|
||||
|
||||
return m
|
|
@ -3,6 +3,7 @@ m = Map("luci_fw", "Firewall")
|
|||
|
||||
s = m:section(TypedSection, "rule")
|
||||
s.addremove = true
|
||||
s.anonymous = true
|
||||
|
||||
chain = s:option(ListValue, "chain", "Kette")
|
||||
chain:value("forward", "Forward")
|
||||
|
|
|
@ -20,7 +20,7 @@ end
|
|||
network = s:option(ListValue, "network", "Netzwerk")
|
||||
network:value("")
|
||||
for k, v in pairs(ffluci.model.uci.show("network").network) do
|
||||
if v[".type"] == "interface" then
|
||||
if v[".type"] == "interface" and k ~= "loopback" then
|
||||
network:value(k)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7,7 +7,10 @@ add("admin", "index", "Übersicht", 10)
|
|||
act("contact", "Kontakt")
|
||||
act("luci", "FFLuCI")
|
||||
|
||||
add("admin", "system", "System", 20)
|
||||
add("admin", "status", "Status", 20)
|
||||
act("system", "System")
|
||||
|
||||
add("admin", "system", "System", 30)
|
||||
act("packages", "Paketverwaltung")
|
||||
act("passwd", "Passwort ändern")
|
||||
act("sshkeys", "SSH-Schlüssel")
|
||||
|
@ -15,20 +18,21 @@ act("fstab", "Einhängepunkte")
|
|||
act("upgrade", "Firmwareupgrade")
|
||||
act("reboot", "Neu starten")
|
||||
|
||||
add("admin", "services", "Dienste", 30)
|
||||
add("admin", "services", "Dienste", 40)
|
||||
act("olsrd", "OLSR")
|
||||
act("httpd", "HTTP-Server")
|
||||
act("dropbear", "SSH-Server")
|
||||
act("dnsmasq", "Dnsmasq")
|
||||
|
||||
add("admin", "network", "Netzwerk", 40)
|
||||
add("admin", "network", "Netzwerk", 50)
|
||||
act("vlan", "Switch")
|
||||
act("ifaces", "Schnittstellen")
|
||||
act("dhcp", "DHCP-Server")
|
||||
act("ptp", "PPPoE / PPTP")
|
||||
act("routes", "Statische Routen")
|
||||
act("portfw", "Portweiterleitung")
|
||||
act("firewall", "Firewall")
|
||||
|
||||
add("admin", "wifi", "Drahtlos", 50)
|
||||
add("admin", "wifi", "Drahtlos", 60)
|
||||
act("devices", "Geräte")
|
||||
act("networks", "Netze")
|
2
src/ffluci/view/admin_status/index.htm
Normal file
2
src/ffluci/view/admin_status/index.htm
Normal file
|
@ -0,0 +1,2 @@
|
|||
<%+header%>
|
||||
<%+footer%>
|
2
src/ffluci/view/admin_status/system.htm
Normal file
2
src/ffluci/view/admin_status/system.htm
Normal file
|
@ -0,0 +1,2 @@
|
|||
<%+header%>
|
||||
<%+footer%>
|
Loading…
Reference in a new issue