Merge branch 'master' into nef2

Conflicts:
	chimere/settings.sample.py

2 files changed, 11 insertions, 4 deletions

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index cf71c28..764e0c7 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -16,6 +16,7 @@ a, a:link, a:visited, legend,
 h2, h3, th, .action li, .action li a,
 .action li li a, #no-js-message,
 #footer a, #footer a:link, #footer a:visited, .ui-widget-header,
+#layer_selection h4,
 #chimere_itinerary td.l{
     color:#fff;
 }
@@ -263,8 +264,14 @@ ul#action-2 {
     width:auto;
 }
 
+#utils-div a{
+    display:block;
+    width:100%;
+}
+
 #areas-div,
-#areas-div label{
+#areas-div label,
+#utils-div a{
     padding:0.3em;
 }
 
@@ -414,8 +421,8 @@ ul.share li{
 #layer_selection{
     position:absolute;
     z-index:100;
-    top:80px;
-    left:200px;
+    top:280px;
+    left:24px;
 }
 
 #layer_selection h4,
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 104e527..2e2d238 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -93,7 +93,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             units: 'm',
             projection: new OpenLayers.Projection('EPSG:4326'),
             theme: null,
-            enable_clustering: true,
+            enable_clustering: false,
             routing: false, // enable routing management
             routing_panel_open: function(){
                                     $('#chimere_itinerary_panel').dialog('open');