Skip to content
Snippets Groups Projects
Unverified Commit b1aa5390 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

gluon-config-mode-core: move gluon-web base path to /lib/gluon/config-mode 

- CGI script and index.html are moved from gluon-web to
  gluon-config-mode-core, the script is renamed to 'config'
- gluon-web and gluon-web-model base views and i18n files are symlinked
  into the new path
- gluon-web-theme is renamed to gluon-config-mode-theme and installs
  directly into the new path
- all gluon-web-* models, controllers and views are moved into the new
  path
parent 39253442
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 14 deletions
package/gluon-config-mode-core/Makefile
+ 1
− 1
View file @ b1aa5390
...@@ -17,7 +17,7 @@ define Package/gluon-config-mode-core ...@@ -17,7 +17,7 @@ define Package/gluon-config-mode-core
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=Configuration wizard for user friendly setup of new mesh nodes TITLE:=Configuration wizard for user friendly setup of new mesh nodes
DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-web-theme +uhttpd DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-config-mode-theme +uhttpd
endef endef
define Build/Prepare define Build/Prepare
......
package/gluon-web/files/lib/gluon/web/www/index.html → package/gluon-config-mode-core/files/lib/gluon/config-mode/www/index.html
+ 1
− 1
View file @ b1aa5390
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="refresh" content="0; URL=/cgi-bin/gluon" /> <meta http-equiv="refresh" content="0; URL=/cgi-bin/config" />
</head> </head>
<body> <body>
</body> </body>
......
package/gluon-config-mode-core/files/lib/gluon/setup-mode/rc.d/S50uhttpd
+ 1
− 1
View file @ b1aa5390
...@@ -9,6 +9,6 @@ UHTTPD_BIN="/usr/sbin/uhttpd" ...@@ -9,6 +9,6 @@ UHTTPD_BIN="/usr/sbin/uhttpd"
start_service() { start_service() {
procd_open_instance procd_open_instance
procd_set_param respawn procd_set_param respawn
procd_set_param command "$UHTTPD_BIN" -f -h /lib/gluon/web/www -x /cgi-bin -A 1 -R -p 0.0.0.0:80 procd_set_param command "$UHTTPD_BIN" -f -h /lib/gluon/config-mode/www -x /cgi-bin -A 1 -R -p 0.0.0.0:80
procd_close_instance procd_close_instance
} }
package/gluon-config-mode-core/luasrc/lib/gluon/web/model/gluon-config-mode/wizard.lua → package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/model/gluon-config-mode/wizard.lua
+ 2
− 2
View file @ b1aa5390
...@@ -24,7 +24,7 @@ f.submit = translate('Save & restart') ...@@ -24,7 +24,7 @@ f.submit = translate('Save & restart')
f.reset = false f.reset = false
local s = f:section(Section) local s = f:section(Section)
s.template = "config-mode/welcome" s.template = "wizard/welcome"
s.package = "gluon-config-mode-core" s.package = "gluon-config-mode-core"
local commit = {'gluon-setup-mode'} local commit = {'gluon-setup-mode'}
...@@ -56,7 +56,7 @@ function f:write() ...@@ -56,7 +56,7 @@ function f:write()
r() r()
end end
f.template = "config-mode/reboot" f.template = "wizard/reboot"
f.package = "gluon-config-mode-core" f.package = "gluon-config-mode-core"
f.hidenav = true f.hidenav = true
......
package/gluon-web/luasrc/lib/gluon/web/www/cgi-bin/gluon → package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/www/cgi-bin/config
+ 8
− 0
View file @ b1aa5390
#!/usr/bin/lua #!/usr/bin/lua
require 'gluon.web.cgi' { require 'gluon.web.cgi' {
base_path = '/lib/gluon/web', base_path = '/lib/gluon/config-mode',
layout_package = 'gluon-web-theme', layout_package = 'gluon-config-mode-theme',
layout_template = 'theme/layout', layout_template = 'theme/layout',
} }
package/gluon-web-theme/Makefile → package/gluon-config-mode-theme/Makefile
+ 7
− 7
View file @ b1aa5390
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-theme PKG_NAME:=gluon-config-mode-theme
PKG_VERSION:=0.1 PKG_VERSION:=0.1
PKG_RELEASE:=1 PKG_RELEASE:=1
...@@ -14,10 +14,10 @@ include ../gluon.mk ...@@ -14,10 +14,10 @@ include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
define Package/gluon-web-theme define Package/gluon-config-mode-theme
SECTION:=gluon SECTION:=gluon
CATEGORY:=Gluon CATEGORY:=Gluon
TITLE:=gluon-web theme TITLE:=Gluon config mode theme for gluon-web
DEPENDS:=+gluon-core +gluon-web DEPENDS:=+gluon-core +gluon-web
endef endef
...@@ -26,12 +26,12 @@ define Build/Prepare ...@@ -26,12 +26,12 @@ define Build/Prepare
endef endef
define Build/Compile define Build/Compile
$(call GluonBuildI18N,gluon-web-theme,i18n) $(call GluonBuildI18N,gluon-config-mode-theme,i18n)
endef endef
define Package/gluon-web-theme/install define Package/gluon-config-mode-theme/install
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(call GluonInstallI18N,gluon-web-theme,$(1)) $(call GluonInstallI18N,gluon-config-mode-theme,$(1))
endef endef
$(eval $(call BuildPackage,gluon-web-theme)) $(eval $(call BuildPackage,gluon-config-mode-theme))
package/gluon-web-theme/sass/gluon.scss → package/gluon-config-mode-theme/sass/gluon.scss
+ 2
− 2
View file @ b1aa5390
/* /*
ATTENTION: This file is not compiled when building gluon. ATTENTION: This file is not compiled when building gluon.
The compiled version is at ../files/lib/gluon/web/www/static/gluon/cascade.css The compiled version is at ../files/lib/gluon/config-mode/www/static/gluon.css
Use sass like this to update it: Use sass like this to update it:
sass --sourcemap=none -C -t compressed sass/gluon.scss files/lib/gluon/web/www/static/gluon.css sass --sourcemap=none -C -t compressed sass/gluon.scss files/lib/gluon/config-mode/www/static/gluon.css
When commiting changes to this file make sure to commit the respective When commiting changes to this file make sure to commit the respective
changes to the compilid version within the same commit! changes to the compilid version within the same commit!
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz