LeClubInfo / crep

Commit a2f5866bdeeafac0cc90ade528515008d40dc167

Authored by Geoffrey PREUD'HOMME
1 parent 4afbf7b6

Added static map in case JS don't work

Showing 4 changed files with 19 additions and 4 deletions   Show diff stats
Inline Side-by-side
@@ -78,6 +78,11 @@ body @@ -78,6 +78,11 @@ body
78 height: 400px; 78 height: 400px;
79 } 79 }
80 80
  81 +#map-canvas > img
  82 +{
  83 + height: 400px;
  84 +}
  85 +
81 #footer 86 #footer
82 { 87 {
83 margin-bottom: 30px; 88 margin-bottom: 30px;
1 CREP-*.jpg 1 CREP-*.jpg
2 polytechlille.png 2 polytechlille.png
3 lille1.png 3 lille1.png
4 -mainBgPattern.png  
5 \ No newline at end of file 4 \ No newline at end of file
  5 +mainBgPattern.png
  6 +polyMap.png
1 GENIMG=lille1.png polytechlille.png 1 GENIMG=lille1.png polytechlille.png
2 CMPIMG=CREP-1.jpg CREP-2.jpg CREP-3.jpg CREP-4.jpg CREP-5.jpg 2 CMPIMG=CREP-1.jpg CREP-2.jpg CREP-3.jpg CREP-4.jpg CREP-5.jpg
3 3
4 -all: $(GENIMG) $(CMPIMG) mainBgPattern.png 4 +ALLGEN=$(GENIMG) $(CMPIMG) mainBgPattern.png polyMap.png
  5 +
  6 +all: $(ALLGEN)
5 7
6 mainBgPattern.png: 8 mainBgPattern.png:
7 wget http://subtlepatterns.com/patterns/low_contrast_linen.png -O $@ 9 wget http://subtlepatterns.com/patterns/low_contrast_linen.png -O $@
@@ -9,6 +11,10 @@ mainBgPattern.png: @@ -9,6 +11,10 @@ mainBgPattern.png:
9 convert -channel B -evaluate multiply 1.2 $@ $@ 11 convert -channel B -evaluate multiply 1.2 $@ $@
10 optipng -o7 $@ 12 optipng -o7 $@
11 13
  14 +polyMap.png:
  15 + 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 $@
  16 + optipng -o7 $@
  17 +
12 %.png: %.svg 18 %.png: %.svg
13 convert -background none $< $@ 19 convert -background none $< $@
14 optipng -o7 $@ 20 optipng -o7 $@
@@ -17,4 +23,4 @@ mainBgPattern.png: @@ -17,4 +23,4 @@ mainBgPattern.png:
17 convert -resize x1200 -strip -interlace Plane -gaussian-blur 0.05 -quality 90% $< $@ 23 convert -resize x1200 -strip -interlace Plane -gaussian-blur 0.05 -quality 90% $< $@
18 24
19 clean: 25 clean:
20 - rm -rf $(GENIMG) $(CMPIMG) 26 + rm -rf $(ALLGEN)
@@ -4,11 +4,14 @@ @@ -4,11 +4,14 @@
4 </div> 4 </div>
5 &nbsp; 5 &nbsp;
6 &nbsp; 6 &nbsp;
7 -<div id="map-canvas"></div> 7 +<div id="map-canvas">
  8 + <img src="img/polyMap.png"/>
  9 +</div>
8 <script> 10 <script>
9 function initialize() 11 function initialize()
10 { 12 {
11 var mapCanvas = document.getElementById('map-canvas'); 13 var mapCanvas = document.getElementById('map-canvas');
  14 + mapCanvas.innerHTML = ''
12 var polytechPos = new google.maps.LatLng(50.6074998, 3.1373338); 15 var polytechPos = new google.maps.LatLng(50.6074998, 3.1373338);
13 var mapOptions = 16 var mapOptions =
14 { 17 {