From 3c4c71fc19865bfb75231c425fae31c6b2c211de Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 9 Feb 2010 16:48:38 -0500 Subject: started working towards skinning forum app - first step - move templates to app --- templates/authopenid/changeemail.html | 88 ---------- templates/authopenid/changeopenid.html | 35 ---- templates/authopenid/changepw.html | 18 -- templates/authopenid/complete.html | 130 -------------- templates/authopenid/confirm_email.txt | 13 -- templates/authopenid/delete.html | 39 ----- templates/authopenid/email_validation.txt | 15 -- .../authopenid/external_legacy_login_info.html | 15 -- templates/authopenid/failure.html | 14 -- templates/authopenid/sendpw.html | 26 --- templates/authopenid/sendpw_email.txt | 9 - templates/authopenid/settings.html | 43 ----- templates/authopenid/signin.html | 186 --------------------- templates/authopenid/signup.html | 32 ---- templates/authopenid/yadis.xrdf | 14 -- 15 files changed, 677 deletions(-) delete mode 100644 templates/authopenid/changeemail.html delete mode 100644 templates/authopenid/changeopenid.html delete mode 100644 templates/authopenid/changepw.html delete mode 100644 templates/authopenid/complete.html delete mode 100644 templates/authopenid/confirm_email.txt delete mode 100644 templates/authopenid/delete.html delete mode 100644 templates/authopenid/email_validation.txt delete mode 100644 templates/authopenid/external_legacy_login_info.html delete mode 100644 templates/authopenid/failure.html delete mode 100644 templates/authopenid/sendpw.html delete mode 100644 templates/authopenid/sendpw_email.txt delete mode 100644 templates/authopenid/settings.html delete mode 100755 templates/authopenid/signin.html delete mode 100644 templates/authopenid/signup.html delete mode 100644 templates/authopenid/yadis.xrdf (limited to 'templates/authopenid') diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html deleted file mode 100644 index 94d1881c..00000000 --- a/templates/authopenid/changeemail.html +++ /dev/null @@ -1,88 +0,0 @@ -{% extends "base_content.html" %} -{% load i18n %} -{% block title %}{% spaceless %}{% trans "Change email" %}{% endspaceless %}{% endblock %} -{% block content %} - -{% ifequal action_type "change" %} -

- {% if user.email %} - {% trans "Change email" %} - {% else %} - {% trans "Save your email address" %} - {% endif %} -

- {% if user.email %} - {% blocktrans %}change {{email}} info{% endblocktrans %} - {% else %} - {% blocktrans %}here is why email is required, see {{gravatar_faq_url}}{% endblocktrans %} - {% endif %} -

- {% if msg %} -

- {% endif %} - -

- -

-{% endifequal %} -{% ifequal action_type "validate" %} -

- {% trans "Validate email" %} -

- {% blocktrans %}validate {{email}} info or go to {{change_email_url}}{% endblocktrans %} -

-{% endifequal %} -{% ifequal action_type "keep" %} -

- {% trans "Email not changed" %} -

- {% blocktrans %}old {{email}} kept, if you like go to {{change_email_url}}{% endblocktrans %} -

-{% endifequal %} -{% ifequal action_type "done_novalidate" %} -

- {% trans "Email changed" %} -

- {% blocktrans %}your current {{email}} can be used for this{% endblocktrans %} -

-{% endifequal %} -{% ifequal action_type "validation_complete" %} -

- {% trans "Email verified" %} -

- {% trans "thanks for verifying email" %} -

-{% endifequal %} -{% ifequal action_type "key_not_sent" %} -

- {% trans "email key not sent" %} -

- {% blocktrans %}email key not sent {{email}} change email here {{change_link}}{% endblocktrans %} -

-{% endifequal %} -{% endblock %} - diff --git a/templates/authopenid/changeopenid.html b/templates/authopenid/changeopenid.html deleted file mode 100644 index d01788fb..00000000 --- a/templates/authopenid/changeopenid.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "base.html" %} - -{% load i18n %} -{% block title %}{% spaceless %}{% trans "Change OpenID" %}{% endspaceless %}{% endblock %} -{% block content %} -

- {% trans "Account: change OpenID URL" %} -

- -

{% blocktrans %}This is where you can change your OpenID URL. Make sure you remember it!{% endblocktrans %}

-{% if form.errors %} -

{% trans "Please correct errors below:" %}
- {% if form.openid_url.errors %} - {{ form.openid_url.errors|join:", " }} - {% endif %} - - -

-{% endif %} -{% if msg %} -

-{% endif %} - -

- -

-{% endblock %} - diff --git a/templates/authopenid/changepw.html b/templates/authopenid/changepw.html deleted file mode 100644 index 8b059544..00000000 --- a/templates/authopenid/changepw.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base.html" %} - -{% load i18n %} -{% block head %}{% endblock %} -{% block title %}{% spaceless %}{% trans "Change password" %}{% endspaceless %}{% endblock %} -{% block content %} -

{% trans "Account: change password" %}

{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}

- -

-{% endblock %} - diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html deleted file mode 100644 index 62970e38..00000000 --- a/templates/authopenid/complete.html +++ /dev/null @@ -1,130 +0,0 @@ -{% 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.SimpleEmailSubscribeForm -* openid_username_exists -{% endcomment %} -{% load i18n %} -{% block head %}{% endblock %} -{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %} -{% block content %} -

- {% trans "Connect your OpenID with your account on this site" %} -

- {% 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 %} - {% else %} - {% blocktrans %}register new Facebook connect account info, see {{gravatar_faq_url}}{% endblocktrans %} - {% endifequal %} - {% endifequal %} -

- -

- - {% if form1.errors %} -

{{error}}

- {% endif %} - {% comment %} - {% if form2.errors %} -

- {% trans "Sorry, looks like we have some errors:" %}
-

{{ form2.username.errors|join:", " }}
{{ form2.password.errors|join:", " }}

- {% endif %} - {% endcomment %} - -

- {% ifequal login_type 'openid' %} -

- {% else %} - {% ifequal login_type 'facebook' %} - - {% else %} - - {% endifequal %} - {% endifequal %} - {{ form1.next }} -

- {% trans "Screen name label" %} - {% if form1.username.errors %} -

- {% endif %} - {{ form1.username }} -

- {% trans "Email address label" %} - {% if form1.email.errors %} -

- {% endif %} - {{ form1.email }} -

{% trans "receive updates motivational blurb" %}

- -

{% trans "Tag filter tool will be your right panel, once you log in." %}

- {% comment %} - {% if form2 %} - - {% endif %} - {% endcomment %} -{% endblock %} - diff --git a/templates/authopenid/confirm_email.txt b/templates/authopenid/confirm_email.txt deleted file mode 100644 index 3a01f146..00000000 --- a/templates/authopenid/confirm_email.txt +++ /dev/null @@ -1,13 +0,0 @@ -{% load i18n %} -{% trans "Thank you for registering at our Q&A forum!" %} - -{% trans "Your account details are:" %} - -{% trans "Username:" %} {{ username }} -{% trans "Password:" %} {{ password }} - -{% trans "Please sign in here:" %} -{{signup_url}} - -{% blocktrans %}Sincerely, -Forum Administrator{% endblocktrans %} diff --git a/templates/authopenid/delete.html b/templates/authopenid/delete.html deleted file mode 100644 index 0f9f1c60..00000000 --- a/templates/authopenid/delete.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "base.html" %} - -{% load i18n %} -{% block title %}{% spaceless %}{% trans "Delete account" %}{% endspaceless %}{% endblock %} -{% block content %} -

- {% trans "Account: delete account" %} -

- -

{% blocktrans %}Note: After deleting your account, anyone will be able to register this username.{% endblocktrans %}

-{% if form.errors %} -

{% trans "Please correct errors below:" %}
- {% if form.confirm.errors %} - {% trans "Check confirm box, if you want delete your account." %}
- {% endif %} - {% if form.password.errors %} - {% trans "Password:" %} {{ form.password.errors|join:", " }} - {% endif %} -

-{% endif %} -{% if msg %} -

{% trans "Please correct errors below:" %}
- {{ msg }} -

-{% endif %} -

- -

-{% endblock %} - diff --git a/templates/authopenid/email_validation.txt b/templates/authopenid/email_validation.txt deleted file mode 100644 index 5b166a9b..00000000 --- a/templates/authopenid/email_validation.txt +++ /dev/null @@ -1,15 +0,0 @@ -{% load i18n %} -{% trans "Greetings from the Q&A forum" %}, - -{% trans "To make use of the Forum, please follow the link below:" %} - -{{validation_link}} - -{% trans "Following the link above will help us verify your email address." %} - -{% blocktrans %}If you beleive that this message was sent in mistake - -no further action is needed. Just ingore this email, we apologize -for any inconvenience{% endblocktrans %} - -{% blocktrans %}Sincerely, -Forum Administrator{% endblocktrans %} diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html deleted file mode 100644 index 3318499c..00000000 --- a/templates/authopenid/external_legacy_login_info.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "base_content.html" %} - -{% load i18n %} -{% block title %}{% spaceless %}{% trans "Traditional login information" %}{% endspaceless %}{% endblock %} -{% block content %} -

- {% trans "Traditional login information" %} -

-{% spaceless %} -

- -{% blocktrans %}how to login with password through external login website or use {{feedback_url}}{% endblocktrans %} -

-{% endspaceless %} -{% endblock %} diff --git a/templates/authopenid/failure.html b/templates/authopenid/failure.html deleted file mode 100644 index d075d6b0..00000000 --- a/templates/authopenid/failure.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - OpenID failed - - -

OpenID failed

- -

- - - diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html deleted file mode 100644 index 6241c811..00000000 --- a/templates/authopenid/sendpw.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "base.html" %} - -{% load i18n %} -{% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %} -{% block content %} -

- {% trans "Send new password" %} -

-{% trans "password recovery information" %} -

-{% if msg %} -

-{% endif %} - -

- -

-{% endblock %} - diff --git a/templates/authopenid/sendpw_email.txt b/templates/authopenid/sendpw_email.txt deleted file mode 100644 index f044ca45..00000000 --- a/templates/authopenid/sendpw_email.txt +++ /dev/null @@ -1,9 +0,0 @@ -{% load i18n %} -{% blocktrans%}Someone has requested to reset your password on {{site_url}}. -If it were not you, it is safe to ignore this email.{% endblocktrans %} - -{% blocktrans %}email explanation how to use new {{password}} for {{username}} -with the {{key_link}}{% endblocktrans %} - -{% blocktrans %}Sincerely, -Forum Administrator{% endblocktrans %} diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html deleted file mode 100644 index 66ea5953..00000000 --- a/templates/authopenid/settings.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "base_content.html" %} - -{% load i18n %} -{% block title %}{% spaceless %}{% trans "Account functions" %}{% endspaceless %}{% endblock %} -{% block head %} - -{% endblock %} - -{% block content %} -

{{ request.user.username }} {% trans "Profile" %}

- {% if msg %} -

- {% endif %} - -

» {% trans "Change password" %}: {% trans "Give your account a new password." %}
» {% trans "Change email " %}: {% trans "Add or update the email address associated with your account." %}
» {% trans "Change OpenID" %}: {% trans "Change openid associated to your account" %}
» {% trans "Delete account" %}: {% trans "Erase your username and all your data from website" %}

-{% endblock %} - diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html deleted file mode 100755 index aacdd490..00000000 --- a/templates/authopenid/signin.html +++ /dev/null @@ -1,186 +0,0 @@ -{% extends "base.html" %} - -{% load i18n %} -{% load extra_tags %} -{% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %} -{% block forejs %} - - - - - - -{% endblock %} -{% block content %} -

- {% trans "User login" %} -

- {% if msg %} -

- {% endif %} - {% if answer %} -

- {% blocktrans with answer.question.title as title and answer.summary as summary %} - Your answer to {{title}} {{summary}} will be posted once you log in - {% endblocktrans %} -

- {% endif %} - {% if question %} -

- {% blocktrans with question.title as title and question.summary as summary %}Your question - {{title}} {{summary}} will be posted once you log in - {% endblocktrans %} -

- {% endif %} -

- {% trans "Click to sign in through any of these services." %} -

-
- -
- -
-
- https://www.google.com/accounts/o8/id -
-
-
- http://yahoo.com/ -
-
-
- http://openid.aol.com/username -
-

- {% if question %} - - {% else %} - {% if answer %} - - {% else %} - - {% endif %} - {% endif %} -
- - http://{your-openid-url} -
- - http://username.myopenid.com/ -
- - http://flickr.com/username/ -
- - http://technorati.com/people/technorati/username/ -
- - http://username.wordpress.com -
- - http://username.blogspot.com/ -
- - http://username.livejournal.com -
- - http://claimid.com/username -
- - http://username.myvidoop.com/ -
- - http://username.pip.verisignlabs.com/ -

- {{ form2.next }} -

{% trans 'Enter your Provider user name' %}

- - -

{% trans 'Enter your OpenID web address' %}

{% trans 'Enter your login name and password' %}

- {% if form1.errors %} - {{form1.non_field_errors.as_ul}} - {% endif %} -

- -

- - {% trans "Create account" %}
- {% trans "Forgot your password?" %} -

-{% endblock %} - -{% block sidebar %} -

{% trans "Why use OpenID?" %}

- {% trans "with openid it is easier" %} -
- {% trans "reuse openid" %} -
- {% trans "openid is widely adopted" %} -
- {% trans "openid is supported open standard" %} -

- {% trans "Find out more" %} »
- {% trans "Get OpenID" %} » -

- - -{% endblock%} - - - diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html deleted file mode 100644 index fdb236c2..00000000 --- a/templates/authopenid/signup.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "base_content.html" %} - -{% load i18n %} -{% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %} - -{% block content %} -

- {% trans "Create login name and password" %} -

{% trans "Traditional signup info" %}

- -{% endblock %} - diff --git a/templates/authopenid/yadis.xrdf b/templates/authopenid/yadis.xrdf deleted file mode 100644 index a9ed44fe..00000000 --- a/templates/authopenid/yadis.xrdf +++ /dev/null @@ -1,14 +0,0 @@ - - - - - http://specs.openid.net/auth/2.0/return_to - {% for uri in return_to %} - {{ uri }} - {% endfor %} - - - \ No newline at end of file -- cgit v1.2.3-1-g7c22