libs: merge libs/cbi into libs/web

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index dcc2c3c3b3283d9801775921a91c99cc416e7eea..4fe804b54c72d1098e21687253e46a59fb66ea57 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -158,17 +158,6 @@ endif
 
 
 ### Libraries ###
-define Package/luci-cbi
-  $(call Package/luci/libtemplate)
-  DEPENDS+=+luci-web +luci-uci
-  TITLE:=Configuration Binding Interface
-endef
-
-define Package/luci-cbi/install
-       $(call Package/luci/install/template,$(1),libs/cbi)
-endef
-
-
 define Package/luci-uci
   $(call Package/luci/libtemplate)
   DEPENDS+=+libuci-lua
@@ -396,7 +385,7 @@ endef
 
 define Package/luci-admin-core
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-web +luci-cbi +luci-i18n-english
+  DEPENDS+=+luci-web +luci-i18n-english
   TITLE:=Web UI Core Module
 endef
 
@@ -1079,9 +1068,6 @@ endef
 ifneq ($(CONFIG_PACKAGE_luci-core),)
        PKG_SELECTED_MODULES+=libs/core
 endif
-ifneq ($(CONFIG_PACKAGE_luci-cbi),)
-       PKG_SELECTED_MODULES+=libs/cbi
-endif
 ifneq ($(CONFIG_PACKAGE_luci-fastindex),)
        PKG_SELECTED_MODULES+=libs/fastindex
 endif
@@ -1323,7 +1309,6 @@ MAKE_FLAGS += \
 
 
 $(eval $(call BuildPackage,luci-core))
-$(eval $(call BuildPackage,luci-cbi))
 $(eval $(call BuildPackage,luci-fastindex))
 $(eval $(call BuildPackage,luci-http))
 $(eval $(call BuildPackage,luci-httpclient))

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi.js
rename to libs/web/htdocs/luci-static/resources/cbi.js

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/add.gif b/libs/web/htdocs/luci-static/resources/cbi/add.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/add.gif
rename to libs/web/htdocs/luci-static/resources/cbi/add.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif b/libs/web/htdocs/luci-static/resources/cbi/apply.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/apply.gif
rename to libs/web/htdocs/luci-static/resources/cbi/apply.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/arrow.gif b/libs/web/htdocs/luci-static/resources/cbi/arrow.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/arrow.gif
rename to libs/web/htdocs/luci-static/resources/cbi/arrow.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/download.gif b/libs/web/htdocs/luci-static/resources/cbi/download.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/download.gif
rename to libs/web/htdocs/luci-static/resources/cbi/download.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/edit.gif b/libs/web/htdocs/luci-static/resources/cbi/edit.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/edit.gif
rename to libs/web/htdocs/luci-static/resources/cbi/edit.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif b/libs/web/htdocs/luci-static/resources/cbi/fieldadd.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif
rename to libs/web/htdocs/luci-static/resources/cbi/fieldadd.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/find.gif b/libs/web/htdocs/luci-static/resources/cbi/find.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/find.gif
rename to libs/web/htdocs/luci-static/resources/cbi/find.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/help.gif b/libs/web/htdocs/luci-static/resources/cbi/help.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/help.gif
rename to libs/web/htdocs/luci-static/resources/cbi/help.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/key.gif b/libs/web/htdocs/luci-static/resources/cbi/key.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/key.gif
rename to libs/web/htdocs/luci-static/resources/cbi/key.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/link.gif b/libs/web/htdocs/luci-static/resources/cbi/link.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/link.gif
rename to libs/web/htdocs/luci-static/resources/cbi/link.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif b/libs/web/htdocs/luci-static/resources/cbi/reload.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/reload.gif
rename to libs/web/htdocs/luci-static/resources/cbi/reload.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/remove.gif b/libs/web/htdocs/luci-static/resources/cbi/remove.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/remove.gif
rename to libs/web/htdocs/luci-static/resources/cbi/remove.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif b/libs/web/htdocs/luci-static/resources/cbi/reset.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/reset.gif
rename to libs/web/htdocs/luci-static/resources/cbi/reset.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/save.gif b/libs/web/htdocs/luci-static/resources/cbi/save.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/save.gif
rename to libs/web/htdocs/luci-static/resources/cbi/save.gif

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/user.gif b/libs/web/htdocs/luci-static/resources/cbi/user.gif
similarity index 100%
rename from libs/cbi/htdocs/luci-static/resources/cbi/user.gif
rename to libs/web/htdocs/luci-static/resources/cbi/user.gif

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/web/luasrc/cbi.lua
similarity index 100%
rename from libs/cbi/luasrc/cbi.lua
rename to libs/web/luasrc/cbi.lua

diff --git a/libs/cbi/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
similarity index 100%
rename from libs/cbi/luasrc/cbi/datatypes.lua
rename to libs/web/luasrc/cbi/datatypes.lua

diff --git a/libs/cbi/luasrc/view/cbi/browser.htm b/libs/web/luasrc/view/cbi/browser.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/browser.htm
rename to libs/web/luasrc/view/cbi/browser.htm

diff --git a/libs/cbi/luasrc/view/cbi/button.htm b/libs/web/luasrc/view/cbi/button.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/button.htm
rename to libs/web/luasrc/view/cbi/button.htm

diff --git a/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm b/libs/web/luasrc/view/cbi/cell_valuefooter.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
rename to libs/web/luasrc/view/cbi/cell_valuefooter.htm

diff --git a/libs/cbi/luasrc/view/cbi/cell_valueheader.htm b/libs/web/luasrc/view/cbi/cell_valueheader.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/cell_valueheader.htm
rename to libs/web/luasrc/view/cbi/cell_valueheader.htm

diff --git a/libs/cbi/luasrc/view/cbi/compound.htm b/libs/web/luasrc/view/cbi/compound.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/compound.htm
rename to libs/web/luasrc/view/cbi/compound.htm

diff --git a/libs/cbi/luasrc/view/cbi/delegator.htm b/libs/web/luasrc/view/cbi/delegator.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/delegator.htm
rename to libs/web/luasrc/view/cbi/delegator.htm

diff --git a/libs/cbi/luasrc/view/cbi/dvalue.htm b/libs/web/luasrc/view/cbi/dvalue.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/dvalue.htm
rename to libs/web/luasrc/view/cbi/dvalue.htm

diff --git a/libs/cbi/luasrc/view/cbi/dynlist.htm b/libs/web/luasrc/view/cbi/dynlist.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/dynlist.htm
rename to libs/web/luasrc/view/cbi/dynlist.htm

diff --git a/libs/cbi/luasrc/view/cbi/filebrowser.htm b/libs/web/luasrc/view/cbi/filebrowser.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/filebrowser.htm
rename to libs/web/luasrc/view/cbi/filebrowser.htm

diff --git a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm b/libs/web/luasrc/view/cbi/firewall_zonelist.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
rename to libs/web/luasrc/view/cbi/firewall_zonelist.htm

diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/web/luasrc/view/cbi/footer.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/footer.htm
rename to libs/web/luasrc/view/cbi/footer.htm

diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/web/luasrc/view/cbi/full_valuefooter.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/full_valuefooter.htm
rename to libs/web/luasrc/view/cbi/full_valuefooter.htm

diff --git a/libs/cbi/luasrc/view/cbi/full_valueheader.htm b/libs/web/luasrc/view/cbi/full_valueheader.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/full_valueheader.htm
rename to libs/web/luasrc/view/cbi/full_valueheader.htm

diff --git a/libs/cbi/luasrc/view/cbi/fvalue.htm b/libs/web/luasrc/view/cbi/fvalue.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/fvalue.htm
rename to libs/web/luasrc/view/cbi/fvalue.htm

diff --git a/libs/cbi/luasrc/view/cbi/header.htm b/libs/web/luasrc/view/cbi/header.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/header.htm
rename to libs/web/luasrc/view/cbi/header.htm

diff --git a/libs/cbi/luasrc/view/cbi/lvalue.htm b/libs/web/luasrc/view/cbi/lvalue.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/lvalue.htm
rename to libs/web/luasrc/view/cbi/lvalue.htm

diff --git a/libs/cbi/luasrc/view/cbi/map.htm b/libs/web/luasrc/view/cbi/map.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/map.htm
rename to libs/web/luasrc/view/cbi/map.htm

diff --git a/libs/cbi/luasrc/view/cbi/mvalue.htm b/libs/web/luasrc/view/cbi/mvalue.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/mvalue.htm
rename to libs/web/luasrc/view/cbi/mvalue.htm

diff --git a/libs/cbi/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/network_ifacelist.htm
rename to libs/web/luasrc/view/cbi/network_ifacelist.htm

diff --git a/libs/cbi/luasrc/view/cbi/network_netlist.htm b/libs/web/luasrc/view/cbi/network_netlist.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/network_netlist.htm
rename to libs/web/luasrc/view/cbi/network_netlist.htm

diff --git a/libs/cbi/luasrc/view/cbi/nsection.htm b/libs/web/luasrc/view/cbi/nsection.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/nsection.htm
rename to libs/web/luasrc/view/cbi/nsection.htm

diff --git a/libs/cbi/luasrc/view/cbi/nullsection.htm b/libs/web/luasrc/view/cbi/nullsection.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/nullsection.htm
rename to libs/web/luasrc/view/cbi/nullsection.htm

diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/web/luasrc/view/cbi/simpleform.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/simpleform.htm
rename to libs/web/luasrc/view/cbi/simpleform.htm

diff --git a/libs/cbi/luasrc/view/cbi/tabcontainer.htm b/libs/web/luasrc/view/cbi/tabcontainer.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/tabcontainer.htm
rename to libs/web/luasrc/view/cbi/tabcontainer.htm

diff --git a/libs/cbi/luasrc/view/cbi/tabmenu.htm b/libs/web/luasrc/view/cbi/tabmenu.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/tabmenu.htm
rename to libs/web/luasrc/view/cbi/tabmenu.htm

diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/web/luasrc/view/cbi/tblsection.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/tblsection.htm
rename to libs/web/luasrc/view/cbi/tblsection.htm

diff --git a/libs/cbi/luasrc/view/cbi/tsection.htm b/libs/web/luasrc/view/cbi/tsection.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/tsection.htm
rename to libs/web/luasrc/view/cbi/tsection.htm

diff --git a/libs/cbi/luasrc/view/cbi/tvalue.htm b/libs/web/luasrc/view/cbi/tvalue.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/tvalue.htm
rename to libs/web/luasrc/view/cbi/tvalue.htm

diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/web/luasrc/view/cbi/ucisection.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/ucisection.htm
rename to libs/web/luasrc/view/cbi/ucisection.htm

diff --git a/libs/cbi/luasrc/view/cbi/upload.htm b/libs/web/luasrc/view/cbi/upload.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/upload.htm
rename to libs/web/luasrc/view/cbi/upload.htm

diff --git a/libs/cbi/luasrc/view/cbi/value.htm b/libs/web/luasrc/view/cbi/value.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/value.htm
rename to libs/web/luasrc/view/cbi/value.htm

diff --git a/libs/cbi/luasrc/view/cbi/valuefooter.htm b/libs/web/luasrc/view/cbi/valuefooter.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/valuefooter.htm
rename to libs/web/luasrc/view/cbi/valuefooter.htm

diff --git a/libs/cbi/luasrc/view/cbi/valueheader.htm b/libs/web/luasrc/view/cbi/valueheader.htm
similarity index 100%
rename from libs/cbi/luasrc/view/cbi/valueheader.htm
rename to libs/web/luasrc/view/cbi/valueheader.htm

diff --git a/libs/cbi/root/lib/uci/upload/.gitignore b/libs/web/root/lib/uci/upload/.gitignore
similarity index 100%
rename from libs/cbi/root/lib/uci/upload/.gitignore
rename to libs/web/root/lib/uci/upload/.gitignore