package/gluon-config-mode-contact-info/i18n/de.po

@@ -14,20 +14,20 @@ msgid "Contact info"
 msgstr "Kontakt"
 
 msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates. This means it can "
-"be downloaded and processed by anyone. This information is "
-"not required to operate a node. If you chose to enter data, it will be "
-"stored on this node and can be deleted by yourself at any time."
+"Please provide your contact information here to allow others to contact you. "
+"Note that this information will be visible <em>publicly</em> on the internet "
+"together with your node's coordinates. This means it can be downloaded and "
+"processed by anyone. This information is not required to operate a node. If "
+"you chose to enter data, it will be stored on this node and can be deleted "
+"by yourself at any time."
 msgstr ""
-"Bitte hinterlege hier einen Hinweis, um anderen zu ermöglichen, "
-"Kontakt mit dir aufzunehmen. Beachte, dass dieser Hinweis auch "
-"<em>öffentlich</em> im Internet, zusammen mit den Koordinaten "
-"deines Knotens, einsehbar sein wird. Das bedeutet, dass diese Informationen "
-"von jedem heruntergeladen und verarbeitet werden können. Für den Betrieb sind diese "
-"Informationen nicht erforderlich. Eine Speicherung erfolgt auf diesem Knoten. "
-"Die Daten können durch dich in diesem Menü eigenständig gelöscht werden."
+"Bitte hinterlege hier einen Hinweis, um anderen zu ermöglichen, Kontakt mit "
+"dir aufzunehmen. Beachte, dass dieser Hinweis auch <em>öffentlich</em> im "
+"Internet, zusammen mit den Koordinaten deines Knotens, einsehbar sein wird. "
+"Das bedeutet, dass diese Informationen von jedem heruntergeladen und "
+"verarbeitet werden können. Für den Betrieb sind diese Informationen nicht "
+"erforderlich. Eine Speicherung erfolgt auf diesem Knoten. Die Daten können "
+"durch dich in diesem Menü eigenständig gelöscht werden."
 
 msgid "e.g. E-mail or phone number"
 msgstr "z.B. E-Mail oder Telefonnummer"

package/gluon-config-mode-contact-info/i18n/fr.po

 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "PO-Revision-Date: 2015-08-12 23:30+0100\n"
 "Last-Translator:Tobias Bernot <tqbs@airmail.cc>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -14,20 +14,19 @@ msgid "Contact info"
 msgstr "Informations de Contact"
 
 msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates. This means it can "
-"be downloaded and processed by anyone. This information is "
-"not required to operate a node. If you chose to enter data, it will be "
-"stored on this node and can be deleted by yourself at any time."
+"Please provide your contact information here to allow others to contact you. "
+"Note that this information will be visible <em>publicly</em> on the internet "
+"together with your node's coordinates. This means it can be downloaded and "
+"processed by anyone. This information is not required to operate a node. If "
+"you chose to enter data, it will be stored on this node and can be deleted "
+"by yourself at any time."
 msgstr ""
-"Entrez vos coordonnées ici si vous souhaitez permettre à d'autres "
-"personnes de communiquer avec vous. Ces informations seront affichées "
-"<em>en ligne</em> avec les coordonnées du nœud. Il peut être téléchargé "
-"et traité par tous. Il n'est pas obligatoire "
-"de fournir ces informations pour pouvoir opérer un nœud. Si vous avez "
-"choisi d'entrer des données, elles seront stockées sur ce nœud et vous "
-"pourrez les effacer par vous-même à tout moment."
+"Entrez vos coordonnées ici si vous souhaitez permettre à d'autres personnes "
+"de communiquer avec vous. Ces informations seront affichées <em>en ligne</"
+"em> avec les coordonnées du nœud. Il peut être téléchargé et traité par "
+"tous. Il n'est pas obligatoire de fournir ces informations pour pouvoir "
+"opérer un nœud. Si vous avez choisi d'entrer des données, elles seront "
+"stockées sur ce nœud et vous pourrez les effacer par vous-même à tout moment."
 
 msgid "e.g. E-mail or phone number"
 msgstr "Ex : E-mail ou numéro de téléphone"

package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot

@@ -5,12 +5,12 @@ msgid "Contact info"
 msgstr ""
 
 msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates. This means it can be "
-"downloaded and processed by anyone. This information is "
-"not required to operate a node. If you chose to enter data, it will be "
-"stored on this node and can be deleted by yourself at any time."
+"Please provide your contact information here to allow others to contact you. "
+"Note that this information will be visible <em>publicly</em> on the internet "
+"together with your node's coordinates. This means it can be downloaded and "
+"processed by anyone. This information is not required to operate a node. If "
+"you chose to enter data, it will be stored on this node and can be deleted "
+"by yourself at any time."
 msgstr ""
 
 msgid "e.g. E-mail or phone number"

package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua

@@ -2,8 +2,6 @@ return function(form, uci)
 	local pkg_i18n = i18n 'gluon-config-mode-contact-info'
 	local site_i18n = i18n 'gluon-site'
 
-	local site = require 'gluon.site'
-
 	local owner = uci:get_first("gluon-node-info", "owner")
 
 	local help = site_i18n._translate("gluon-config-mode:contact-help") or pkg_i18n.translate(
@@ -23,7 +21,6 @@ return function(form, uci)
 	o.optional = true
 	function o:write(data)
 		uci:set("gluon-node-info", owner, "contact", data)
+		uci:save("gluon-node-info")
 	end
-
-	return {'gluon-node-info'}
 end

package/gluon-config-mode-core/Makefile

@@ -4,7 +4,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-config-mode-core
-PKG_VERSION:=2
 
 include ../gluon.mk
 

package/gluon-config-mode-core/files/lib/gluon/config-mode/view/wizard/reboot.html

 <h2><%:Your node's setup is now complete.%></h2>
 <%
-	local fs = require "nixio.fs"
-	local util = require "nixio.util"
-
-	local parts_dir = "/lib/gluon/config-mode/reboot/"
-	local files = util.consume(fs.dir(parts_dir) or function() end)
-	table.sort(files)
+	local util = require "gluon.util"
 
 	local parts = {}
-	for _, entry in ipairs(files) do
-		if entry:sub(1, 1) ~= '.' then
-			local p = assert(loadfile(parts_dir .. entry))
+	for _, entry in ipairs(util.glob('/lib/gluon/config-mode/reboot/*')) do
+		local p = assert(loadfile(entry))
 		setfenv(p, getfenv())
 		table.insert(parts, p)
 	end
-	end
 
 	for _, p in ipairs(parts) do
 		p()

package/gluon-config-mode-core/files/lib/gluon/config-mode/www/index.html

 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="">
 	<head>
-		<meta http-equiv="refresh" content="0; URL=/cgi-bin/config" />
+		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+		<meta http-equiv="Pragma" content="no-cache">
+		<meta http-equiv="Expires" content="0">
+		<meta http-equiv="refresh" content="0; URL=/cgi-bin/config">
 	</head>
 	<body>
 	</body>

package/gluon-config-mode-core/i18n/fr.po

 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "PO-Revision-Date: 2015-08-12 23:30+0100\n"
 "Last-Translator:Tobias Bernot <tqbs@airmail.cc>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/model/gluon-config-mode/wizard.lua

-local fs = require "nixio.fs"
 local util = require "gluon.util"
-local nixio_util = require "nixio.util"
-
 local uci = require("simple-uci").cursor()
 
-local wizard_dir = "/lib/gluon/config-mode/wizard/"
-
-local files = nixio_util.consume(fs.dir(wizard_dir) or function() end)
-table.sort(files)
-
-local wizard = {}
-for _, entry in ipairs(files) do
-	if entry:sub(1, 1) ~= '.' then
-		local f = assert(loadfile(wizard_dir .. entry))
-		setfenv(f, getfenv())
-		local w = f()
-		table.insert(wizard, w)
-	end
-end
-
 local f = Form(translate("Welcome!"))
 f.submit = translate('Save & restart')
 f.reset = false
@@ -27,48 +9,35 @@ local s = f:section(Section)
 s.template = "wizard/welcome"
 s.package = "gluon-config-mode-core"
 
-local commit = {'gluon-setup-mode'}
-local run = {}
-
-for _, w in ipairs(wizard) do
-	for _, c in ipairs(w(f, uci) or {}) do
-		if type(c) == 'string' then
-			if not util.contains(commit, c) then
-				table.insert(commit, c)
-			end
-		elseif type(c) == 'function' then
-			table.insert(run, c)
-		else
-			error('invalid wizard module return')
-		end
-	end
+for _, entry in ipairs(util.glob('/lib/gluon/config-mode/wizard/*')) do
+	local section = assert(loadfile(entry))
+	setfenv(section, getfenv())
+	section()(f, uci)
 end
 
 function f:write()
-	local nixio = require "nixio"
+	local fcntl = require 'posix.fcntl'
+	local unistd = require 'posix.unistd'
 
 	uci:set("gluon-setup-mode", uci:get_first("gluon-setup-mode", "setup_mode"), "configured", true)
+	uci:save("gluon-setup-mode")
 
-	for _, c in ipairs(commit) do
-		uci:commit(c)
-	end
-	for _, r in ipairs(run) do
-		r()
-	end
+	os.execute('exec gluon-reconfigure >/dev/null')
 
 	f.template = "wizard/reboot"
 	f.package = "gluon-config-mode-core"
 	f.hidenav = true
 
-	if nixio.fork() == 0 then
+	if unistd.fork() == 0 then
 		-- Replace stdout with /dev/null
-		nixio.dup(nixio.open('/dev/null', 'w'), nixio.stdout)
+		local null = fcntl.open('/dev/null', fcntl.O_WRONLY)
+		unistd.dup2(null, unistd.STDOUT_FILENO)
 
 		-- Sleep a little so the browser can fetch everything required to
 		-- display the reboot page, then reboot the device.
-		nixio.nanosleep(1)
+		unistd.sleep(1)
 
-		nixio.execp("reboot")
+		unistd.execp('reboot', {[0] = 'reboot'})
 	end
 end
 

package/gluon-config-mode-domain-select/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-config-mode-domain-select
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua

@@ -2,13 +2,13 @@
 return function(form, uci)
 	local site_i18n = i18n 'gluon-site'
 
-	local fs = require 'nixio.fs'
 	local json = require 'jsonc'
 	local site = require 'gluon.site'
 	local util = require 'gluon.util'
 
 	local selected_domain = uci:get('gluon', 'core', 'domain')
-	local configured = uci:get_first('gluon-setup-mode','setup_mode', 'configured') == '1' or (selected_domain ~= site.default_domain())
+	local configured = uci:get_first('gluon-setup-mode','setup_mode', 'configured') == '1' or
+		(selected_domain ~= site.default_domain())
 
 	local function hide_domain_code(domain, code)
 		if configured and code == selected_domain then
@@ -22,7 +22,7 @@ return function(form, uci)
 
 	local function get_domain_list()
 		local list = {}
-		for domain_path in fs.glob('/lib/gluon/domains/*.json') do
+		for _, domain_path in ipairs(util.glob('/lib/gluon/domains/*.json')) do
 			local domain_code = domain_path:match('([^/]+)%.json$')
 			local domain = assert(json.load(domain_path))
 
@@ -49,20 +49,8 @@ return function(form, uci)
 		o:value(domain.domain_code, domain.domain_name)
 	end
 
-	local domain_changed = false
-
 	function o:write(data)
-		if data ~= selected_domain then
-			domain_changed = true
 		uci:set('gluon', 'core', 'domain', data)
+		uci:save('gluon')
 	end
 end
-
-	local function reconfigure()
-		if domain_changed then
-			os.execute('gluon-reconfigure')
-		end
-	end
-
-	return {'gluon', reconfigure}
-end

package/gluon-config-mode-geo-location-osm/Makefile

+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-config-mode-geo-location-osm
+
+include ../gluon.mk
+
+define Package/gluon-config-mode-geo-location-osm
+  TITLE:=Set geographic location of a node (map support)
+  DEPENDS:=+gluon-config-mode-geo-location +gluon-web-osm
+endef
+
+define Package/gluon-config-mode-geo-location-osm/install
+	$(Gluon/Build/Install)
+
+	$(INSTALL_DIR) $(1)/lib/gluon/config-mode/www/static/
+	$(LN) /lib/gluon/web/www/static/gluon-web-osm.js $(1)/lib/gluon/config-mode/www/static/
+endef
+
+$(eval $(call BuildPackageGluon,gluon-config-mode-geo-location-osm))

package/gluon-config-mode-geo-location-osm/check_site.lua

+need_number(in_site({'config_mode', 'geo_location', 'osm', 'center', 'lon'}))
+need_number(in_site({'config_mode', 'geo_location', 'osm', 'center', 'lat'}))
+need_number(in_site({'config_mode', 'geo_location', 'osm', 'zoom'}), false)
+need_string(in_site({'config_mode', 'geo_location', 'osm', 'openlayers_url'}), false)
+
+if need_table(in_site({'config_mode', 'geo_location', 'osm', 'tile_layer'}), nil, false) then
+	need_one_of(in_site({'config_mode', 'geo_location', 'osm', 'tile_layer', 'type'}), {'XYZ'})
+	need_string(in_site({'config_mode', 'geo_location', 'osm', 'tile_layer', 'url'}))
+	need_string(in_site({'config_mode', 'geo_location', 'osm', 'tile_layer', 'attributions'}))
+end

package/gluon-config-mode-geo-location-osm/i18n/de.po

+msgid ""
+msgstr ""
+"Project-Id-Version: gluon-config-mode-geo-location\n"
+"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
+"Language-Team: German\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"You may also select the position on the map displayed below if your computer "
+"is connected to the internet at the moment."
+msgstr ""
+"Wenn dein Computer aktuell mit dem Internet verbunden ist, kann die Position "
+"auch auf der hier angezeigten Karte ausgewählt werden."

package/gluon-config-mode-geo-location-osm/i18n/gluon-config-mode-geo-location-osm.pot

+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid ""
+"You may also select the position on the map displayed below if your computer "
+"is connected to the internet at the moment."
+msgstr ""

package/gluon-config-mode-geo-location-osm/luasrc/usr/lib/lua/gluon/config-mode/geo-location-osm.lua

+local osm = require 'gluon.web.model.osm'
+local site = require 'gluon.site'
+
+
+local M = {}
+
+M.MapValue = osm.MapValue
+
+function M.help(i18n)
+	local pkg_i18n = i18n 'gluon-config-mode-geo-location-osm'
+	return pkg_i18n.translate(
+		'You may also select the position on the map displayed below '
+		.. 'if your computer is connected to the internet at the moment.'
+	)
+end
+
+function M.options()
+	local config = site.config_mode.geo_location.osm
+
+	return {
+		openlayers_url = config.openlayers_url(),
+		tile_layer = config.tile_layer(),
+		zoom = config.zoom(12),
+		pos = config.center(),
+	}
+end
+
+return M

package/gluon-config-mode-geo-location/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-config-mode-geo-location
-PKG_VERSION:=1
 
 include ../gluon.mk
 

package/gluon-config-mode-geo-location/i18n/de.po

@@ -10,12 +10,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advertise node position"
+msgstr "Knotenposition veröffentlichen"
+
+msgid "Altitude"
+msgstr "Höhe"
+
 msgid ""
-"If you want the location of your node to be displayed on the map, you can "
-"enter its coordinates here."
+"If you want the location of your node to be displayed on public maps, you "
+"can enter its coordinates here."
 msgstr ""
-"Um deinen Knoten auf der Karte anzeigen zu können, benötigen wir seine "
-"Koordinaten. Hier hast du die Möglichkeit, diese zu hinterlegen."
+"Um deinen Knoten auf öffentlichen Karten anzeigen zu können, benötigen wir "
+"seine Koordinaten. Hier hast du die Möglichkeit, diese zu hinterlegen."
 
 msgid "Latitude"
 msgstr "Breitengrad"
@@ -23,8 +29,15 @@ msgstr "Breitengrad"
 msgid "Longitude"
 msgstr "Längengrad"
 
-msgid "Show node on the map"
-msgstr "Knoten auf der Karte anzeigen"
+msgid "Set node position"
+msgstr "Knotenposition setzen"
+
+msgid ""
+"Specifying the altitude is optional; it should only be filled in if an "
+"accurate value is known."
+msgstr ""
+"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein exakter "
+"Wert bekannt ist."
 
 msgid "e.g. %s"
 msgstr "z.B. %s"

package/gluon-config-mode-geo-location/i18n/fr.po

 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "PO-Revision-Date: 2015-08-12 23:30+0100\n"
 "Last-Translator:Tobias Bernot <tqbs@airmail.cc>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Advertise node position"
+msgstr ""
+
+msgid "Altitude"
+msgstr "Hauteur"
+
 msgid ""
-"If you want the location of your node to be displayed on the map, you can "
-"enter its coordinates here."
+"If you want the location of your node to be displayed on public maps, you "
+"can enter its coordinates here."
 msgstr ""
-"Pour Afficher votre nœud sur la Carte nous avons besoin de ses coordonnées. "
-"Ici vous pouvez entrer sa position."
 
 msgid "Latitude"
 msgstr "Latitude"
@@ -23,8 +27,15 @@ msgstr "Latitude"
 msgid "Longitude"
 msgstr "Longitude"
 
-msgid "Show node on the map"
-msgstr "Afficher le nœud sur la carte"
+msgid "Set node position"
+msgstr ""
+
+msgid ""
+"Specifying the altitude is optional; it should only be filled in if an "
+"accurate value is known."
+msgstr ""
+"La altitude est optionelle et ne devrait que être ajoutée si la valeur "
+"exacte est connue."
 
 msgid "e.g. %s"
 msgstr "Ex: %s"

package/gluon-config-mode-geo-location/i18n/gluon-config-mode-geo-location.pot

 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+msgid "Advertise node position"
+msgstr ""
+
+msgid "Altitude"
+msgstr ""
+
 msgid ""
-"If you want the location of your node to be displayed on the map, you can "
-"enter its coordinates here."
+"If you want the location of your node to be displayed on public maps, you "
+"can enter its coordinates here."
 msgstr ""
 
 msgid "Latitude"
@@ -12,7 +18,12 @@ msgstr ""
 msgid "Longitude"
 msgstr ""
 
-msgid "Show node on the map"
+msgid "Set node position"
+msgstr ""
+
+msgid ""
+"Specifying the altitude is optional; it should only be filled in if an "
+"accurate value is known."
 msgstr ""
 
 msgid "e.g. %s"