From eb62342cbe3348dc14a02ce6b23a5c1a7137a9e7 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Sat, 11 Mar 2017 10:37:44 +0100 Subject: [PATCH 1/9] Fix HTML validator warnings --- index.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index af0302a..a3d23cc 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,4 @@ + @@ -20,6 +21,11 @@ + @@ -28,7 +34,6 @@ - - - - + + + + + @@ -62,9 +62,8 @@ - -
+ +
+

- + From 421fa6942c1eba24d3ed7efa24c130a4151a4faa Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Sun, 19 Mar 2017 22:03:59 +0100 Subject: [PATCH 8/9] Update deployment --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d24f215..d67d6ca 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ opening_hours+deps.min.js: $(MAKE) --directory opening_hours.js/ opening_hours+deps.min.js taginfo.json: ./opening_hours.js/gen_taginfo_json.js ./opening_hours.js/related_tags.txt taginfo_template.json - $< --key-file ./opening_hours.js/related_tags.txt --template-file taginfo_template.json > "$@" + opening_hours_map --key-file ./opening_hours.js/related_tags.txt --template-file taginfo_template.json > "$@" .PHONY: dependencies-get dependencies-get: js/OpenLayers-$(OpenLayersVersion)/OpenLayers.js @@ -43,6 +43,10 @@ deploy-on-all-servers: deploy-on-openingh.openstreetmap.de deploy-on-ypid.de deploy-on-openingh.openstreetmap.de: opening_hours+deps.min.js rsync --archive * gauss.osm.de:~/www -v +## Custom deployment method which allows me to fully isolate the development and build environment from the server. .PHONY: deploy-on-openingh.openstreetmap.de deploy-on-ypid.de: opening_hours+deps.min.js - rsync --archive * osm@www.pubsrv.ypid.de:/srv/www/osm/sites/openingh.ypid.de/public -v + rm -rf "/tmp/opening_hours_map" + mkdir --parents "/tmp/opening_hours_map" + /bin/tar --exclude-vcs --exclude='./js/*.tar.gz' --exclude='./js/OpenLayers-$(OpenLayersVersion)/doc' --exclude='./opening_hours.js/node_modules/bower' --exclude='./opening_hours.js/submodules/panieravide.github.io/id-indoor' --exclude='./opening_hours.js/submodules/panieravide.github.io/pic4carto' --no-acls -czf - . | /bin/tar -xz --directory "/tmp/opening_hours_map" -f - + qvm-copy-to-vm s-cm "/tmp/opening_hours_map" From 83faeef55710b59eb01747340c28ed9cd37ccdfe Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Sun, 19 Mar 2017 22:12:28 +0100 Subject: [PATCH 9/9] Update to latest master of opening_hours.js --- opening_hours.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opening_hours.js b/opening_hours.js index 01dc38a..cb887f6 160000 --- a/opening_hours.js +++ b/opening_hours.js @@ -1 +1 @@ -Subproject commit 01dc38a237bbbecece1b6efdf7ee7567abecd5c5 +Subproject commit cb887f6dcc7aa0a66454beb542cbc3024c58710e