summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-04-01 17:41:12 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-04-01 17:41:12 +0200
commit65bd0743a2ef44a638950f5c5cca4efa702bd89f (patch)
tree7c11f496a55880e8ab54c21caf040e30ed932eaa
parent962207cbc4d44360e2f321c3820b2af35269ae54 (diff)
downloadChimère-65bd0743a2ef44a638950f5c5cca4efa702bd89f.tar.bz2
Chimère-65bd0743a2ef44a638950f5c5cca4efa702bd89f.zip
Fix templates and disable by default clustering
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js2
-rw-r--r--chimere/templates/chimere/blocks/categories.html2
-rw-r--r--chimere/templates/chimere/detail.html1
3 files changed, 2 insertions, 3 deletions
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');
diff --git a/chimere/templates/chimere/blocks/categories.html b/chimere/templates/chimere/blocks/categories.html
index d87fe4d..c273ae4 100644
--- a/chimere/templates/chimere/blocks/categories.html
+++ b/chimere/templates/chimere/blocks/categories.html
@@ -27,5 +27,5 @@
<li id='display_submited'>
<input type='checkbox' name='display_submited' id='display_submited_check'/> {% trans "Display markers and routes waiting for validation"%}
</li>
- {% endfor %}
+ {% endif %}
</ul>
diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index 4b5c168..ed0ea5c 100644
--- a/chimere/templates/chimere/detail.html
+++ b/chimere/templates/chimere/detail.html
@@ -36,7 +36,6 @@
{% trans "Propose amendment" %}
</a>{%endif%}
{% share_bar marker.name %}
-{% endif %}
</div>
{% if marker.multimedia_items %}
<div id='gallery-{{time_now}}' class='gallery'>