* Separated CBI from LuCI Web

* Updated OpenWRT-Makefile

26 files changed, 19 insertions, 4 deletions

diff --git a/applications/cbi/Makefile b/applications/cbi/Makefile
new file mode 100644
index 000000000..81a96f6a8
--- /dev/null
+++ b/applications/cbi/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/web/root/www/resources/cbi.js b/applications/cbi/root/www/resources/cbi.js
index a3a47aa45..a3a47aa45 100644
--- a/web/root/www/resources/cbi.js
+++ b/applications/cbi/root/www/resources/cbi.js
diff --git a/web/src/cbi.lua b/applications/cbi/src/cbi.lua
index b7097b5d9..b7097b5d9 100644
--- a/web/src/cbi.lua
+++ b/applications/cbi/src/cbi.lua
diff --git a/web/src/view/cbi/dvalue.htm b/applications/cbi/src/view/cbi/dvalue.htm
index f54667def..f54667def 100644
--- a/web/src/view/cbi/dvalue.htm
+++ b/applications/cbi/src/view/cbi/dvalue.htm
diff --git a/web/src/view/cbi/footer.htm b/applications/cbi/src/view/cbi/footer.htm
index 2acf710cd..2acf710cd 100644
--- a/web/src/view/cbi/footer.htm
+++ b/applications/cbi/src/view/cbi/footer.htm
diff --git a/web/src/view/cbi/full_valuefooter.htm b/applications/cbi/src/view/cbi/full_valuefooter.htm
index 6151a3a66..6151a3a66 100644
--- a/web/src/view/cbi/full_valuefooter.htm
+++ b/applications/cbi/src/view/cbi/full_valuefooter.htm
diff --git a/web/src/view/cbi/full_valueheader.htm b/applications/cbi/src/view/cbi/full_valueheader.htm
index 062efa2dd..062efa2dd 100644
--- a/web/src/view/cbi/full_valueheader.htm
+++ b/applications/cbi/src/view/cbi/full_valueheader.htm
diff --git a/web/src/view/cbi/fvalue.htm b/applications/cbi/src/view/cbi/fvalue.htm
index b609f1d4f..b609f1d4f 100644
--- a/web/src/view/cbi/fvalue.htm
+++ b/applications/cbi/src/view/cbi/fvalue.htm
diff --git a/web/src/view/cbi/header.htm b/applications/cbi/src/view/cbi/header.htm
index 4229aaf0d..4229aaf0d 100644
--- a/web/src/view/cbi/header.htm
+++ b/applications/cbi/src/view/cbi/header.htm
diff --git a/web/src/view/cbi/lvalue.htm b/applications/cbi/src/view/cbi/lvalue.htm
index f1ae5a093..f1ae5a093 100644
--- a/web/src/view/cbi/lvalue.htm
+++ b/applications/cbi/src/view/cbi/lvalue.htm
diff --git a/web/src/view/cbi/map.htm b/applications/cbi/src/view/cbi/map.htm
index 835393c1c..835393c1c 100644
--- a/web/src/view/cbi/map.htm
+++ b/applications/cbi/src/view/cbi/map.htm
diff --git a/web/src/view/cbi/mvalue.htm b/applications/cbi/src/view/cbi/mvalue.htm
index bed66e569..bed66e569 100644
--- a/web/src/view/cbi/mvalue.htm
+++ b/applications/cbi/src/view/cbi/mvalue.htm
diff --git a/web/src/view/cbi/nsection.htm b/applications/cbi/src/view/cbi/nsection.htm
index fff597ad0..fff597ad0 100644
--- a/web/src/view/cbi/nsection.htm
+++ b/applications/cbi/src/view/cbi/nsection.htm
diff --git a/web/src/view/cbi/tblsection.htm b/applications/cbi/src/view/cbi/tblsection.htm
index df16efbed..df16efbed 100644
--- a/web/src/view/cbi/tblsection.htm
+++ b/applications/cbi/src/view/cbi/tblsection.htm
diff --git a/web/src/view/cbi/tiny_valuefooter.htm b/applications/cbi/src/view/cbi/tiny_valuefooter.htm
index e65ebb6c0..e65ebb6c0 100644
--- a/web/src/view/cbi/tiny_valuefooter.htm
+++ b/applications/cbi/src/view/cbi/tiny_valuefooter.htm
diff --git a/web/src/view/cbi/tiny_valueheader.htm b/applications/cbi/src/view/cbi/tiny_valueheader.htm
index b9b26bd6a..b9b26bd6a 100644
--- a/web/src/view/cbi/tiny_valueheader.htm
+++ b/applications/cbi/src/view/cbi/tiny_valueheader.htm
diff --git a/web/src/view/cbi/tsection.htm b/applications/cbi/src/view/cbi/tsection.htm
index 37b18b5d4..37b18b5d4 100644
--- a/web/src/view/cbi/tsection.htm
+++ b/applications/cbi/src/view/cbi/tsection.htm
diff --git a/web/src/view/cbi/ucisection.htm b/applications/cbi/src/view/cbi/ucisection.htm
index 0abc37e7c..0abc37e7c 100644
--- a/web/src/view/cbi/ucisection.htm
+++ b/applications/cbi/src/view/cbi/ucisection.htm
diff --git a/web/src/view/cbi/value.htm b/applications/cbi/src/view/cbi/value.htm
index 31bf38f77..31bf38f77 100644
--- a/web/src/view/cbi/value.htm
+++ b/applications/cbi/src/view/cbi/value.htm
diff --git a/web/src/view/cbi/valuefooter.htm b/applications/cbi/src/view/cbi/valuefooter.htm
index bc9d1b127..bc9d1b127 100644
--- a/web/src/view/cbi/valuefooter.htm
+++ b/applications/cbi/src/view/cbi/valuefooter.htm
diff --git a/web/src/view/cbi/valueheader.htm b/applications/cbi/src/view/cbi/valueheader.htm
index 8d9802f57..8d9802f57 100644
--- a/web/src/view/cbi/valueheader.htm
+++ b/applications/cbi/src/view/cbi/valueheader.htm
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index c75247b55..3c5e1d87e 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -124,7 +124,7 @@ endef
 
 define Package/luci-mod-admin-core
   $(call Package/luci/template)
-  DEPENDS:=luci +luci-web
+  DEPENDS:=luci +luci-web +luci-app-cbi
   TITLE:=Core administrative pages
 endef
 
@@ -151,6 +151,17 @@ endef
 
 ### Applications ###
 
+define Package/luci-app-cbi
+  $(call Package/luci/template)
+  DEPENDS:=luci +luci-web
+  TITLE:=Configuration Binding Interface
+endef
+
+define Package/luci-app-cbi/install
+	$(call Package/luci/install/template,$(1),applications/cbi)
+endef
+
+
 define Package/luci-app-ffwizard-leipzig
   $(call Package/luci/template)
   DEPENDS:=luci +luci-mod-freifunk
@@ -200,7 +211,7 @@ endef
 
 define Package/luci-app-statistics
   $(call Package/luci/template)
-  DEPENDS:=luci +collectd +collectd-mod-rrdtool1 +rrdtool1
+  DEPENDS:=luci +luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1
   TITLE:=LuCI Statistics Application (incomplete)
 endef
 
@@ -219,7 +230,7 @@ endef
 
 define Package/luci-sgi-haserl
   $(call Package/luci/template)
-  DEPENDS:=luci +haserl-lua
+  DEPENDS:=luci +luci-web +haserl-lua
   TITLE:=SGI for Haserl
 endef
 
@@ -231,7 +242,7 @@ endef
 
 define Package/luci-sgi-webuci
   $(call Package/luci/template)
-  DEPENDS:=luci
+  DEPENDS:=luci +luci-web
   TITLE:=SGI for Webuci
 endef
 
@@ -243,6 +254,7 @@ endef
 
 
 $(eval $(call BuildPackage,luci))
+$(eval $(call BuildPackage,luci-web))
 
 $(eval $(call BuildPackage,luci-ff-halle))
 $(eval $(call BuildPackage,luci-ff-leipzig))
@@ -251,6 +263,7 @@ $(eval $(call BuildPackage,luci-ff-hannover))
 $(eval $(call BuildPackage,luci-mod-admin-core))
 $(eval $(call BuildPackage,luci-mod-freifunk))
 
+$(eval $(call BuildPackage,luci-app-cbi))
 $(eval $(call BuildPackage,luci-app-ffwizard-leipzig))
 $(eval $(call BuildPackage,luci-app-firewall))
 $(eval $(call BuildPackage,luci-app-splash))
diff --git a/web/src/view/error404.htm b/modules/admin-core/src/view/error404.htm
index 60daee2cb..60daee2cb 100644
--- a/web/src/view/error404.htm
+++ b/modules/admin-core/src/view/error404.htm
diff --git a/web/src/view/error500.htm b/modules/admin-core/src/view/error500.htm
index 8af22e8f2..8af22e8f2 100644
--- a/web/src/view/error500.htm
+++ b/modules/admin-core/src/view/error500.htm
diff --git a/web/src/view/footer.htm b/modules/admin-core/src/view/footer.htm
index c8506ac5c..c8506ac5c 100644
--- a/web/src/view/footer.htm
+++ b/modules/admin-core/src/view/footer.htm
diff --git a/web/src/view/header.htm b/modules/admin-core/src/view/header.htm
index 5f876781f..5f876781f 100644
--- a/web/src/view/header.htm
+++ b/modules/admin-core/src/view/header.htm