# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1372263750 -7200
# Node ID 39a17b6e0b57430b803f25cb1270f5b92bec272d
# Parent  c8f2f2d54bbf84106b190f7d30d1aded1b774c39# Parent  b98558f8d2c1757aac2e22bf563cea35b0b2db58
Merge

diff -r b98558f8d2c1 -r 39a17b6e0b57 integration/v2/18-19-20-21-collection_vue_mosaique.html
--- a/integration/v2/18-19-20-21-collection_vue_mosaique.html	Wed Jun 26 16:53:45 2013 +0200
+++ b/integration/v2/18-19-20-21-collection_vue_mosaique.html	Wed Jun 26 18:22:30 2013 +0200
@@ -65,7 +65,7 @@
                             </tbody>
                         </table>
                     </div>
-                     <ul class="list-projets-2 clearfix">
+                     <ul class="list-projets-2 clearfix float-left no-border-bot">
                         <li>
                             <div class="top clearfix">
                                 <img src="img/113x113.png" alt="">
diff -r b98558f8d2c1 -r 39a17b6e0b57 integration/v2/23-collection_geographique.html
--- a/integration/v2/23-collection_geographique.html	Wed Jun 26 16:53:45 2013 +0200
+++ b/integration/v2/23-collection_geographique.html	Wed Jun 26 18:22:30 2013 +0200
@@ -84,7 +84,98 @@
                     <li><a class="open-popin" href="#collection-parameters">paramètres de la collection</a></li>
                 </ul>
             </div>
-            <div style="width:100%; height:400px;" id="map"></div>
+            <div id="map"></div>
+
+             <ul class="list-projets-2 clearfix">
+                <li>
+                    <div class="tools toggle">
+                        <ul class="clearfix">
+                            <li><a title="Partager sur Twitter" class="tool twitter" href="#"></a></li>
+                            <li><a title="Partager sur Facebook" class="tool facebook" href="#"></a></li>
+                            <li><a title="Ajouter à ma collection" class="tool plus" href="#"></a></li>
+                            <li><a title="Créer un fragment" class="tool cut" href="#"></a></li>
+                            <li><a title="Supprimer" class="tool trash" href="#"></a></li>
+                        </ul>
+                    </div>
+                    <div class="fragment">                   
+                        <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+                            <defs>
+                                <clipPath id="fragment-clip68">
+                                    <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+                                </clipPath>
+                            </defs>
+                            <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+                            <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+                        </svg>      
+                    </div><!-- ./fragment -->
+                </li>
+                <li>
+                    <div class="tools toggle">
+                        <ul class="clearfix">
+                            <li><a title="Partager sur Twitter" class="tool twitter" href="#"></a></li>
+                            <li><a title="Partager sur Facebook" class="tool facebook" href="#"></a></li>
+                            <li><a title="Ajouter à ma collection" class="tool plus" href="#"></a></li>
+                            <li><a title="Créer un fragment" class="tool cut" href="#"></a></li>
+                            <li><a title="Supprimer" class="tool trash" href="#"></a></li>
+                        </ul>
+                    </div>
+                    <div class="fragment">                   
+                        <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+                            <defs>
+                                <clipPath id="fragment-clip68">
+                                    <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+                                </clipPath>
+                            </defs>
+                            <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+                            <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+                        </svg>      
+                    </div><!-- ./fragment -->
+                </li>
+                <li>
+                    <div class="tools toggle">
+                        <ul class="clearfix">
+                            <li><a title="Partager sur Twitter" class="tool twitter" href="#"></a></li>
+                            <li><a title="Partager sur Facebook" class="tool facebook" href="#"></a></li>
+                            <li><a title="Ajouter à ma collection" class="tool plus" href="#"></a></li>
+                            <li><a title="Créer un fragment" class="tool cut" href="#"></a></li>
+                            <li><a title="Supprimer" class="tool trash" href="#"></a></li>
+                        </ul>
+                    </div>
+                    <div class="fragment">                   
+                        <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+                            <defs>
+                                <clipPath id="fragment-clip68">
+                                    <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+                                </clipPath>
+                            </defs>
+                            <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+                            <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+                        </svg>      
+                    </div><!-- ./fragment -->
+                </li>
+                <li>
+                    <div class="tools toggle">
+                        <ul class="clearfix">
+                            <li><a title="Partager sur Twitter" class="tool twitter" href="#"></a></li>
+                            <li><a title="Partager sur Facebook" class="tool facebook" href="#"></a></li>
+                            <li><a title="Ajouter à ma collection" class="tool plus" href="#"></a></li>
+                            <li><a title="Créer un fragment" class="tool cut" href="#"></a></li>
+                            <li><a title="Supprimer" class="tool trash" href="#"></a></li>
+                        </ul>
+                    </div>
+                    <div class="fragment">                   
+                        <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+                            <defs>
+                                <clipPath id="fragment-clip68">
+                                    <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+                                </clipPath>
+                            </defs>
+                            <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+                            <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+                        </svg>      
+                    </div><!-- ./fragment -->
+                </li>
+            </ul> 
         </section>
         <footer class="clearfix">
             <h6>EGONOMY est un projet de l’IRI et de la réunion des Musées Nationaux</h6>
diff -r b98558f8d2c1 -r 39a17b6e0b57 integration/v2/css/style.css
--- a/integration/v2/css/style.css	Wed Jun 26 16:53:45 2013 +0200
+++ b/integration/v2/css/style.css	Wed Jun 26 18:22:30 2013 +0200
@@ -106,7 +106,7 @@
 .list-projets-2 .bot p{color: #333; background-color: #fff; font-family: 'Lato';  font-weight: 300; font-style: italic; padding: 8px 14px 0 14px; font-size: 14px; height: 104px; border-bottom: 1px solid #000; border-left: 1px solid #BBB; border-right: 1px solid #BBB;}
 .list-projets-2 .bot{height: 113px;  overflow: hidden;}
 
-li .toggle{display: block;}
+li .toggle{display: none;}
 li:hover .toggle{ display:block; }
 
 .tools{  text-align:right; width:100%; position:absolute; bottom:0; left:0;  background: rgba(255, 255, 255, .85);}
@@ -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 b98558f8d2c1 -r 39a17b6e0b57 integration/v2/js/main.js
--- a/integration/v2/js/main.js	Wed Jun 26 16:53:45 2013 +0200
+++ b/integration/v2/js/main.js	Wed Jun 26 18:22:30 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 b98558f8d2c1 -r 39a17b6e0b57 integration/v2/lib/leaflet/images/marker-icon.png
Binary file integration/v2/lib/leaflet/images/marker-icon.png has changed
diff -r b98558f8d2c1 -r 39a17b6e0b57 integration/v2/lib/leaflet/leaflet.css
--- a/integration/v2/lib/leaflet/leaflet.css	Wed Jun 26 16:53:45 2013 +0200
+++ b/integration/v2/lib/leaflet/leaflet.css	Wed Jun 26 18:22:30 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;