{% trans "Connect your OpenID with your account on this site" %}
-
+
{% blocktrans %}register new {{provider}} account info{% endblocktrans %}
{% trans "This account already exists, please use another." %}
-
+
{% if form1.errors %}
-
- {% trans "Sorry, looks like we have some errors:" %}
+
+ {% trans "Sorry, looks like we have some errors:" %}
{% if form1.username.errors %}
{{ form1.username.errors|join:", " }}
@@ -25,11 +25,11 @@
{{ form1.email.errors|join:", " }}
{% endif %}
-
+
{% endif %}
{% if form2.errors %}
-
- {% trans "Sorry, looks like we have some errors:" %}
+
+ {% trans "Sorry, looks like we have some errors:" %}
{% if form2.username.errors %}
{{ form2.username.errors|join:", " }}
@@ -38,15 +38,15 @@
{{ form2.password.errors|join:", " }}
{% endif %}
-
+
{% endif %}
@@ -54,11 +54,11 @@
{{ form.next }}
--
cgit v1.2.3-1-g7c22
From 7e4f1d542e00b4d3121da6ae5524e95867f2371b Mon Sep 17 00:00:00 2001
From: root
Date: Fri, 13 Nov 2009 20:18:55 -0500
Subject: better comments, email subscriptions, corrected view counter, some
ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on
arbitrary url prefix, english language improvements, added feedback form,
versioned css and js files to force browser cache reload when
settings.RESOURCE_REVISION is incremented , other fixes
---
templates/authopenid/complete.html | 82 ++++++++++++++++++++++++++++++--------
1 file changed, 65 insertions(+), 17 deletions(-)
(limited to 'templates/authopenid/complete.html')
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index f29b7670..9a94c3c4 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -1,5 +1,19 @@
{% extends "base_content.html" %}
+{% comment %}
+views calling this template:
+* django_authopenid.views.register with login_type='openid'
+* django_authopenid.views.signin - with login_type='legacy'
+
+parameters:
+* provider
+* login_type openid|legacy
+* username (same as screen name or username in the models, and nickname in openid sreg)
+* form1 - OpenidRegisterForm
+* form2 - OpenidVerifyForm not clear what this form is supposed to do, not used for legacy
+* email_feeds_form forum.forms.EditUserEmailFeedsForm
+* openid_username_exists
+{% endcomment %}
{% load i18n %}
{% block head %}{% endblock %}
{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
@@ -9,25 +23,34 @@
- {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
+ {% ifequal login_type 'openid' %}
+ {% blocktrans %}register new {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
+ {% else %}
+ {% ifequal login_type 'legacy' %}
+ {% if external_login_name_is_taken %}
+ {% blocktrans %}{{username}} already exists, choose another name for
+ {{provider}}. Email is required too, see {{gravatar_faq_url}}
+ {% endblocktrans %}
+ {% else %}
+ {% blocktrans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
+ {% endif %}
+ {% endifequal %}
+ {% endifequal %}
{% trans "This account already exists, please use another." %}
{% if form1.errors %}
-
- {% trans "Sorry, looks like we have some errors:" %}
-
- {% if form1.username.errors %}
-
{{ form1.username.errors|join:", " }}
- {% endif %}
- {% if form1.email.errors %}
-
{{ form1.email.errors|join:", " }}
- {% endif %}
+
+ {% if form1.non_field_errors %}
+ {% for error in form1.non_field_errors %}
+
{{error}}
+ {% endfor %}
+ {% endif %}
-
{% endif %}
- {% if form2.errors %}
+ {% comment %}
+ {% if form2.errors %}
{% trans "Sorry, looks like we have some errors:" %}
@@ -40,29 +63,54 @@
{% endif %}
+ {% endcomment %}
+ {% ifequal login_type 'openid' %}
+ {% comment %}
+ {% if form2 %}
+ {% endif %}
+ {% endcomment %}
{% endblock %}
--
cgit v1.2.3-1-g7c22
From ebb0f636ae8f7db4e7a2e7470e449af3d96b15c0 Mon Sep 17 00:00:00 2001
From: root
Date: Fri, 13 Nov 2009 20:18:55 -0500
Subject: better comments, email subscriptions, corrected view counter, some
ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on
arbitrary url prefix, english language improvements, added feedback form,
versioned css and js files to force browser cache reload when
settings.RESOURCE_REVISION is incremented , other fixes
---
templates/authopenid/complete.html | 82 ++++++++++++++++++++++++++++++--------
1 file changed, 65 insertions(+), 17 deletions(-)
(limited to 'templates/authopenid/complete.html')
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index f29b7670..9a94c3c4 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -1,5 +1,19 @@
{% extends "base_content.html" %}
+{% comment %}
+views calling this template:
+* django_authopenid.views.register with login_type='openid'
+* django_authopenid.views.signin - with login_type='legacy'
+
+parameters:
+* provider
+* login_type openid|legacy
+* username (same as screen name or username in the models, and nickname in openid sreg)
+* form1 - OpenidRegisterForm
+* form2 - OpenidVerifyForm not clear what this form is supposed to do, not used for legacy
+* email_feeds_form forum.forms.EditUserEmailFeedsForm
+* openid_username_exists
+{% endcomment %}
{% load i18n %}
{% block head %}{% endblock %}
{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
@@ -9,25 +23,34 @@
- {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
+ {% ifequal login_type 'openid' %}
+ {% blocktrans %}register new {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
+ {% else %}
+ {% ifequal login_type 'legacy' %}
+ {% if external_login_name_is_taken %}
+ {% blocktrans %}{{username}} already exists, choose another name for
+ {{provider}}. Email is required too, see {{gravatar_faq_url}}
+ {% endblocktrans %}
+ {% else %}
+ {% blocktrans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
+ {% endif %}
+ {% endifequal %}
+ {% endifequal %}
{% trans "This account already exists, please use another." %}
{% if form1.errors %}
-
- {% trans "Sorry, looks like we have some errors:" %}
-
- {% if form1.username.errors %}
-
{{ form1.username.errors|join:", " }}
- {% endif %}
- {% if form1.email.errors %}
-
{{ form1.email.errors|join:", " }}
- {% endif %}
+
+ {% if form1.non_field_errors %}
+ {% for error in form1.non_field_errors %}
+
{{error}}
+ {% endfor %}
+ {% endif %}
-
{% endif %}
- {% if form2.errors %}
+ {% comment %}
+ {% if form2.errors %}
{% trans "Sorry, looks like we have some errors:" %}