diff options
Diffstat (limited to 'chimere/main/views.py')
| -rw-r--r-- | chimere/main/views.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/chimere/main/views.py b/chimere/main/views.py index f065f2c..f8c93dc 100644 --- a/chimere/main/views.py +++ b/chimere/main/views.py @@ -29,6 +29,7 @@ from django.shortcuts import render_to_response from django.template import loader from django.http import HttpResponseRedirect, HttpResponse from django.core import serializers +from django.utils.http import urlquote from chimere import settings from chimere.main.actions import actions @@ -239,6 +240,10 @@ def getDetail(request, marker_id): return HttpResponse('no results') response_dct = get_base_response() response_dct['marker'] = marker + response_dct['share_networks'] = settings.SHARE_NETWORKS + if request.method == 'GET': + if 'simple' in request.GET and request.GET['simple']: + response_dct['simple'] = True return render_to_response('detail.html', response_dct) def getDescriptionDetail(request, category_id): @@ -336,7 +341,16 @@ def getTinyfiedUrl(request, area_name='', parameters=''): if url[-1] == '/': url = url[:-1] url += response_dct['extra_url'] + 'ty/' + urn - data = '{"urn": "%s", "url":"%s"}' % (urn, url) + text = settings.PROJECT_NAME + if 'current_feature' in parameters: + for item in parameters.split('&'): + if 'current_feature' in item: + try: + text = unicode(Marker.objects.get(id=item.split('=')[1])) + except (IndexError, Marker.DoesNotExist): + pass + data = '{"urn": "%s", "url":"%s", "text":"%s"}' % (urlquote(urn), + urlquote(url), urlquote(text)) return HttpResponse(data) def redirectFromTinyURN(request, area_name='', tiny_urn=''): |