Login/Logout and FlyWheel API link in HTML emitter - Add templates, quote next…

Login/Logout and FlyWheel API link in HTML emitter - Add templates, quote next value, only use login/logout if settings.LOGIN_URL and settings.LOGOUT_URL are in urlconf

Login/Logout and FlyWheel API link in HTML emitter - Add templates, quote next…
Login/Logout and FlyWheel API link in HTML emitter - Add templates, quote next value, only use login/logout if settings.LOGIN_URL and settings.LOGOUT_URL are in urlconf
e9168b50 · tom christie tom@tomchristie.com · 216baa55 · e9168b50 · e9168b50 · e9168b50
Commit e9168b50 authored Jan 27, 2011 by tom christie tom@tomchristie.com
Showing with 42 additions and 6 deletions

examples/templates/base.html
+8 -0

examples/templates/registration/login.html
+27 -0

flywheel/emitters.py
+4 -3

flywheel/templates/emitter.html
+2 -2

flywheel/templatetags/urlize_quoted_links.py
+1 -1

No files found.
--- a/examples/templates/base.html
+++ b/examples/templates/base.html
+<html>
+  <head>
+  </head>
+  <body>
+{% block content %}{% endblock %}
+  </body>
+</html>
\ No newline at end of file
--- a/examples/templates/registration/login.html
+++ b/examples/templates/registration/login.html
+{% extends "base.html" %}
+{% block content %}
+{% if form.errors %}
+<p>Your username and password didn't match. Please try again.</p>
+{% endif %}
+<form method="post" action="{% url django.contrib.auth.views.login %}">
+{% csrf_token %}
+<table>
+<tr>
+    <td>{{ form.username.label_tag }}</td>
+    <td>{{ form.username }}</td>
+</tr>
+<tr>
+    <td>{{ form.password.label_tag }}</td>
+    <td>{{ form.password }}</td>
+</tr>
+</table>
+<input type="submit" value="login" />
+<input type="hidden" name="next" value="{{ next }}" />
+</form>
+{% endblock %}
\ No newline at end of file
--- a/flywheel/emitters.py
+++ b/flywheel/emitters.py
@@ -3,8 +3,9 @@ from django.template import RequestContext, loader
 from django import forms
 from flywheel.response import NoContent
+from flywheel.utils import dict2xml, url_resolves
-from utils import dict2xml, url_resolves
+from urllib import quote_plus
 import string
 try:
    import json
@@ -121,8 +122,8 @@ class DocumentingTemplateEmitter(BaseEmitter):
        form_instance = self._get_form_instance(self.resource)
        if url_resolves(settings.LOGIN_URL) and url_resolves(settings.LOGOUT_URL):
-            login_url = "%s?next=%s" % (settings.LOGIN_URL, self.resource.request.path)
+            login_url = "%s?next=%s" % (settings.LOGIN_URL, quote_plus(self.resource.request.path))
-            logout_url = "%s?next=%s" % (settings.LOGOUT_URL, self.resource.request.path)
+            logout_url = "%s?next=%s" % (settings.LOGOUT_URL, quote_plus(self.resource.request.path))
        else:
            login_url = None
            logout_url = None

--- a/flywheel/templates/emitter.html
+++ b/flywheel/templates/emitter.html
@@ -36,11 +36,11 @@
 	{% if 'GET' in resource.allowed_methods %}
 		<div class='action'>
-			<a href='{{ request.path }}'>GET</a>
+			<a href='{{ request.path }}' rel="nofollow">GET</a>
 			<ul class="accepttypes">
 			{% for media_type in resource.emitted_media_types %}
 			  {% with resource.ACCEPT_QUERY_PARAM|add:"="|add:media_type as param %}
-			    <li>[<a href='{{ request.path|add_query_param:param }}'>{{ media_type }}</a>]</li>
+			    <li>[<a href='{{ request.path|add_query_param:param }} rel="nofollow"'>{{ media_type }}</a>]</li>
 			  {% endwith %}
 			{% endfor %}
 			</ul>

--- a/flywheel/templatetags/urlize_quoted_links.py
+++ b/flywheel/templatetags/urlize_quoted_links.py
@@ -33,7 +33,7 @@ html_gunk_re = re.compile(r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<st
 hard_coded_bullets_re = re.compile(r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join([re.escape(x) for x in DOTS]), re.DOTALL)
 trailing_empty_content_re = re.compile(r'(?:<p>(?:&nbsp;|\s|<br \/>)*?</p>\s*)+\Z')
-def urlize_quoted_links(text, trim_url_limit=None, nofollow=False, autoescape=True):
+def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=True):
    """
    Converts any URLs in text into clickable links.