Merge lp:~ricardokirkner/django-openid-auth/django15-compatible-url into lp:~django-openid-auth/django-openid-auth/trunk

Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 104
Merged at revision: 104
Proposed branch: lp:~ricardokirkner/django-openid-auth/django15-compatible-url
Merge into: lp:~django-openid-auth/django-openid-auth/trunk
Diff against target: 17 lines (+2/-1)
1 file modified
django_openid_auth/templates/openid/login.html (+2/-1)
To merge this branch: bzr merge lp:~ricardokirkner/django-openid-auth/django15-compatible-url
Reviewer Review Type Date Requested Status
Ricardo Kirkner Approve
Matias Bordese (community) Approve
Review via email: mp+171141@code.launchpad.net

Commit message

use future-proof url tag syntax

Description of the change

This branch makes the template compatible with django 1.3+

To post a comment you must log in.
Revision history for this message
Matias Bordese (matiasb) wrote :

LGTM

review: Approve
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

Rubber-stamping.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'django_openid_auth/templates/openid/login.html'
2--- django_openid_auth/templates/openid/login.html 2010-07-16 08:32:28 +0000
3+++ django_openid_auth/templates/openid/login.html 2013-06-24 17:35:39 +0000
4@@ -1,11 +1,12 @@
5 {% load i18n %}
6+{% load url from future %}
7 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
8 <html>
9 <head>
10 <title>Sign in with your OpenID</title>
11 <style type="text/css">
12 input.openid {
13- background: url({% url openid-logo %}) no-repeat;
14+ background: url({% url 'openid-logo' %}) no-repeat;
15 background-position: 0 50%;
16 padding-left: 16px;
17 }

Subscribers

People subscribed via source and target branches