Merge remote-tracking branch 'upstream/master'

geodiversite · Jun 29, 2013 · faf0132 · faf0132
2 parents 09bf6ce + 37d2465
commit faf0132
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/geodiversite/content/carte.html b/geodiversite/content/carte.html
@@ -38,7 +38,7 @@
 				loadData: (#GET{kml}|?{false,true}),]
 				default_layer: '[(#REM|gis_layer_defaut)]',
 				affiche_layers: [(#CONFIG{gis/layers,#ARRAY}|json_encode)],
-				dataUrl: "#PRODUIRE{fond=geol_markers.json,id_auteur=#ENV{id_auteur},id_mot=#ENV{id_mot},id_rubrique=#ENV{id_rubrique},recherche=#ENV{recherche}}",
+				dataUrl: "#PRODUIRE{fond=geol_markers.json,id_auteur=#ENV{id_auteur},id_mot=#ENV{id_mot},id_rubrique=#ENV{id_rubrique},recherche=#ENV{recherche}}"
 			});
 
 			[(#GET{kml}|oui)
@@ -107,13 +107,8 @@
 
 		// init de la carte
 		$.getScript('[(#PRODUIRE{fond=javascript/gis.js,cluster=oui})]', function(){
-			if ($.browser.msie) {
-				$(window).load(initMap);
-				resizeMap();
-			} else {
-				resizeMap();
-				initMap();
-			};
+			resizeMap();
+			initMap();
 		});
 
 		// window resize ?

diff --git a/geodiversite/embed/carte.html b/geodiversite/embed/carte.html
@@ -43,7 +43,7 @@
 						layersControlOptions: {position: 'topright', collapsed: true},
 						default_layer: '[(#REM|gis_layer_defaut)]',
 						affiche_layers: [(#CONFIG{gis/layers,#ARRAY}|json_encode)],
-						dataUrl: "#PRODUIRE{fond=geol_markers.json,id_auteur=#ENV{id_auteur},id_mot=#ENV{id_mot},id_rubrique=#ENV{id_rubrique}}",
+						dataUrl: "#PRODUIRE{fond=geol_markers.json,id_auteur=#ENV{id_auteur},id_mot=#ENV{id_mot},id_rubrique=#ENV{id_rubrique}}"
 					});
 				});
 			})

diff --git a/geodiversite/geol.css.html b/geodiversite/geol.css.html
@@ -468,13 +468,13 @@
 body .crayon-html .editer_logo h3.legend { font-size: 1em; }
 body .crayon-html .editer_logo div.choix,
 body .crayon-html .editer_logo input.file { display: inline; }
-body .crayon-html .crayon-boutons { float: none; position: static; width: auto; margin-top: 10px; bottom: 10px; text-align: right; }
-body .crayon-html .crayon-boutons button { width: auto; height: 32px; margin-bottom: 0; text-indent: 0;
+body .crayon-html .small .crayon-boutons { float: none; position: static; width: auto; margin-top: 10px; bottom: 10px; text-align: right; }
+body .crayon-html .small .crayon-boutons button { width: auto; height: 32px; padding: 0; margin-bottom: 0; text-indent: 0;
 	cursor: pointer; background: #f2f2f2; color: #666; border: 4px solid #fff;
 	-moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px;
 	-moz-box-shadow: 0 1px 3px #999; -webkit-box-shadow: 0 1px 3px #999; box-shadow: 0 1px 3px #999; }
-body .crayon-html .crayon-boutons button:hover { color: #GET{couleur1}; }
-body .crayon-html .crayon-boutons .crayon-submit { font-weight: bold; margin-left: 15px; }
+body .crayon-html .small .crayon-boutons button:hover { color: #GET{couleur1}; }
+body .crayon-html .small .crayon-boutons .crayon-submit { font-weight: bold; margin-left: 15px; }
 body .resizehandle_boutons { margin-top: 0; }
 
 /* fausse modale pour certains formulaires */

diff --git a/geodiversite/javascript/leaflet.geodiv.js.html b/geodiversite/javascript/leaflet.geodiv.js.html
@@ -97,7 +97,7 @@
 					marker.setIcon(new L.Icon({
 						iconUrl: item.properties.icon,
 						iconSize: new L.Point(32,32),
-						iconAnchor: new L.Point(16,16),
+						iconAnchor: new L.Point(16,16)
 					}));
 				}
 				marker.id = item.id;