diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-02-27 15:43:04 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-02-27 15:43:04 +0100 |
| commit | ef957b485d744cf5adde16a9342906ea8cd7b68c (patch) | |
| tree | 6b4507827f0b5eaf9ac0f60eda4f8767ec51fdb0 | |
| parent | a24ed63d1a1d4965031d5b9670307297165258e3 (diff) | |
| download | Chimère-ef957b485d744cf5adde16a9342906ea8cd7b68c.tar.bz2 Chimère-ef957b485d744cf5adde16a9342906ea8cd7b68c.zip | |
Correct gpx import
| -rw-r--r-- | chimere/templates/chimere/submited.html | 1 | ||||
| -rw-r--r-- | chimere/templates/chimere/upload_file.html | 21 | ||||
| -rw-r--r-- | chimere/urls.py | 2 | ||||
| -rw-r--r-- | 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 }} <fieldset class='edit'> + <legend>{% trans "Thank you" %}</legend> <p>{% trans "Your proposition has been submited. A moderator will treat your submission shortly. Thanks!" %}</p> </fieldset> {% 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 %} -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +{% load i18n chimere_tags %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> @@ -8,14 +7,8 @@ var media_path = '{{STATIC_URL}}'; var extra_url = "{{extra_url}}"; // --></script> - {% block extra_head %}{{extra_head|safe}}{% endblock %} - <link rel="stylesheet" href="{{STATIC_URL}}styles.css" /> - {% for css_url in JQUERY_CSS_URLS %} - <link rel="stylesheet" href="{{ css_url }}" />{% endfor %} - {%if css_area%}<link rel="stylesheet" href="{{STATIC_URL}}{{css_area}}" />{%endif%} - {% for js_url in JQUERY_JS_URLS %} - <script type="text/javascript" src="{{ js_url }}"></script>{% endfor %} - {% block head %}{% endblock %} + <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css" /> + {% head_jquery %} </head> <body class='window'> <div> @@ -33,8 +26,9 @@ <div class="fieldWrapper"> {% if gpx_id %} <script type="text/javascript"><!-- + alert("yap2"); jQuery.get(extra_url + "process_route_file/{{gpx_id}}/", function(data) { - var data = jQuery.parseJSON(data); + var data = eval(data); var main_page = opener.document; jQuery(main_page).find("#id_route").val(data.wkt); jQuery(main_page).find("#id_associated_file_id").val(data.file_id); @@ -46,7 +40,10 @@ opener.toggleDrawOn(); opener.focus(); self.close(); - }); + }).error(function (xhr, ajaxOptions, thrownError){ + alert(xhr.status); + alert(thrownError); + } ); // --></script> {% else %} <form enctype="multipart/form-data" method='post' action='.'> 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<area_name>\w+)?/?upload_file/((?P<category_id>\w+)/)?$', 'uploadFile', name='upload_file'), + url(r'^(?P<area_name>\w+)?/?process_route_file/(?P<file_id>\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) |