From 30c8b259e1b7012f7c16c1ee5aeb1997e44dcbdc Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 27 May 2008 08:32:10 +0000 Subject: [PATCH] * Separated CBI from LuCI Web * Updated OpenWRT-Makefile --- applications/cbi/Makefile | 2 ++ {web => applications/cbi}/root/www/resources/cbi.js | 0 {web => applications/cbi}/src/cbi.lua | 0 {web => applications/cbi}/src/view/cbi/dvalue.htm | 0 {web => applications/cbi}/src/view/cbi/footer.htm | 0 .../cbi}/src/view/cbi/full_valuefooter.htm | 0 .../cbi}/src/view/cbi/full_valueheader.htm | 0 {web => applications/cbi}/src/view/cbi/fvalue.htm | 0 {web => applications/cbi}/src/view/cbi/header.htm | 0 {web => applications/cbi}/src/view/cbi/lvalue.htm | 0 {web => applications/cbi}/src/view/cbi/map.htm | 0 {web => applications/cbi}/src/view/cbi/mvalue.htm | 0 {web => applications/cbi}/src/view/cbi/nsection.htm | 0 .../cbi}/src/view/cbi/tblsection.htm | 0 .../cbi}/src/view/cbi/tiny_valuefooter.htm | 0 .../cbi}/src/view/cbi/tiny_valueheader.htm | 0 {web => applications/cbi}/src/view/cbi/tsection.htm | 0 .../cbi}/src/view/cbi/ucisection.htm | 0 {web => applications/cbi}/src/view/cbi/value.htm | 0 .../cbi}/src/view/cbi/valuefooter.htm | 0 .../cbi}/src/view/cbi/valueheader.htm | 0 contrib/package/luci/Makefile | 21 +++++++++++++++++---- {web => modules/admin-core}/src/view/error404.htm | 0 {web => modules/admin-core}/src/view/error500.htm | 0 {web => modules/admin-core}/src/view/footer.htm | 0 {web => modules/admin-core}/src/view/header.htm | 0 26 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 applications/cbi/Makefile rename {web => applications/cbi}/root/www/resources/cbi.js (100%) rename {web => applications/cbi}/src/cbi.lua (100%) rename {web => applications/cbi}/src/view/cbi/dvalue.htm (100%) rename {web => applications/cbi}/src/view/cbi/footer.htm (100%) rename {web => applications/cbi}/src/view/cbi/full_valuefooter.htm (100%) rename {web => applications/cbi}/src/view/cbi/full_valueheader.htm (100%) rename {web => applications/cbi}/src/view/cbi/fvalue.htm (100%) rename {web => applications/cbi}/src/view/cbi/header.htm (100%) rename {web => applications/cbi}/src/view/cbi/lvalue.htm (100%) rename {web => applications/cbi}/src/view/cbi/map.htm (100%) rename {web => applications/cbi}/src/view/cbi/mvalue.htm (100%) rename {web => applications/cbi}/src/view/cbi/nsection.htm (100%) rename {web => applications/cbi}/src/view/cbi/tblsection.htm (100%) rename {web => applications/cbi}/src/view/cbi/tiny_valuefooter.htm (100%) rename {web => applications/cbi}/src/view/cbi/tiny_valueheader.htm (100%) rename {web => applications/cbi}/src/view/cbi/tsection.htm (100%) rename {web => applications/cbi}/src/view/cbi/ucisection.htm (100%) rename {web => applications/cbi}/src/view/cbi/value.htm (100%) rename {web => applications/cbi}/src/view/cbi/valuefooter.htm (100%) rename {web => applications/cbi}/src/view/cbi/valueheader.htm (100%) rename {web => modules/admin-core}/src/view/error404.htm (100%) rename {web => modules/admin-core}/src/view/error500.htm (100%) rename {web => modules/admin-core}/src/view/footer.htm (100%) rename {web => modules/admin-core}/src/view/header.htm (100%) 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 similarity index 100% rename from web/root/www/resources/cbi.js rename to applications/cbi/root/www/resources/cbi.js diff --git a/web/src/cbi.lua b/applications/cbi/src/cbi.lua similarity index 100% rename from web/src/cbi.lua rename to applications/cbi/src/cbi.lua diff --git a/web/src/view/cbi/dvalue.htm b/applications/cbi/src/view/cbi/dvalue.htm similarity index 100% rename from web/src/view/cbi/dvalue.htm rename to applications/cbi/src/view/cbi/dvalue.htm diff --git a/web/src/view/cbi/footer.htm b/applications/cbi/src/view/cbi/footer.htm similarity index 100% rename from web/src/view/cbi/footer.htm rename to 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 similarity index 100% rename from web/src/view/cbi/full_valuefooter.htm rename to 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 similarity index 100% rename from web/src/view/cbi/full_valueheader.htm rename to 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 similarity index 100% rename from web/src/view/cbi/fvalue.htm rename to applications/cbi/src/view/cbi/fvalue.htm diff --git a/web/src/view/cbi/header.htm b/applications/cbi/src/view/cbi/header.htm similarity index 100% rename from web/src/view/cbi/header.htm rename to applications/cbi/src/view/cbi/header.htm diff --git a/web/src/view/cbi/lvalue.htm b/applications/cbi/src/view/cbi/lvalue.htm similarity index 100% rename from web/src/view/cbi/lvalue.htm rename to applications/cbi/src/view/cbi/lvalue.htm diff --git a/web/src/view/cbi/map.htm b/applications/cbi/src/view/cbi/map.htm similarity index 100% rename from web/src/view/cbi/map.htm rename to applications/cbi/src/view/cbi/map.htm diff --git a/web/src/view/cbi/mvalue.htm b/applications/cbi/src/view/cbi/mvalue.htm similarity index 100% rename from web/src/view/cbi/mvalue.htm rename to applications/cbi/src/view/cbi/mvalue.htm diff --git a/web/src/view/cbi/nsection.htm b/applications/cbi/src/view/cbi/nsection.htm similarity index 100% rename from web/src/view/cbi/nsection.htm rename to applications/cbi/src/view/cbi/nsection.htm diff --git a/web/src/view/cbi/tblsection.htm b/applications/cbi/src/view/cbi/tblsection.htm similarity index 100% rename from web/src/view/cbi/tblsection.htm rename to 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 similarity index 100% rename from web/src/view/cbi/tiny_valuefooter.htm rename to 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 similarity index 100% rename from web/src/view/cbi/tiny_valueheader.htm rename to 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 similarity index 100% rename from web/src/view/cbi/tsection.htm rename to applications/cbi/src/view/cbi/tsection.htm diff --git a/web/src/view/cbi/ucisection.htm b/applications/cbi/src/view/cbi/ucisection.htm similarity index 100% rename from web/src/view/cbi/ucisection.htm rename to applications/cbi/src/view/cbi/ucisection.htm diff --git a/web/src/view/cbi/value.htm b/applications/cbi/src/view/cbi/value.htm similarity index 100% rename from web/src/view/cbi/value.htm rename to applications/cbi/src/view/cbi/value.htm diff --git a/web/src/view/cbi/valuefooter.htm b/applications/cbi/src/view/cbi/valuefooter.htm similarity index 100% rename from web/src/view/cbi/valuefooter.htm rename to applications/cbi/src/view/cbi/valuefooter.htm diff --git a/web/src/view/cbi/valueheader.htm b/applications/cbi/src/view/cbi/valueheader.htm similarity index 100% rename from web/src/view/cbi/valueheader.htm rename to 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 similarity index 100% rename from web/src/view/error404.htm rename to modules/admin-core/src/view/error404.htm diff --git a/web/src/view/error500.htm b/modules/admin-core/src/view/error500.htm similarity index 100% rename from web/src/view/error500.htm rename to modules/admin-core/src/view/error500.htm diff --git a/web/src/view/footer.htm b/modules/admin-core/src/view/footer.htm similarity index 100% rename from web/src/view/footer.htm rename to modules/admin-core/src/view/footer.htm diff --git a/web/src/view/header.htm b/modules/admin-core/src/view/header.htm similarity index 100% rename from web/src/view/header.htm rename to modules/admin-core/src/view/header.htm -- 2.11.0