Merge branch 'menu'
authorSteven Barth <steven@midlink.org>
Thu, 22 May 2008 14:04:03 +0000 (14:04 +0000)
committerSteven Barth <steven@midlink.org>
Thu, 22 May 2008 14:04:03 +0000 (14:04 +0000)
commit6604399aa8f35d33c53a5e5a1fea765f401aef5e
treeed818d630634a98a8996a1ba6d10e63bbea17c39
parentf738eb786e3d30028310c7bcc447e7e7b63767e0
Merge branch 'menu'
73 files changed:
applications/community-halle/Makefile [new file with mode: 0644]
applications/community-halle/root/etc/uci-defaults/ffluci-community-halle [new file with mode: 0644]
applications/luci-fw/src/controller/luci_fw/luci_fw.lua [new file with mode: 0644]
applications/luci-fw/src/model/cbi/admin_network/firewall.lua [deleted file]
applications/luci-fw/src/model/cbi/admin_network/portfw.lua [deleted file]
applications/luci-fw/src/model/cbi/admin_network/routing.lua [deleted file]
applications/luci-fw/src/model/cbi/luci_fw/firewall.lua [new file with mode: 0644]
applications/luci-fw/src/model/cbi/luci_fw/portfw.lua [new file with mode: 0644]
applications/luci-fw/src/model/cbi/luci_fw/routing.lua [new file with mode: 0644]
applications/luci-fw/src/model/menu/50luci-fw.lua [deleted file]
applications/luci-splash/src/controller/splash/splash.lua
applications/luci-splash/src/model/cbi/admin_services/splash.lua [deleted file]
applications/luci-splash/src/model/cbi/splash/splash.lua [new file with mode: 0644]
applications/luci-splash/src/model/menu/50luci-splash.lua [deleted file]
applications/sgi-haserl/root/www/cgi-bin/ffluci
applications/sgi-webuci/root/lib/webuci/main.lua
build/config.mk
contrib/package/ffluci/Makefile
contrib/package/lua-luci/patches/200-lua-path.patch
core/root/etc/config/luci
core/src/dispatcher.lua
core/src/i18n/default.en
core/src/init.lua
core/src/menu.lua
core/src/template.lua
core/src/view/footer.htm
core/src/view/header.htm
modules/admin-core/src/controller/admin/index.lua
modules/admin-core/src/controller/admin/network.lua
modules/admin-core/src/controller/admin/services.lua
modules/admin-core/src/controller/admin/status.lua
modules/admin-core/src/controller/admin/system.lua
modules/admin-core/src/controller/admin/uci.lua
modules/admin-core/src/controller/admin/wifi.lua
modules/admin-core/src/i18n/admin_index.en
modules/admin-core/src/model/cbi/admin_index/luci.lua
modules/admin-core/src/model/menu/00admin.lua [deleted file]
modules/freifunk/src/controller/admin/index/wizard.lua [deleted file]
modules/freifunk/src/controller/freifunk/freifunk.lua [new file with mode: 0644]
modules/freifunk/src/controller/freifunk/luciinfo.lua [new file with mode: 0644]
modules/freifunk/src/controller/freifunk/olsr.lua [new file with mode: 0644]
modules/freifunk/src/controller/public/index.lua [deleted file]
modules/freifunk/src/controller/public/olsr.lua [deleted file]
modules/freifunk/src/controller/public/status.lua [deleted file]
modules/freifunk/src/controller/rpc/luciinfo.lua [deleted file]
modules/freifunk/src/controller/sudo/status.lua [deleted file]
modules/freifunk/src/model/cbi/admin_index/contact.lua [deleted file]
modules/freifunk/src/model/cbi/admin_index/freifunk.lua [deleted file]
modules/freifunk/src/model/cbi/freifunk/contact.lua [new file with mode: 0644]
modules/freifunk/src/model/cbi/freifunk/freifunk.lua [new file with mode: 0644]
modules/freifunk/src/model/menu/10freifunk.lua [deleted file]
modules/freifunk/src/view/admin_index/wizard.htm [deleted file]
modules/freifunk/src/view/freifunk-olsr/error_olsr.htm [new file with mode: 0644]
modules/freifunk/src/view/freifunk-olsr/hna.htm [new file with mode: 0644]
modules/freifunk/src/view/freifunk-olsr/index.htm [new file with mode: 0644]
modules/freifunk/src/view/freifunk-olsr/mid.htm [new file with mode: 0644]
modules/freifunk/src/view/freifunk-olsr/routes.htm [new file with mode: 0644]
modules/freifunk/src/view/freifunk-olsr/topology.htm [new file with mode: 0644]
modules/freifunk/src/view/freifunk/contact.htm [new file with mode: 0644]
modules/freifunk/src/view/freifunk/index.htm [new file with mode: 0644]
modules/freifunk/src/view/freifunk/wizard.htm [new file with mode: 0644]
modules/freifunk/src/view/public_index/contact.htm [deleted file]
modules/freifunk/src/view/public_index/index.htm [deleted file]
modules/freifunk/src/view/public_olsr/error_olsr.htm [deleted file]
modules/freifunk/src/view/public_olsr/hna.htm [deleted file]
modules/freifunk/src/view/public_olsr/index.htm [deleted file]
modules/freifunk/src/view/public_olsr/mid.htm [deleted file]
modules/freifunk/src/view/public_olsr/routes.htm [deleted file]
modules/freifunk/src/view/public_olsr/topology.htm [deleted file]
modules/freifunk/src/view/public_status/index.htm
modules/freifunk/src/view/public_status/iwscan.htm
modules/freifunk/src/view/sudo_status/iwconfig.htm [deleted file]
modules/freifunk/src/view/sudo_status/iwscan.htm [deleted file]