diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-08 18:47:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-08 18:47:23 +0200 |
| commit | 4cb7d312d9f17a722207624c0f0977b43b5416d2 (patch) | |
| tree | cc37a24c12b871e620ff9eed0335d50caafb0156 | |
| parent | a541275847b3f9b423186269d94b5a33b3ddd9c1 (diff) | |
| download | Chimère-4cb7d312d9f17a722207624c0f0977b43b5416d2.tar.bz2 Chimère-4cb7d312d9f17a722207624c0f0977b43b5416d2.zip | |
Refactoring: nominatim widget -> template
| -rw-r--r-- | chimere/templates/chimere/blocks/nominatim_widget.html | 13 | ||||
| -rw-r--r-- | chimere/widgets.py | 21 |
2 files changed, 18 insertions, 16 deletions
diff --git a/chimere/templates/chimere/blocks/nominatim_widget.html b/chimere/templates/chimere/blocks/nominatim_widget.html new file mode 100644 index 0000000..442ffed --- /dev/null +++ b/chimere/templates/chimere/blocks/nominatim_widget.html @@ -0,0 +1,13 @@ +<input type='hidden' name='nominatim_{{id}}_lat' id='nominatim_{{id}}_lat'/> +<input type='hidden' name='nominatim_{{id}}_lon' id='nominatim_{{id}}_lon'/> +<input type='text' class='nominatim-widget' name='nominatim_{{id}}' id='nominatim_{{id}}' value=""/> +<label class='nominatim-label' id='nominatim_{{id}}_label'> </label> +<script type='text/javascript'> +var default_nominatim_lbl = "{{label}}"; +var nominatim_url = "{{nominatim_url}}"; +$("#nominatim_{{id}}").val(default_nominatim_lbl); +$("#nominatim_{{id}}").click(function(){ + $("#nominatim_{{id}}").val(''); +}); +</script> + diff --git a/chimere/widgets.py b/chimere/widgets.py index 8bed606..b3ec156 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -226,22 +226,11 @@ class NominatimWidget(forms.TextInput): class Media: js = ["%schimere/js/nominatim-widget.js" % settings.STATIC_URL] def render(self, name, value, attrs=None, map_name=''): - tpl = u""" -<input type='hidden' name='nominatim_%(id)s_lat' id='nominatim_%(id)s_lat'/> -<input type='hidden' name='nominatim_%(id)s_lon' id='nominatim_%(id)s_lon'/> -<input type='text' class='nominatim-widget' name='nominatim_%(id)s' id='nominatim_%(id)s' value=""/> -<label class='nominatim-label' id='nominatim_%(id)s_label'> </label> -<script type='text/javascript'> -var default_nominatim_lbl = "%(label)s"; -var nominatim_url = "%(nominatim_url)s"; -$("#nominatim_%(id)s").val(default_nominatim_lbl); -$("#nominatim_%(id)s").click(function(){ - $("#nominatim_%(id)s").val(''); -}); -</script> -""" % {'id':name, 'nominatim_url':settings.NOMINATIM_URL, - 'label':_(u"Street, City, Country")} - return mark_safe(tpl) + return mark_safe( + render_to_string('chimere/blocks/nominatim_widget.html', + {'id':name, 'nominatim_url':settings.NOMINATIM_URL, + 'label':_(u"Street, City, Country")} + )) class PointChooserWidget(forms.TextInput): """ |