From a2f5866bdeeafac0cc90ade528515008d40dc167 Mon Sep 17 00:00:00 2001 From: Geoffrey Frogeye Date: Mon, 2 Mar 2015 15:52:15 +0100 Subject: [PATCH] Added static map in case JS don't work --- css/crep.css | 5 +++++ img/.gitignore | 3 ++- img/Makefile | 10 ++++++++-- pages/contact.php | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/css/crep.css b/css/crep.css index 9fe76c8..47e2eaa 100755 --- a/css/crep.css +++ b/css/crep.css @@ -78,6 +78,11 @@ body height: 400px; } +#map-canvas > img +{ + height: 400px; +} + #footer { margin-bottom: 30px; diff --git a/img/.gitignore b/img/.gitignore index 46c0791..7a2ae1b 100644 --- a/img/.gitignore +++ b/img/.gitignore @@ -1,4 +1,5 @@ CREP-*.jpg polytechlille.png lille1.png -mainBgPattern.png \ No newline at end of file +mainBgPattern.png +polyMap.png diff --git a/img/Makefile b/img/Makefile index 540a5b1..3e34ed7 100755 --- a/img/Makefile +++ b/img/Makefile @@ -1,7 +1,9 @@ GENIMG=lille1.png polytechlille.png CMPIMG=CREP-1.jpg CREP-2.jpg CREP-3.jpg CREP-4.jpg CREP-5.jpg -all: $(GENIMG) $(CMPIMG) mainBgPattern.png +ALLGEN=$(GENIMG) $(CMPIMG) mainBgPattern.png polyMap.png + +all: $(ALLGEN) mainBgPattern.png: wget http://subtlepatterns.com/patterns/low_contrast_linen.png -O $@ @@ -9,6 +11,10 @@ mainBgPattern.png: convert -channel B -evaluate multiply 1.2 $@ $@ optipng -o7 $@ +polyMap.png: + wget "https://maps.googleapis.com/maps/api/staticmap?center=50.6074998,3.1373338&zoom=16&size=640x400&scale=2&maptype=roadmap&markers=color:red%7Clabel:P%7C50.6074998,3.1373338" -O $@ + optipng -o7 $@ + %.png: %.svg convert -background none $< $@ optipng -o7 $@ @@ -17,4 +23,4 @@ mainBgPattern.png: convert -resize x1200 -strip -interlace Plane -gaussian-blur 0.05 -quality 90% $< $@ clean: - rm -rf $(GENIMG) $(CMPIMG) + rm -rf $(ALLGEN) diff --git a/pages/contact.php b/pages/contact.php index f4ebcf2..6018d97 100755 --- a/pages/contact.php +++ b/pages/contact.php @@ -4,11 +4,14 @@     -
+
+ +