# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1372240960 -7200
# Node ID fa85d73d1cf675527a895bc8afab1e3377d43942
# Parent  7f141426ccbf9e79ed4fbef38601b4c78a5b9e5d# Parent  8860d922f37c1ef501e3a4774ce052b350d14a18
Merge

diff -r 8860d922f37c -r fa85d73d1cf6 integration/v2/css/style.css
--- a/integration/v2/css/style.css	Wed Jun 26 12:02:49 2013 +0200
+++ b/integration/v2/css/style.css	Wed Jun 26 12:02:40 2013 +0200
@@ -262,7 +262,7 @@
 .content-project p{font-family: 'Lato'; font-size: 13px; font-weight: 300; line-height: 15px; padding: 10px;}
 
 body{overflow: auto !important;}
-#map{width: 100%; height: 400px;}
+#map{width: 100%; height: 360px; margin-bottom: 20px;}
 
 
 /* imported */
diff -r 8860d922f37c -r fa85d73d1cf6 integration/v2/js/main.js
--- a/integration/v2/js/main.js	Wed Jun 26 12:02:49 2013 +0200
+++ b/integration/v2/js/main.js	Wed Jun 26 12:02:40 2013 +0200
@@ -121,6 +121,25 @@
 	}
 //map
 	if($('#map').length){
-		var map = L.map('map').setView([51.505, -0.09], 13);
+		initmap()
 	}
+function initmap() {
+	// set up the map
+	map = new L.Map('map');
+
+	// create the tile layer with correct attribution
+	var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+	var osm = new L.TileLayer(osmUrl, {minZoom: 3, maxZoom: 20});		
+
+	// start the map in South-East England
+	map.setView(new L.LatLng(48.833, 2.333),4);
+	map.addLayer(osm);
+
+	// markers
+	var marker1 = L.marker([48.833, 2.333]).addTo(map);
+	marker1.bindPopup("Beaux-Arts de Paris");
+	var marker2 = L.marker([47.233,-1.583]).addTo(map);
+	marker2.bindPopup("Beaux-Arts de Nantes");
+}
+
 });//ready
diff -r 8860d922f37c -r fa85d73d1cf6 integration/v2/lib/leaflet/images/marker-icon.png
Binary file integration/v2/lib/leaflet/images/marker-icon.png has changed
diff -r 8860d922f37c -r fa85d73d1cf6 integration/v2/lib/leaflet/leaflet.css
--- a/integration/v2/lib/leaflet/leaflet.css	Wed Jun 26 12:02:49 2013 +0200
+++ b/integration/v2/lib/leaflet/leaflet.css	Wed Jun 26 12:02:40 2013 +0200
@@ -386,8 +386,9 @@
 .leaflet-popup-content-wrapper {
 	padding: 1px;
 	text-align: left;
-	-webkit-border-radius: 20px;
-	        border-radius: 20px;
+	font-family: 'Lato';
+	font-size: 12px;
+	color: #7F7F7F;
 	}
 .leaflet-popup-content {
 	margin: 14px 20px;