summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-13 16:54:40 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-13 16:54:40 +0200
commita6e5edbde8c9053e66898e2d58bc9a2b9191b8e4 (patch)
treeba08e3408a1dd51a15dc1dc733fc808a1f873441
parentcd1a9650099822c94905542f9fd1220afc05c639 (diff)
downloadChimère-a6e5edbde8c9053e66898e2d58bc9a2b9191b8e4.tar.bz2
Chimère-a6e5edbde8c9053e66898e2d58bc9a2b9191b8e4.zip
Add url block to edit pages
-rw-r--r--chimere/templates/chimere/edit_marker.html8
-rw-r--r--chimere/templates/chimere/edit_polygon.html2
-rw-r--r--chimere/templates/chimere/edit_route.html2
-rw-r--r--chimere/widgets.py2
4 files changed, 10 insertions, 4 deletions
diff --git a/chimere/templates/chimere/edit_marker.html b/chimere/templates/chimere/edit_marker.html
index 04dc06c..8ed3320 100644
--- a/chimere/templates/chimere/edit_marker.html
+++ b/chimere/templates/chimere/edit_marker.html
@@ -1,11 +1,13 @@
{% extends "chimere/edit.html" %}
{% load i18n chimere_tags inline_formset%}
-{% block legend %}<legend>{% if is_modification %}{% trans "Modify a point of interest" %}{% else %}{% trans "Add a point of interest" %}{% endif %}</legend>{% endblock %}
+{% block legend %}<h3>{% if is_modification %}{% trans "Modify a point of interest" %}{% else %}{% trans "Add a point of interest" %}{% endif %}</h3>{% endblock %}
+
+{% block edit_url %}{% url "editmarker" %}{% endblock %}
{% block geometry %}
<label for="id_point">{% trans "Point"%} *</label>
-{%if form.point.errors %}<ul class="errorlist"><li>{% trans "Select a location for this new site" %}</li></ul>{%endif%}
-{{point_widget}}
+{% if form.point.errors %}<ul class="errorlist"><li>{% trans "Select a location for this new site" %}</li></ul>{%endif%}
+{{ point_widget }}
{% endblock %}
diff --git a/chimere/templates/chimere/edit_polygon.html b/chimere/templates/chimere/edit_polygon.html
index d291859..5c6970a 100644
--- a/chimere/templates/chimere/edit_polygon.html
+++ b/chimere/templates/chimere/edit_polygon.html
@@ -5,6 +5,8 @@
<legend>{% if is_modification %}{% trans "Modify a polygon" %}{% else %}{% trans "Add a polygon" %}{% endif %}</legend>
{% endblock %}
+{% block edit_url %}{% url "editpolygon" %}{% endblock %}
+
{% block geometry %}
<label for="id_polygon">{% trans "Polygon"%} *</label>
{%if form.polygon.errors %}<ul class="errorlist"><li>{% trans "Draw the associated polygon" %}</li></ul>{%endif%}
diff --git a/chimere/templates/chimere/edit_route.html b/chimere/templates/chimere/edit_route.html
index e5a7293..9042954 100644
--- a/chimere/templates/chimere/edit_route.html
+++ b/chimere/templates/chimere/edit_route.html
@@ -5,6 +5,8 @@
<legend>{% if is_modification %}{% trans "Modify a route" %}{% else %}{% trans "Add a route" %}{% endif %}</legend>
{% endblock %}
+{% block edit_url %}{% url "editroute" %}{% endblock %}
+
{% block geometry %}
<label for="id_route">{% trans "Route"%} *</label>
{%if form.route.errors %}<ul class="errorlist"><li>{% trans "Draw the associated route" %}</li></ul>{%endif%}
diff --git a/chimere/widgets.py b/chimere/widgets.py
index 93cefa7..c184eb1 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -140,7 +140,7 @@ class ChosenSelectWidget(forms.Select):
kwargs['attrs'].update({'class': 'chzn-select'})
rendered = super(ChosenSelectWidget, self).render(*args, **kwargs)
rendered += "\n<script type='text/javascript'>\n"\
- " $('#%s').chosen();\n"\
+ "$(function(){ $('#%s').chosen(); });\n"\
"</script>\n" % kwargs['attrs']['id']
return mark_safe(rendered)