From ef957b485d744cf5adde16a9342906ea8cd7b68c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 27 Feb 2012 15:43:04 +0100 Subject: Correct gpx import --- chimere/templates/chimere/submited.html | 1 + chimere/templates/chimere/upload_file.html | 21 +++++++++------------ chimere/urls.py | 2 ++ chimere/views.py | 7 ++++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/chimere/templates/chimere/submited.html b/chimere/templates/chimere/submited.html index 7288b8d..882f75b 100644 --- a/chimere/templates/chimere/submited.html +++ b/chimere/templates/chimere/submited.html @@ -9,6 +9,7 @@ {% block content %} {{ block.super }}
+ {% trans "Thank you" %}

{% trans "Your proposition has been submited. A moderator will treat your submission shortly. Thanks!" %}

{% endblock %} diff --git a/chimere/templates/chimere/upload_file.html b/chimere/templates/chimere/upload_file.html index deddc86..ba1b7f3 100644 --- a/chimere/templates/chimere/upload_file.html +++ b/chimere/templates/chimere/upload_file.html @@ -1,5 +1,4 @@ -{% load i18n %} - @@ -8,14 +7,8 @@ var media_path = '{{STATIC_URL}}'; var extra_url = "{{extra_url}}"; // --> - {% block extra_head %}{{extra_head|safe}}{% endblock %} - - {% for css_url in JQUERY_CSS_URLS %} - {% endfor %} - {%if css_area%}{%endif%} - {% for js_url in JQUERY_JS_URLS %} - {% endfor %} - {% block head %}{% endblock %} + + {% head_jquery %}
@@ -33,8 +26,9 @@
{% if gpx_id %} {% else %}
diff --git a/chimere/urls.py b/chimere/urls.py index f39d2d8..f4f50d5 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -55,6 +55,8 @@ urlpatterns += patterns('chimere.views', 'redirectFromTinyURN', name="tiny"), url(r'^(?P\w+)?/?upload_file/((?P\w+)/)?$', 'uploadFile', name='upload_file'), + url(r'^(?P\w+)?/?process_route_file/(?P\d+)/$', + 'processRouteFile', name='process_route_file'), ) diff --git a/chimere/views.py b/chimere/views.py index bb3e5b2..ddf7874 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -171,7 +171,8 @@ def uploadFile(request, category_id='', area_name=''): response_dct['errors'] = _(u"Bad file. Please check it with an " u"external software.") response_dct.update({'form':form}) - return render_to_response('upload_file.html', response_dct) + return render_to_response('chimere/upload_file.html', + response_dct) route = Route(name=form.cleaned_data['name'], route=routefile.route, associated_file=routefile, status='S') route.save() @@ -194,8 +195,8 @@ def processRouteFile(request, area_name='', file_id=None): route = route_file.route if not route: return HttpResponse(status=500) - return HttpResponse(simplejson.dumps({'wkt':route, - 'file_id':file_id}), + return HttpResponse('('+simplejson.dumps({'wkt':route, + 'file_id':file_id})+')', 'application/javascript', status=200) except: return HttpResponse(status=500) -- cgit v1.2.3