summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-fw
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-05-22 14:04:03 +0000
committerSteven Barth <steven@midlink.org>2008-05-22 14:04:03 +0000
commit6604399aa8f35d33c53a5e5a1fea765f401aef5e (patch)
treeed818d630634a98a8996a1ba6d10e63bbea17c39 /applications/luci-fw
parentf738eb786e3d30028310c7bcc447e7e7b63767e0 (diff)
Merge branch 'menu'
Diffstat (limited to 'applications/luci-fw')
-rw-r--r--applications/luci-fw/src/controller/luci_fw/luci_fw.lua18
-rw-r--r--applications/luci-fw/src/model/cbi/luci_fw/firewall.lua (renamed from applications/luci-fw/src/model/cbi/admin_network/firewall.lua)0
-rw-r--r--applications/luci-fw/src/model/cbi/luci_fw/portfw.lua (renamed from applications/luci-fw/src/model/cbi/admin_network/portfw.lua)0
-rw-r--r--applications/luci-fw/src/model/cbi/luci_fw/routing.lua (renamed from applications/luci-fw/src/model/cbi/admin_network/routing.lua)0
-rw-r--r--applications/luci-fw/src/model/menu/50luci-fw.lua4
5 files changed, 18 insertions, 4 deletions
diff --git a/applications/luci-fw/src/controller/luci_fw/luci_fw.lua b/applications/luci-fw/src/controller/luci_fw/luci_fw.lua
new file mode 100644
index 000000000..864455ca8
--- /dev/null
+++ b/applications/luci-fw/src/controller/luci_fw/luci_fw.lua
@@ -0,0 +1,18 @@
+module("ffluci.controller.luci_fw.luci_fw", package.seeall)
+
+function index()
+ local page = node("admin", "network", "portfw")
+ page.target = cbi("luci_fw/portfw")
+ page.title = "Portweiterleitung"
+ page.order = 70
+
+ local page = node("admin", "network", "routing")
+ page.target = cbi("luci_fw/routing")
+ page.title = "Routing"
+ page.order = 72
+
+ local page = node("admin", "network", "firewall")
+ page.target = cbi("luci_fw/firewall")
+ page.title = "Firewall"
+ page.order = 74
+end \ No newline at end of file
diff --git a/applications/luci-fw/src/model/cbi/admin_network/firewall.lua b/applications/luci-fw/src/model/cbi/luci_fw/firewall.lua
index 7c89d07c5..7c89d07c5 100644
--- a/applications/luci-fw/src/model/cbi/admin_network/firewall.lua
+++ b/applications/luci-fw/src/model/cbi/luci_fw/firewall.lua
diff --git a/applications/luci-fw/src/model/cbi/admin_network/portfw.lua b/applications/luci-fw/src/model/cbi/luci_fw/portfw.lua
index 90ebb4c24..90ebb4c24 100644
--- a/applications/luci-fw/src/model/cbi/admin_network/portfw.lua
+++ b/applications/luci-fw/src/model/cbi/luci_fw/portfw.lua
diff --git a/applications/luci-fw/src/model/cbi/admin_network/routing.lua b/applications/luci-fw/src/model/cbi/luci_fw/routing.lua
index 5805b1d3f..5805b1d3f 100644
--- a/applications/luci-fw/src/model/cbi/admin_network/routing.lua
+++ b/applications/luci-fw/src/model/cbi/luci_fw/routing.lua
diff --git a/applications/luci-fw/src/model/menu/50luci-fw.lua b/applications/luci-fw/src/model/menu/50luci-fw.lua
deleted file mode 100644
index b7543b062..000000000
--- a/applications/luci-fw/src/model/menu/50luci-fw.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-sel("admin", "network")
-act("portfw", "Portweiterleitung")
-act("routing", "Routing")
-act("firewall", "Firewall") \ No newline at end of file