diff options
| -rw-r--r-- | chimere/static/chimere/js/edit_route_map.js | 6 | ||||
| -rw-r--r-- | chimere/templates/chimere/upload_file.html | 8 | ||||
| -rw-r--r-- | chimere/views.py | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/chimere/static/chimere/js/edit_route_map.js b/chimere/static/chimere/js/edit_route_map.js index d3ab611..1650983 100644 --- a/chimere/static/chimere/js/edit_route_map.js +++ b/chimere/static/chimere/js/edit_route_map.js @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2011 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +/* Copyright (C) 2008-2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -41,6 +41,10 @@ function toggleDrawOff() { jQuery("#map_edit").chimere("deactivateCurrentControl"); } +function initFeatureFromWkt(wkt) { + jQuery("#map_edit").chimere('initFeatureFromWkt', wkt); +} + function checkFields(){ if (!jQuery("#id_name").val() || !jQuery("#id_categories").val()){ diff --git a/chimere/templates/chimere/upload_file.html b/chimere/templates/chimere/upload_file.html index 7e17563..b0fbafc 100644 --- a/chimere/templates/chimere/upload_file.html +++ b/chimere/templates/chimere/upload_file.html @@ -3,11 +3,6 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>{% block title %}Chimère{% endblock %}</title> - <script type="text/javascript"><!-- - var media_path = '{{MEDIA_URL}}'; - var static_path = '{{STATIC_URL}}'; - var extra_url = "{{extra_url}}"; - // --></script> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css" /> {% head_jquery %} </head> @@ -27,8 +22,7 @@ <div class="fieldWrapper"> {% if gpx_id %} <script type="text/javascript"><!-- - alert("yap2"); - jQuery.get(extra_url + "process_route_file/{{gpx_id}}/", function(data) { + jQuery.get("{% url chimere:process_route_file gpx_id %}", function(data) { var data = eval(data); var main_page = opener.document; jQuery(main_page).find("#id_route").val(data.wkt); diff --git a/chimere/views.py b/chimere/views.py index d33f5a9..2a85c21 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -244,14 +244,14 @@ def uploadFile(request, category_id='', area_name=''): if not category_id: response_dct['gpx_id'] = routefile.pk return render_to_response('chimere/upload_file.html', - response_dct) + response_dct, context_instance=RequestContext(request)) routefile.process() if not routefile.route: response_dct['errors'] = _(u"Bad file. Please check it with an " u"external software.") response_dct.update({'form':form}) return render_to_response('chimere/upload_file.html', - response_dct) + response_dct, context_instance=RequestContext(request)) route = Route(name=form.cleaned_data['name'], route=routefile.route, associated_file=routefile, status='S') route.save() |