libs: merge libs/cbi into libs/web

53 files changed, 1 insertions, 16 deletions

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index dcc2c3c3b..4fe804b54 100644
--- 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
index 4af6e58d9..4af6e58d9 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi.js
+++ b/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
index 0888abf85..0888abf85 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/add.gif
+++ b/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
index 82ae7ed82..82ae7ed82 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif
+++ b/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
index 10d797e9b..10d797e9b 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/arrow.gif
+++ b/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
index f99a5383b..f99a5383b 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/download.gif
+++ b/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
index 7b02b6e72..7b02b6e72 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/edit.gif
+++ b/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
index 431ff64d1..431ff64d1 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif
+++ b/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
index 9ae5e3489..9ae5e3489 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/find.gif
+++ b/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
index 9dfa0e196..9dfa0e196 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/help.gif
+++ b/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
index e3853e5af..e3853e5af 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/key.gif
+++ b/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
index f0bb78da6..f0bb78da6 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/link.gif
+++ b/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
index 8268958a1..8268958a1 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif
+++ b/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
index bf43a0a0b..bf43a0a0b 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/remove.gif
+++ b/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
index c941c1902..c941c1902 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif
+++ b/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
index 35e949963..35e949963 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/save.gif
+++ b/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
index dcb5c2a89..dcb5c2a89 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi/user.gif
+++ b/libs/web/htdocs/luci-static/resources/cbi/user.gif
diff --git a/libs/cbi/luasrc/cbi.lua b/libs/web/luasrc/cbi.lua
index 8dd16b181..8dd16b181 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/web/luasrc/cbi.lua
diff --git a/libs/cbi/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
index 53a34547b..53a34547b 100644
--- a/libs/cbi/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
diff --git a/libs/cbi/luasrc/view/cbi/browser.htm b/libs/web/luasrc/view/cbi/browser.htm
index 3b7b23f5d..3b7b23f5d 100644
--- a/libs/cbi/luasrc/view/cbi/browser.htm
+++ b/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
index 5a5189794..5a5189794 100644
--- a/libs/cbi/luasrc/view/cbi/button.htm
+++ b/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
index c325e49cb..c325e49cb 100644
--- a/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
+++ b/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
index 0f24f1f76..0f24f1f76 100644
--- a/libs/cbi/luasrc/view/cbi/cell_valueheader.htm
+++ b/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
index fbd5a0a07..fbd5a0a07 100644
--- a/libs/cbi/luasrc/view/cbi/compound.htm
+++ b/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
index ed7c6b4ea..ed7c6b4ea 100644
--- a/libs/cbi/luasrc/view/cbi/delegator.htm
+++ b/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
index 9745fff4c..9745fff4c 100644
--- a/libs/cbi/luasrc/view/cbi/dvalue.htm
+++ b/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
index 826e2e698..826e2e698 100644
--- a/libs/cbi/luasrc/view/cbi/dynlist.htm
+++ b/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
index f82957221..f82957221 100644
--- a/libs/cbi/luasrc/view/cbi/filebrowser.htm
+++ b/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
index 4f4106b87..4f4106b87 100644
--- a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
+++ b/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
index fe5b6881c..fe5b6881c 100644
--- a/libs/cbi/luasrc/view/cbi/footer.htm
+++ b/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
index c069b7f92..c069b7f92 100644
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/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
index ecd401498..ecd401498 100644
--- a/libs/cbi/luasrc/view/cbi/full_valueheader.htm
+++ b/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
index 35ebac6e1..35ebac6e1 100644
--- a/libs/cbi/luasrc/view/cbi/fvalue.htm
+++ b/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
index fd1ab8bd1..fd1ab8bd1 100644
--- a/libs/cbi/luasrc/view/cbi/header.htm
+++ b/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
index 8c7581a2c..8c7581a2c 100644
--- a/libs/cbi/luasrc/view/cbi/lvalue.htm
+++ b/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
index be0c37aa7..be0c37aa7 100644
--- a/libs/cbi/luasrc/view/cbi/map.htm
+++ b/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
index 3812a3f7e..3812a3f7e 100644
--- a/libs/cbi/luasrc/view/cbi/mvalue.htm
+++ b/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
index 2f9821817..2f9821817 100644
--- a/libs/cbi/luasrc/view/cbi/network_ifacelist.htm
+++ b/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
index c47b3a70e..c47b3a70e 100644
--- a/libs/cbi/luasrc/view/cbi/network_netlist.htm
+++ b/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
index 1d231c542..1d231c542 100644
--- a/libs/cbi/luasrc/view/cbi/nsection.htm
+++ b/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
index f1c715b40..f1c715b40 100644
--- a/libs/cbi/luasrc/view/cbi/nullsection.htm
+++ b/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
index 9c40f8290..9c40f8290 100644
--- a/libs/cbi/luasrc/view/cbi/simpleform.htm
+++ b/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
index 9b2c7980a..9b2c7980a 100644
--- a/libs/cbi/luasrc/view/cbi/tabcontainer.htm
+++ b/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
index 7648fe011..7648fe011 100644
--- a/libs/cbi/luasrc/view/cbi/tabmenu.htm
+++ b/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
index 022461067..022461067 100644
--- a/libs/cbi/luasrc/view/cbi/tblsection.htm
+++ b/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
index 0fa285c16..0fa285c16 100644
--- a/libs/cbi/luasrc/view/cbi/tsection.htm
+++ b/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
index b628c5c52..b628c5c52 100644
--- a/libs/cbi/luasrc/view/cbi/tvalue.htm
+++ b/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
index db32c9043..db32c9043 100644
--- a/libs/cbi/luasrc/view/cbi/ucisection.htm
+++ b/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
index f5baa33fe..f5baa33fe 100644
--- a/libs/cbi/luasrc/view/cbi/upload.htm
+++ b/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
index a7b49de7f..a7b49de7f 100644
--- a/libs/cbi/luasrc/view/cbi/value.htm
+++ b/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
index a65c7a387..a65c7a387 100644
--- a/libs/cbi/luasrc/view/cbi/valuefooter.htm
+++ b/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
index f3da909e6..f3da909e6 100644
--- a/libs/cbi/luasrc/view/cbi/valueheader.htm
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/libs/cbi/root/lib/uci/upload/.gitignore
+++ b/libs/web/root/lib/uci/upload/.gitignore