Split up admin-core into admin-core and admin-full, preparing admin-mini

43 files changed, 89 insertions, 6 deletions

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 2c30695e7..e369acfc4 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -286,7 +286,7 @@ endef
 define Package/luci-mod-admin-core
   $(call Package/luci/webtemplate)
   DEPENDS+=+luci-web +luci-cbi +luci-theme-openwrt +luci-i18n-english
-  TITLE:=Administration module
+  TITLE:=Administration core module
 endef
 
 define Package/luci-mod-admin-core/install
@@ -294,9 +294,31 @@ define Package/luci-mod-admin-core/install
 endef
 
 
+define Package/luci-mod-admin-mini
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-mod-admin-core
+  TITLE:=Simplified Administration module
+endef
+
+define Package/luci-mod-admin-mini/install
+	$(call Package/luci/install/template,$(1),modules/admin-mini)
+endef
+
+
+define Package/luci-mod-admin-full
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-mod-admin-core
+  TITLE:=Full featured Administration module
+endef
+
+define Package/luci-mod-admin-full/install
+	$(call Package/luci/install/template,$(1),modules/admin-full)
+endef
+
+
 define Package/luci-mod-freifunk
   $(call Package/luci/fftemplate)
-  DEPENDS:=+luci-mod-admin-core
+  DEPENDS:=+luci-mod-admin-full
   TITLE:=LuCI Freifunk module
 endef
 
@@ -325,7 +347,7 @@ endef
 
 define Package/luci-app-firewall
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-mod-admin-core
+  DEPENDS+=+luci-mod-admin-full
   TITLE:=Firewall and Portforwarding application
 endef
 
@@ -340,7 +362,7 @@ endef
 
 define Package/luci-app-olsr
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-mod-admin-core +olsrd-mod-txtinfo
+  DEPENDS+=+luci-mod-admin-full +olsrd-mod-txtinfo
   TITLE:=OLSR configuration and status module
 endef
 
@@ -351,7 +373,7 @@ endef
 
 define Package/luci-app-qos
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-mod-admin-core +qos-scripts
+  DEPENDS+=+luci-mod-admin-full +qos-scripts
   TITLE:=Quality of Service configuration module
 endef
 
@@ -377,7 +399,7 @@ endef
 
 define Package/luci-app-statistics
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1
+  DEPENDS+=+luci-mod-admin-full +collectd +collectd-mod-rrdtool1 +rrdtool1
   TITLE:=LuCI Statistics Application
 endef
 
@@ -516,6 +538,12 @@ endif
 ifneq ($(CONFIG_PACKAGE_luci-mod-admin-core),)
 	PKG_SELECTED_MODULES+=modules/admin-core
 endif
+ifneq ($(CONFIG_PACKAGE_luci-mod-admin-mini),)
+	PKG_SELECTED_MODULES+=modules/admin-mini
+endif
+ifneq ($(CONFIG_PACKAGE_luci-mod-admin-full),)
+	PKG_SELECTED_MODULES+=modules/admin-full
+endif
 ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk),)
 	PKG_SELECTED_MODULES+=modules/freifunk
 endif
@@ -592,6 +620,8 @@ $(eval $(call BuildPackage,luci-ff-berlin))
 $(eval $(call BuildPackage,luci-ff-augsburg))
 
 $(eval $(call BuildPackage,luci-mod-admin-core))
+#$(eval $(call BuildPackage,luci-mod-admin-mini))
+$(eval $(call BuildPackage,luci-mod-admin-full))
 $(eval $(call BuildPackage,luci-mod-freifunk))
 
 $(eval $(call BuildPackage,luci-app-ffwizard-leipzig))
diff --git a/modules/admin-full/Makefile b/modules/admin-full/Makefile
new file mode 100644
index 000000000..81a96f6a8
--- /dev/null
+++ b/modules/admin-full/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/modules/admin-core/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index eb58e0042..eb58e0042 100644
--- a/modules/admin-core/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
diff --git a/modules/admin-core/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 871263334..871263334 100644
--- a/modules/admin-core/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
diff --git a/modules/admin-core/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua
index 59defbbbd..59defbbbd 100644
--- a/modules/admin-core/luasrc/controller/admin/services.lua
+++ b/modules/admin-full/luasrc/controller/admin/services.lua
diff --git a/modules/admin-core/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index 3a0f04074..3a0f04074 100644
--- a/modules/admin-core/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
diff --git a/modules/admin-core/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 862a741cd..862a741cd 100644
--- a/modules/admin-core/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
diff --git a/modules/admin-core/luasrc/controller/admin/uci.lua b/modules/admin-full/luasrc/controller/admin/uci.lua
index 215a13a34..215a13a34 100644
--- a/modules/admin-core/luasrc/controller/admin/uci.lua
+++ b/modules/admin-full/luasrc/controller/admin/uci.lua
diff --git a/modules/admin-core/luasrc/controller/admin/wifi.lua b/modules/admin-full/luasrc/controller/admin/wifi.lua
index 4bef0b7a5..4bef0b7a5 100644
--- a/modules/admin-core/luasrc/controller/admin/wifi.lua
+++ b/modules/admin-full/luasrc/controller/admin/wifi.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
index 3fdccbf80..3fdccbf80 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index b22f7354a..b22f7354a 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 2851f3ad5..2851f3ad5 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ptp.lua
index 565edb7fd..565edb7fd 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ptp.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
index 15f994c16..15f994c16 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
index 8cae7f94b..8cae7f94b 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
index e85306471..e85306471 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua
index a8ce2694a..a8ce2694a 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua b/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
index 44beb9c9e..44beb9c9e 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
index be2562ca0..be2562ca0 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index dd59d8c01..dd59d8c01 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua b/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua
index b4e0e2915..b4e0e2915 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua
diff --git a/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua b/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua
index f0379b370..f0379b370 100644
--- a/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua
diff --git a/modules/admin-core/luasrc/view/admin_index/index.htm b/modules/admin-full/luasrc/view/admin_index/index.htm
index 4ea58c2b8..4ea58c2b8 100644
--- a/modules/admin-core/luasrc/view/admin_index/index.htm
+++ b/modules/admin-full/luasrc/view/admin_index/index.htm
diff --git a/modules/admin-core/luasrc/view/admin_network/index.htm b/modules/admin-full/luasrc/view/admin_network/index.htm
index dec286436..dec286436 100644
--- a/modules/admin-core/luasrc/view/admin_network/index.htm
+++ b/modules/admin-full/luasrc/view/admin_network/index.htm
diff --git a/modules/admin-core/luasrc/view/admin_services/index.htm b/modules/admin-full/luasrc/view/admin_services/index.htm
index c0bd8b361..c0bd8b361 100644
--- a/modules/admin-core/luasrc/view/admin_services/index.htm
+++ b/modules/admin-full/luasrc/view/admin_services/index.htm
diff --git a/modules/admin-core/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm
index e1f4b0e53..e1f4b0e53 100644
--- a/modules/admin-core/luasrc/view/admin_status/index.htm
+++ b/modules/admin-full/luasrc/view/admin_status/index.htm
diff --git a/modules/admin-core/luasrc/view/admin_status/iwscan.htm b/modules/admin-full/luasrc/view/admin_status/iwscan.htm
index cbba791e6..cbba791e6 100644
--- a/modules/admin-core/luasrc/view/admin_status/iwscan.htm
+++ b/modules/admin-full/luasrc/view/admin_status/iwscan.htm
diff --git a/modules/admin-core/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm
index c4ebf347a..c4ebf347a 100644
--- a/modules/admin-core/luasrc/view/admin_status/routes.htm
+++ b/modules/admin-full/luasrc/view/admin_status/routes.htm
diff --git a/modules/admin-core/luasrc/view/admin_status/syslog.htm b/modules/admin-full/luasrc/view/admin_status/syslog.htm
index f3d1f0a96..f3d1f0a96 100644
--- a/modules/admin-core/luasrc/view/admin_status/syslog.htm
+++ b/modules/admin-full/luasrc/view/admin_status/syslog.htm
diff --git a/modules/admin-core/luasrc/view/admin_system/editor.htm b/modules/admin-full/luasrc/view/admin_system/editor.htm
index bac1729d0..bac1729d0 100644
--- a/modules/admin-core/luasrc/view/admin_system/editor.htm
+++ b/modules/admin-full/luasrc/view/admin_system/editor.htm
diff --git a/modules/admin-core/luasrc/view/admin_system/index.htm b/modules/admin-full/luasrc/view/admin_system/index.htm
index 3138903c4..3138903c4 100644
--- a/modules/admin-core/luasrc/view/admin_system/index.htm
+++ b/modules/admin-full/luasrc/view/admin_system/index.htm
diff --git a/modules/admin-core/luasrc/view/admin_system/ipkg.htm b/modules/admin-full/luasrc/view/admin_system/ipkg.htm
index 0cd87d990..0cd87d990 100644
--- a/modules/admin-core/luasrc/view/admin_system/ipkg.htm
+++ b/modules/admin-full/luasrc/view/admin_system/ipkg.htm
diff --git a/modules/admin-core/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 0f8f2c16e..0f8f2c16e 100644
--- a/modules/admin-core/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
diff --git a/modules/admin-core/luasrc/view/admin_system/passwd.htm b/modules/admin-full/luasrc/view/admin_system/passwd.htm
index 176abaea2..176abaea2 100644
--- a/modules/admin-core/luasrc/view/admin_system/passwd.htm
+++ b/modules/admin-full/luasrc/view/admin_system/passwd.htm
diff --git a/modules/admin-core/luasrc/view/admin_system/reboot.htm b/modules/admin-full/luasrc/view/admin_system/reboot.htm
index 3ddfa5880..3ddfa5880 100644
--- a/modules/admin-core/luasrc/view/admin_system/reboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/reboot.htm
diff --git a/modules/admin-core/luasrc/view/admin_system/sshkeys.htm b/modules/admin-full/luasrc/view/admin_system/sshkeys.htm
index 9a08af9e3..9a08af9e3 100644
--- a/modules/admin-core/luasrc/view/admin_system/sshkeys.htm
+++ b/modules/admin-full/luasrc/view/admin_system/sshkeys.htm
diff --git a/modules/admin-core/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 16ba50cd9..16ba50cd9 100644
--- a/modules/admin-core/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
diff --git a/modules/admin-core/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm
index e28094728..e28094728 100644
--- a/modules/admin-core/luasrc/view/admin_uci/apply.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/apply.htm
diff --git a/modules/admin-core/luasrc/view/admin_uci/changes.htm b/modules/admin-full/luasrc/view/admin_uci/changes.htm
index f2a88602a..f2a88602a 100644
--- a/modules/admin-core/luasrc/view/admin_uci/changes.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/changes.htm
diff --git a/modules/admin-core/luasrc/view/admin_uci/revert.htm b/modules/admin-full/luasrc/view/admin_uci/revert.htm
index 7f98a0435..7f98a0435 100644
--- a/modules/admin-core/luasrc/view/admin_uci/revert.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/revert.htm
diff --git a/modules/admin-core/luasrc/view/admin_wifi/index.htm b/modules/admin-full/luasrc/view/admin_wifi/index.htm
index 58281d14f..58281d14f 100644
--- a/modules/admin-core/luasrc/view/admin_wifi/index.htm
+++ b/modules/admin-full/luasrc/view/admin_wifi/index.htm
diff --git a/modules/admin-mini/Makefile b/modules/admin-mini/Makefile
new file mode 100644
index 000000000..81a96f6a8
--- /dev/null
+++ b/modules/admin-mini/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/modules/admin-mini/luasrc/controller/index.lua b/modules/admin-mini/luasrc/controller/index.lua
new file mode 100644
index 000000000..eb58e0042
--- /dev/null
+++ b/modules/admin-mini/luasrc/controller/index.lua
@@ -0,0 +1,49 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+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$
+]]--
+module("luci.controller.admin.index", package.seeall)
+
+function index()
+	luci.i18n.loadc("admin-core")
+	local i18n = luci.i18n.translate
+
+	local root = node()
+	if not root.target then
+		root.target = alias("admin")
+	end
+	
+	entry({"about"}, template("about")).i18n = "admin-core"
+	
+	local page   = node("admin")
+	page.target  = alias("admin", "index")
+	page.title   = i18n("administration", "Administration")
+	page.order   = 10
+	page.i18n    = "admin-core"
+	page.sysauth = "root"
+	
+	local page  = node("admin", "index")
+	page.target = template("admin_index/index")
+	page.title  = i18n("overview", "Übersicht")
+	page.order  = 10
+	
+	local page  = node("admin", "index", "luci")
+	page.target = cbi("admin_index/luci")
+	page.title  = i18n("a_i_ui", "Oberfläche")
+	
+	entry({"admin", "logout"}, call("action_logout"), i18n("logout"))
+end
+
+function action_logout()
+	luci.http.header("Set-Cookie", "sysauth=; path=/")
+	luci.http.redirect(luci.dispatcher.build_url())
+end
\ No newline at end of file