X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=contenu%2Fpage-carte_de_sites.html;h=1fbbaca0dc7a2737d5670083ebfa3240f3400ec3;hb=3225a2ff3a91ce87ccdac81b88b919cada85bd16;hp=6b9265a8e9181ead216971b7e8422c6ac24512d4;hpb=2cf2df1cb4dc53c550ddbec675e583425893f78a;p=lhc%2Fweb%2Fspip_carte_de_sites.git

diff --git a/contenu/page-carte_de_sites.html b/contenu/page-carte_de_sites.html
index 6b9265a..1fbbaca 100644
--- a/contenu/page-carte_de_sites.html
+++ b/contenu/page-carte_de_sites.html
@@ -1,9 +1,7 @@
+<!-- Carte -->
 <div id="map" style="width: 540px; height: 400px">
 <script src="#CONFIG{adresse_site}/lib/CloudMade-Leaflet-50a5790/dist/leaflet.js"></script>
 
-
-
-
 <script>
 <BOUCLE_ateliers_types(MOTS){type = Ateliers}{par num titre}>
 		var group_#ID_MOT = new L.LayerGroup();
@@ -19,7 +17,7 @@
 						});
 						siteIcon = new WorkshopIcon()
 						var markerAtelier = new L.Marker(new L.LatLng(#LAT, #LON), {icon: siteIcon});
-						markerAtelier.bindPopup("<span style='float: left; width: 45px;'> <img src='#CONFIG{adresse_site}/IMG/#LOGO_SYNDIC**' alt='' style='width: 45px;' width='45'></span><a href='[(#ID_SYNDIC|generer_url_entite{site})]'>#NOM_SITE</a><br/>#_sites:DESCRIPTIF<br/><i>#DESCRIPTIF</i><span class='spip_documents spip_documents_right' style='float: right; width: 100px;'> <img src='#CONFIG{adresse_site}/IMG/#LOGO_SYNDIC_SURVOL**' alt='' style='width: 100px;' width='100'></span>#ADRESSE<br/> #CODE_POSTAL #VILLE<br/><br/><em>Statut: [(#_ateliers_types:TITRE|supprimer_numero)]</em>");
+						markerAtelier.bindPopup("<span style='float: left; width: 45px;'> <img src='#CONFIG{adresse_site}/IMG/#LOGO_SYNDIC**' alt='' style='width: 45px;' width='45'></span><a href='[(#ID_SYNDIC|generer_url_entite{site})]'>#NOM_SITE</a>#_sites:DESCRIPTIF<i>#DESCRIPTIF</i><span class='spip_documents spip_documents_right' style='float: right; width: 100px;'> <img src='#CONFIG{adresse_site}/IMG/#LOGO_SYNDIC_SURVOL**' alt='' style='width: 100px;' width='100'></span> #ADRESSE<br/> #CODE_POSTAL #VILLE<br/><br/><em>Statut: [(#_ateliers_types:TITRE|supprimer_numero)]</em>");
 						group_#ID_MOT.addLayer(markerAtelier)
 				</BOUCLE_coord>
 		</BOUCLE_sites>
@@ -29,24 +27,23 @@
 		cloudmadeOptions = {maxZoom: 18, attribution: cloudmadeAttribution},	
 		cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/{styleId}/256/{z}/{x}/{y}.png';
 		
-	var minimal = new L.TileLayer(cloudmadeUrl, cloudmadeOptions, {styleId: 22677}),
-		midnightCommander = new L.TileLayer(cloudmadeUrl, cloudmadeOptions, {styleId: 999}),
-		motorways = new L.TileLayer(cloudmadeUrl, cloudmadeOptions, {styleId: 46561});
+	var midnightCommander = new L.TileLayer(cloudmadeUrl, cloudmadeOptions, {styleId: 999}),
+		minimal = new L.TileLayer(cloudmadeUrl, cloudmadeOptions, {styleId: 14189});
+		
 
 <B_map>
-	var map = new L.Map('map', {center: new L.LatLng(46.8, 2.52), zoom: 5, layers: [<BOUCLE_map(MOTS){type = Ateliers}>	group_#ID_MOT,</BOUCLE_map>	minimal, midnightCommander, motorways]});
+	var map = new L.Map('map', {center: new L.LatLng(46.8, 2.52), zoom: 5, layers: [<BOUCLE_map(MOTS){type = Ateliers}>	group_#ID_MOT,</BOUCLE_map>	midnightCommander, minimal]});
 </B_map>
 
 	var baseMaps = {
-				"Night View": midnightCommander,				
-				"Minimal": minimal
+				"Vue de nuit ;-)": midnightCommander,				
+				"Vue de jour": minimal
 			};
 
 <B_groups>
 	var overlayMaps = {	
 		<BOUCLE_groups(MOTS){type = Ateliers}{par num titre}>
 			"[(#TITRE|supprimer_numero)]": group_#ID_MOT,</BOUCLE_groups>
-			"Motorways": motorways
 	};
 </B_groups>
 
@@ -60,7 +57,7 @@
 	var popup = new L.Popup();
 
 	function onMapClick(e) {
-		var latlngStr = '(' + e.latlng.lat.toFixed(3) + ', ' + e.latlng.lng.toFixed(3) + ')';
+		var latlngStr = '(' + e.latlng.lat.toFixed(5) + ', ' + e.latlng.lng.toFixed(5) + ')';
 		popup.setLatLng(e.latlng);
 		popup.setContent("You clicked the map at " + latlngStr);
 		map.openPopup(popup);
@@ -69,18 +66,20 @@
 </script>
 </div>
 
+<!-- Legende -->
 <h2 class='h2 spip'>Legende</h2>
 <BOUCLE_legende(MOTS){type = Ateliers}{par num titre}>
 	<p>#LOGO_MOT [(#TITRE|supprimer_numero)]</p>
 </BOUCLE_legende>
 
+<!-- Liste des sites -->
 <h2 class='h2 spip'>Ateliers</h2>
 <BOUCLE_liste_pays(GIS){par pays}{fusion pays}>
 	<h3 class='h3 spip'>#PAYS</h3>
 		<BOUCLE_liste_region(GIS){par region}{pays}{fusion region}>
 			<h4 class='h4 spip'>#REGION</h4>
-				<BOUCLE_liste_ateliers(GIS){par ville}{region}>
-					<li>#VILLE (#CODE_POSTAL) #TITRE - #ADRESSE</li>
+				<BOUCLE_liste_ateliers(GIS spip_gis_liens){par ville}{region}>
+					<li>#VILLE (#CODE_POSTAL) <a href="#URL_SITE_SPIP/[(#ID_OBJET|generer_url_entite{#OBJET})]">#TITRE</a> - #ADRESSE</li>
 				</BOUCLE_liste_ateliers>
 		</BOUCLE_liste_region>
 </BOUCLE_liste_pays>