From c03c92bca23893e8e70dc9e40e7551cfcd394b28 Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Sun, 18 Dec 2022 18:02:33 +0100
Subject: [PATCH 1/8] docs: fix mixed indentation for css files

---
 .editorconfig               | 2 ++
 docs/_static/css/custom.css | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index cca66853..a09080c2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,6 +15,8 @@ indent_size = 4
 indent_style = unset
 indent_size = unset
 
+[*.css]
+
 [*.dia]
 indent_style = space
 indent_size = 2
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
index b4fd2586..c9996e0e 100644
--- a/docs/_static/css/custom.css
+++ b/docs/_static/css/custom.css
@@ -1,8 +1,8 @@
 /*
-  This fixes the vertical position of list markers when the first
-  element in the <li> is a <pre> block
+	This fixes the vertical position of list markers when the first
+	element in the <li> is a <pre> block
 
-  Scrolling inside the <pre> block is still working as expected
+	Scrolling inside the <pre> block is still working as expected
 */
 .rst-content pre.literal-block,
 .rst-content div[class^='highlight'] pre {

From cad694a22a9592a3e637e08717ecfc08a86bada1 Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Sun, 18 Dec 2022 18:19:59 +0100
Subject: [PATCH 2/8] gluon-web-model: mark minified js as such

changes ln from third to first form (see man ln)
---
 package/gluon-config-mode-core/Makefile                         | 2 +-
 .../www/static/{gluon-web-model.js => gluon-web-model.min.js}   | 0
 package/gluon-web-model/javascript/gluon-web-model.js           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename package/gluon-web-model/files/lib/gluon/web/www/static/{gluon-web-model.js => gluon-web-model.min.js} (100%)

diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile
index 0c3a0f42..257ea47b 100644
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -18,7 +18,7 @@ define Package/gluon-config-mode-core/install
 	$(INSTALL_DIR) $(1)/lib/gluon/config-mode/view/ $(1)/lib/gluon/config-mode/www/static/
 	$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/config-mode/
 	$(LN) /lib/gluon/web/view/{error,model} $(1)/lib/gluon/config-mode/view/
-	$(LN) /lib/gluon/web/www/static/gluon-web-model.js $(1)/lib/gluon/config-mode/www/static/
+	$(LN) /lib/gluon/web/www/static/gluon-web-model.min.js $(1)/lib/gluon/config-mode/www/static/gluon-web-model.js
 endef
 
 $(eval $(call BuildPackageGluon,gluon-config-mode-core))
diff --git a/package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.js b/package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.min.js
similarity index 100%
rename from package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.js
rename to package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.min.js
diff --git a/package/gluon-web-model/javascript/gluon-web-model.js b/package/gluon-web-model/javascript/gluon-web-model.js
index d9a4bb24..ed46b685 100644
--- a/package/gluon-web-model/javascript/gluon-web-model.js
+++ b/package/gluon-web-model/javascript/gluon-web-model.js
@@ -13,7 +13,7 @@
 /*
 	Build using:
 
-	uglifyjs javascript/gluon-web-model.js -o files/lib/gluon/web/www/static/gluon-web-model.js -c -m --support-ie8
+	uglifyjs javascript/gluon-web-model.js -o files/lib/gluon/web/www/static/gluon-web-model.min.js -c -m --support-ie8
 */
 
 

From 5f371a3cd4435b442f73d8fab466253f231a95ae Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Sun, 18 Dec 2022 18:23:34 +0100
Subject: [PATCH 3/8] gluon-web-model: fix mixed indentation

---
 package/gluon-web-model/javascript/gluon-web-model.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/gluon-web-model/javascript/gluon-web-model.js b/package/gluon-web-model/javascript/gluon-web-model.js
index ed46b685..05358b95 100644
--- a/package/gluon-web-model/javascript/gluon-web-model.js
+++ b/package/gluon-web-model/javascript/gluon-web-model.js
@@ -56,9 +56,9 @@
 			var match;
 			if ((match = this.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/))) {
 				return (match[1] >= 0) && (match[1] <= 255) &&
-				       (match[2] >= 0) && (match[2] <= 255) &&
-				       (match[3] >= 0) && (match[3] <= 255) &&
-				       (match[4] >= 0) && (match[4] <= 255);
+					(match[2] >= 0) && (match[2] <= 255) &&
+					(match[3] >= 0) && (match[3] <= 255) &&
+					(match[4] >= 0) && (match[4] <= 255);
 			}
 
 			return false;

From 886f6387b7029d60cc03045e1d6a343ab03153c1 Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Sun, 18 Dec 2022 18:30:25 +0100
Subject: [PATCH 4/8] gluon-web-osm: mark minified js as such

changes ln from third to first form (see man ln)
---
 package/gluon-config-mode-geo-location-osm/Makefile             | 2 +-
 .../web/www/static/{gluon-web-osm.js => gluon-web-osm.min.js}   | 0
 package/gluon-web-osm/javascript/gluon-web-osm.js               | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename package/gluon-web-osm/files/lib/gluon/web/www/static/{gluon-web-osm.js => gluon-web-osm.min.js} (100%)

diff --git a/package/gluon-config-mode-geo-location-osm/Makefile b/package/gluon-config-mode-geo-location-osm/Makefile
index 2e101223..a0710e66 100644
--- a/package/gluon-config-mode-geo-location-osm/Makefile
+++ b/package/gluon-config-mode-geo-location-osm/Makefile
@@ -13,7 +13,7 @@ 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/
+	$(LN) /lib/gluon/web/www/static/gluon-web-osm.min.js $(1)/lib/gluon/config-mode/www/static/gluon-web-osm.js
 endef
 
 $(eval $(call BuildPackageGluon,gluon-config-mode-geo-location-osm))
diff --git a/package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.js b/package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.min.js
similarity index 100%
rename from package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.js
rename to package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.min.js
diff --git a/package/gluon-web-osm/javascript/gluon-web-osm.js b/package/gluon-web-osm/javascript/gluon-web-osm.js
index b4acbf8b..10bba2a8 100644
--- a/package/gluon-web-osm/javascript/gluon-web-osm.js
+++ b/package/gluon-web-osm/javascript/gluon-web-osm.js
@@ -1,7 +1,7 @@
 /*
 	Build using:
 
-	uglifyjs javascript/gluon-web-osm.js -o files/lib/gluon/web/www/static/gluon-web-osm.js -c -m
+	uglifyjs javascript/gluon-web-osm.js -o files/lib/gluon/web/www/static/gluon-web-osm.min.js -c -m
 */
 
 'use strict';

From 6c0f22445651647a5cd2e7be08e4c7ef6c02e42b Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Sun, 18 Dec 2022 19:50:57 +0100
Subject: [PATCH 5/8] gluon-status-page: mark minified js as such

---
 package/gluon-status-page/Makefile                          | 6 ++++--
 package/gluon-status-page/javascript/status-page.js         | 2 +-
 .../static/status-page.js => javascript/status-page.min.js} | 0
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename package/gluon-status-page/{files/lib/gluon/status-page/www/static/status-page.js => javascript/status-page.min.js} (100%)

diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile
index b4eea874..0b4bcb6d 100644
--- a/package/gluon-status-page/Makefile
+++ b/package/gluon-status-page/Makefile
@@ -17,8 +17,10 @@ define Package/gluon-status-page/install
 	$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/
 
-ifndef CONFIG_GLUON_MINIFY
-	$(CP) ./javascript/status-page.js $(1)/lib/gluon/status-page/www/static/status-page.js
+ifdef CONFIG_GLUON_MINIFY
+	$(INSTALL_DATA) ./javascript/status-page.min.js $(1)/lib/gluon/status-page/www/static/status-page.js
+else
+	$(INSTALL_DATA) ./javascript/status-page.js $(1)/lib/gluon/status-page/www/static/status-page.js
 endif
 
 	$(INSTALL_DIR) $(1)/lib/gluon/status-page/view/
diff --git a/package/gluon-status-page/javascript/status-page.js b/package/gluon-status-page/javascript/status-page.js
index 1360253c..016e20ee 100644
--- a/package/gluon-status-page/javascript/status-page.js
+++ b/package/gluon-status-page/javascript/status-page.js
@@ -1,7 +1,7 @@
 /*
 	Build using:
 
-	uglifyjs javascript/status-page.js -o files/lib/gluon/status-page/www/static/status-page.js -c -m
+	uglifyjs javascript/status-page.js -o javascript/status-page.min.js -c -m
 */
 
 'use strict';
diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/static/status-page.js b/package/gluon-status-page/javascript/status-page.min.js
similarity index 100%
rename from package/gluon-status-page/files/lib/gluon/status-page/www/static/status-page.js
rename to package/gluon-status-page/javascript/status-page.min.js

From 348e93895733de36282d98f968e88c29e9c59276 Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Sun, 18 Dec 2022 19:52:48 +0100
Subject: [PATCH 6/8] editorconfig: remove now unused js exception

---
 .editorconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index a09080c2..a0592132 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,6 +21,8 @@ indent_size = unset
 indent_style = space
 indent_size = 2
 
+[*.js]
+
 [*{.json,.ecrc}]
 indent_style = space
 indent_size = 2

From 389314f58a202b36194eec78b084070399025da6 Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Mon, 2 Jan 2023 15:35:32 +0100
Subject: [PATCH 7/8] gluon-web-model: add minify flag support

---
 package/gluon-config-mode-core/Makefile             |  2 +-
 package/gluon-web-model/Makefile                    | 13 +++++++++++++
 .../gluon-web-model/javascript/gluon-web-model.js   |  2 +-
 .../static => javascript}/gluon-web-model.min.js    |  0
 4 files changed, 15 insertions(+), 2 deletions(-)
 rename package/gluon-web-model/{files/lib/gluon/web/www/static => javascript}/gluon-web-model.min.js (100%)

diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile
index 257ea47b..0c3a0f42 100644
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -18,7 +18,7 @@ define Package/gluon-config-mode-core/install
 	$(INSTALL_DIR) $(1)/lib/gluon/config-mode/view/ $(1)/lib/gluon/config-mode/www/static/
 	$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/config-mode/
 	$(LN) /lib/gluon/web/view/{error,model} $(1)/lib/gluon/config-mode/view/
-	$(LN) /lib/gluon/web/www/static/gluon-web-model.min.js $(1)/lib/gluon/config-mode/www/static/gluon-web-model.js
+	$(LN) /lib/gluon/web/www/static/gluon-web-model.js $(1)/lib/gluon/config-mode/www/static/
 endef
 
 $(eval $(call BuildPackageGluon,gluon-config-mode-core))
diff --git a/package/gluon-web-model/Makefile b/package/gluon-web-model/Makefile
index 518a5b47..9b1b0e7a 100644
--- a/package/gluon-web-model/Makefile
+++ b/package/gluon-web-model/Makefile
@@ -9,4 +9,17 @@ define Package/gluon-web-model
   DEPENDS:=+gluon-web
 endef
 
+PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY
+
+define Package/gluon-web-model/install
+	$(Gluon/Build/Install)
+	$(INSTALL_DIR) $(1)/lib/gluon/web/www/static/
+
+ifdef CONFIG_GLUON_MINIFY
+	$(INSTALL_DATA) ./javascript/gluon-web-model.min.js $(1)/lib/gluon/web/www/static/gluon-web-model.js
+else
+	$(INSTALL_DATA) ./javascript/gluon-web-model.js $(1)/lib/gluon/web/www/static/
+endif
+endef
+
 $(eval $(call BuildPackageGluon,gluon-web-model))
diff --git a/package/gluon-web-model/javascript/gluon-web-model.js b/package/gluon-web-model/javascript/gluon-web-model.js
index 05358b95..ec9cdc4a 100644
--- a/package/gluon-web-model/javascript/gluon-web-model.js
+++ b/package/gluon-web-model/javascript/gluon-web-model.js
@@ -13,7 +13,7 @@
 /*
 	Build using:
 
-	uglifyjs javascript/gluon-web-model.js -o files/lib/gluon/web/www/static/gluon-web-model.min.js -c -m --support-ie8
+	uglifyjs javascript/gluon-web-model.js -o javascript/gluon-web-model.min.js -c -m --support-ie8
 */
 
 
diff --git a/package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.min.js b/package/gluon-web-model/javascript/gluon-web-model.min.js
similarity index 100%
rename from package/gluon-web-model/files/lib/gluon/web/www/static/gluon-web-model.min.js
rename to package/gluon-web-model/javascript/gluon-web-model.min.js

From 0ec32078303cb3843408754502529422b9ce5408 Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Mon, 2 Jan 2023 15:43:12 +0100
Subject: [PATCH 8/8] gluon-web-osm: add minify flag support

---
 package/gluon-config-mode-geo-location-osm/Makefile |  2 +-
 package/gluon-web-osm/Makefile                      | 13 +++++++++++++
 package/gluon-web-osm/javascript/gluon-web-osm.js   |  2 +-
 .../www/static => javascript}/gluon-web-osm.min.js  |  0
 4 files changed, 15 insertions(+), 2 deletions(-)
 rename package/gluon-web-osm/{files/lib/gluon/web/www/static => javascript}/gluon-web-osm.min.js (100%)

diff --git a/package/gluon-config-mode-geo-location-osm/Makefile b/package/gluon-config-mode-geo-location-osm/Makefile
index a0710e66..2e101223 100644
--- a/package/gluon-config-mode-geo-location-osm/Makefile
+++ b/package/gluon-config-mode-geo-location-osm/Makefile
@@ -13,7 +13,7 @@ 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.min.js $(1)/lib/gluon/config-mode/www/static/gluon-web-osm.js
+	$(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))
diff --git a/package/gluon-web-osm/Makefile b/package/gluon-web-osm/Makefile
index 3594da80..31f4b7b7 100644
--- a/package/gluon-web-osm/Makefile
+++ b/package/gluon-web-osm/Makefile
@@ -8,4 +8,17 @@ define Package/gluon-web-osm
   TITLE:=base src for OSM inlay
 endef
 
+PKG_CONFIG_DEPENDS += CONFIG_GLUON_MINIFY
+
+define Package/gluon-web-osm/install
+	$(Gluon/Build/Install)
+	$(INSTALL_DIR) $(1)/lib/gluon/web/www/static/
+
+ifdef CONFIG_GLUON_MINIFY
+	$(INSTALL_DATA) ./javascript/gluon-web-osm.min.js $(1)/lib/gluon/web/www/static/gluon-web-osm.js
+else
+	$(INSTALL_DATA) ./javascript/gluon-web-osm.js $(1)/lib/gluon/web/www/static/
+endif
+endef
+
 $(eval $(call BuildPackageGluon,gluon-web-osm))
diff --git a/package/gluon-web-osm/javascript/gluon-web-osm.js b/package/gluon-web-osm/javascript/gluon-web-osm.js
index 10bba2a8..65d525ab 100644
--- a/package/gluon-web-osm/javascript/gluon-web-osm.js
+++ b/package/gluon-web-osm/javascript/gluon-web-osm.js
@@ -1,7 +1,7 @@
 /*
 	Build using:
 
-	uglifyjs javascript/gluon-web-osm.js -o files/lib/gluon/web/www/static/gluon-web-osm.min.js -c -m
+	uglifyjs javascript/gluon-web-osm.js -o javascript/gluon-web-osm.min.js -c -m
 */
 
 'use strict';
diff --git a/package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.min.js b/package/gluon-web-osm/javascript/gluon-web-osm.min.js
similarity index 100%
rename from package/gluon-web-osm/files/lib/gluon/web/www/static/gluon-web-osm.min.js
rename to package/gluon-web-osm/javascript/gluon-web-osm.min.js