summaryrefslogtreecommitdiffstats
path: root/templates/authopenid
diff options
context:
space:
mode:
Diffstat (limited to 'templates/authopenid')
-rw-r--r--templates/authopenid/changeemail.html100
-rw-r--r--templates/authopenid/changeopenid.html2
-rw-r--r--templates/authopenid/changepw.html2
-rw-r--r--templates/authopenid/complete.html17
-rw-r--r--templates/authopenid/confirm_email.txt17
-rw-r--r--templates/authopenid/delete.html2
-rw-r--r--templates/authopenid/email_validation.txt15
-rw-r--r--templates/authopenid/failure.html3
-rw-r--r--templates/authopenid/sendpw.html2
-rw-r--r--templates/authopenid/sendpw_email.txt18
-rw-r--r--templates/authopenid/settings.html2
-rw-r--r--templates/authopenid/signin.html122
-rw-r--r--templates/authopenid/signup.html3
13 files changed, 231 insertions, 74 deletions
diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html
index 99984b3f..d5acb6c9 100644
--- a/templates/authopenid/changeemail.html
+++ b/templates/authopenid/changeemail.html
@@ -1,35 +1,81 @@
{% extends "base_content.html" %}
{% load i18n %}
{% block content %}
-<div id="main-bar" class="">
- <h3>
- {% trans "Account: change email" %}
- </h3>
-</div>
-<p class="settings-descr">{% blocktrans %}This is where you can change the email address associated with your account. Please keep this email address up to date so we can send you a password-reset email if you request one.{% endblocktrans %}</p>
-{% if form.errors %}
-<p class="errors">{% trans "Please correct errors below:" %}<br />
- {% if form.email.errors %}
- <span class="error">{{ form.email.errors|join:", " }}</span>
- {% endif %}
- {% if form.password.errors %}
- <span class="error">{{ form.password.errors|join:", " }}</span>
- {% endif %}
-</p>
-{% endif %}
+<!-- changeemail.html action_type={{action_type}}-->
+{% ifequal action_type "change" %}
+ <div id="main-bar" class="headNormal">
+ {% trans "Change email" %}
+ </div>
+ <p class="message">
+ {% blocktrans %}change {{email}} info{% endblocktrans %}
+ </p>
+ {% if form.errors %}
+ <p class="errors">{% trans "Please correct errors below:" %}<br />
+ {% if form.email.errors %}
+ <span class="error">{{ form.email.errors|join:", " }}</span>
+ {% endif %}
+ {% if form.password.errors %}
+ <span class="error">{{ form.password.errors|join:", " }}</span>
+ {% endif %}
+ </p>
+ {% endif %}
-{% if msg %}
-<p class="errors">{{ msg }}</p>
-{% endif %}
+ {% if msg %}
+ <p class="errors">{{ msg }}</p>
+ {% endif %}
-<div class="aligned">
- <form action="." method="post" accept-charset="utf-8">
+ <div class="aligned">
+ <form action="." method="post" accept-charset="utf-8">
- <div id="form-row"><label for="id_email">{% trans "Email" %}</label>{{ form.email }}</div>
- <div id="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>
+ <div class="form-row"><label for="id_email">{% trans "Your new Email" %}</label><br>{{ form.email }}</div>
+ <!--<div class="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>-->
+ <div class="submit-row">
+ <input class="submit" type="submit" name="change_email" value="{% trans "Change email" %}">
+ <input class="submit" type="submit" name="cancel" value="{% trans "Cancel" %}">
+ </div>
- <p><input type="submit" value="{% trans "Change email" %}"></p>
-
- </form>
- </div>
+ </form>
+ </div>
+{% endifequal %}
+{% ifequal action_type "validate" %}
+ <div id="main-bar" class="headNormal">
+ {% trans "Validate email" %}
+ </div>
+ <p class="message">
+ {% blocktrans %}validate {{email}} info{% endblocktrans %}
+ </p>
+{% endifequal %}
+{% ifequal action_type "keep" %}
+ <div id="main-bar" class="headNormal">
+ {% trans "Email not changed" %}
+ </div>
+ <p class="message">
+ {% blocktrans %}old {{email}} kept{% endblocktrans %}
+ </p>
+{% endifequal %}
+{% ifequal action_type "done_novalidate" %}
+ <div id="main-bar" class="headNormal">
+ {% trans "Email changed" %}
+ </div>
+ <p class="message">
+ {% blocktrans %}your current {{email}} can be used for this{% endblocktrans %}
+ </p>
+{% endifequal %}
+{% ifequal action_type "validation_complete" %}
+ <div id="main-bar" class="headNormal">
+ {% trans "Email verified" %}
+ </div>
+ <p class="message">
+ {% trans "thanks for verifying email" %}
+ </p>
+{% endifequal %}
+{% ifequal action_type "key_not_sent" %}
+ <div id="main-bar" class="headNormal">
+ {% trans "email key not sent" %}
+ </div>
+ <p class="message">
+ {% blocktrans %}email key not sent {{email}} change email here {{change_link}}{% endblocktrans %}
+ </p>
+{% endifequal %}
{% endblock %}
+<!-- end changeemail.html -->
diff --git a/templates/authopenid/changeopenid.html b/templates/authopenid/changeopenid.html
index c1f3d180..9b5a196a 100644
--- a/templates/authopenid/changeopenid.html
+++ b/templates/authopenid/changeopenid.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+<!-- changeopenid.html -->
{% load i18n %}
{% block content %}
@@ -31,3 +32,4 @@
</form>
</div>
{% endblock %}
+<!-- end changeopenid.html -->
diff --git a/templates/authopenid/changepw.html b/templates/authopenid/changepw.html
index f3cf4be0..0e90b172 100644
--- a/templates/authopenid/changepw.html
+++ b/templates/authopenid/changepw.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+<!-- changepw.html -->
{% load i18n %}
{% block head %}
@@ -31,3 +32,4 @@
</form>
</div>
{% endblock %}
+<!-- end changepw.html -->
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index 28c38a04..b9a14e16 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -1,4 +1,5 @@
-{% extends "base.html" %}
+{% extends "base_content.html" %}
+<!-- complete.html -->
{% load i18n %}
{% block head %}{% endblock %}
{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
@@ -7,7 +8,9 @@
{% trans "Connect your OpenID with your account on this site" %}
</div>
<p id="completetxt" >
- <h3>{% trans "Your OpenID is accepted. Please complete this to finish registration." %}</h3>
+ <div class="message">
+ {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
+ </div>
<p style="display:none">{% trans "This account already exists, please use another." %}</p>
</p>
@@ -41,12 +44,9 @@
<div class="login">
<form name="fregister" action="{% url user_register %}" method="POST">
{{ form.next }}
- <fieldset style="padding:10px">
- <legend class="big">{% trans "New account" %}</legend>
- <div class="form-row"><label for="id_username">{% trans "User name (<i>will be shown to others, cannot be modified</i>)" %}</label><br />{{ form1.username }}</div>
- <div class="form-row"><label for="id_email">{% trans "Email (<i>not shared with anyone</i>)" %}</label><br />{{ form1.email }}</div>
- <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"></div>
- </fieldset>
+ <div class="form-row"><label for="id_username">{% trans "Screen name label" %}</label><br />{{ form1.username }}</div>
+ <div class="form-row"><label for="id_email">{% trans "Email address label" %}</label><br />{{ form1.email }}</div>
+ <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"></div>
</form>
</div>
<div class="login" style="display:none">
@@ -65,3 +65,4 @@
</form>
</div>
{% endblock %}
+<!-- end complete.html -->
diff --git a/templates/authopenid/confirm_email.txt b/templates/authopenid/confirm_email.txt
index 9af177ed..202db0fc 100644
--- a/templates/authopenid/confirm_email.txt
+++ b/templates/authopenid/confirm_email.txt
@@ -1,12 +1,13 @@
-Thank you for registering.
+{% load i18n %}
+{% trans "Thank you for registering at our Q&A forum!" %}
-Your account details are:
+{% trans "Your account details are:" %}
-Username: {{ username }}
-Password: {{ password }}
-
-
-You may sign in here:
-{{ site_url }}signin/
+{% trans "Username:" %} {{ username }}
+{% trans "Password:" %} {{ password }}
+{% trans "Please sign in here:" %}
+{{ site_url }}{% trans "signin/" %}
+{% blocktrans %}Sincerely,
+Forum Administrator{% endblocktrans %}
diff --git a/templates/authopenid/delete.html b/templates/authopenid/delete.html
index 19e0884a..d39bc962 100644
--- a/templates/authopenid/delete.html
+++ b/templates/authopenid/delete.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+<!-- delete.html -->
{% load i18n %}
@@ -36,3 +37,4 @@
</form>
</div>
{% endblock %}
+<!-- end delete.html -->
diff --git a/templates/authopenid/email_validation.txt b/templates/authopenid/email_validation.txt
new file mode 100644
index 00000000..5b166a9b
--- /dev/null
+++ b/templates/authopenid/email_validation.txt
@@ -0,0 +1,15 @@
+{% 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/failure.html b/templates/authopenid/failure.html
index 87839ab2..d075d6b0 100644
--- a/templates/authopenid/failure.html
+++ b/templates/authopenid/failure.html
@@ -1,5 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
+<!-- failure.html -->
<html>
<head>
<title>OpenID failed</title>
@@ -10,4 +11,4 @@
<p>{{ message|escape }}</p>
</body>
-</html> \ No newline at end of file
+</html><!-- end failure.html -->
diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index a9488c4c..ba81dba4 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+<!-- sendpw.html -->
{% load i18n %}
{% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
@@ -32,3 +33,4 @@
<span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
</div>
{% endblock %}
+<!-- end sendpw.html -->
diff --git a/templates/authopenid/sendpw_email.txt b/templates/authopenid/sendpw_email.txt
index dec062a8..2024061c 100644
--- a/templates/authopenid/sendpw_email.txt
+++ b/templates/authopenid/sendpw_email.txt
@@ -1,14 +1,14 @@
-Someone has requested to reset your password on {{ site_url }}.
-If this is not you, it is safe to ignore this email.
+{% 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 %}
-Your new account details are:
+{% trans "Your new account details are:" %}
-Username: {{ username }}
-New password: {{ password }}
+{% trans "Username:" %} {{ username }}
+{% trans "New password:" %} {{ password }}
-To confirm reset of your password go to this address:
+{% trans "To confirm that you wanted to reset your password please visit:" %}
{{ site_url }}{{ url_confirm }}?key={{ confirm_key }}
-Regards,
-
-
+{% blocktrans %}Sincerely,
+Forum Administrator{% endblocktrans %}
diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html
index ffd5dd8f..a373324e 100644
--- a/templates/authopenid/settings.html
+++ b/templates/authopenid/settings.html
@@ -1,4 +1,5 @@
{% extends "base_content.html" %}
+<!-- settings.html -->
{% load i18n %}
{% block head %}
@@ -39,3 +40,4 @@
</dl>
</div>
{% endblock %}
+<!-- end settings.html -->
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index aff2f06f..9a1a6780 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -1,41 +1,119 @@
{% extends "base.html" %}
+<!-- signin.html -->
{% load i18n %}
{% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <script type="text/javascript" src="/content/js/jquery.openid.js?"></script>
+ <!--<script type="text/javascript" src="/content/js/jquery.openid.js?"></script>-->
<script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
- <script type="text/javascript">
+
+ <link rel="stylesheet" type="text/css" media="screen" href="/content/jquery-openid/openid.css"/>
+ <script type="text/javascript" src="/content/jquery-openid/jquery.openid.js"></script>
+ <script type="text/javascript"> $().ready( function() { $("form.openid:eq(0)").openid(); })</script>
+ <!--<script type="text/javascript">
$().ready(function(){
openid.init('id_openid_url');
setupFormValidation("#openid_form", {bsignin:{required: true}});
});
- </script>
+ </script>-->
{% endblock %}
{% block content %}
<div class="headNormal">
{% trans "User login" %}
</div>
-<div class="login">
- <form name="openid_form" action="{% url user_signin %}" method="post">
- {{ form2.next }}
- <p style="display:none">{% trans "we support two login modes" %}</p>
{% if msg %}
<p class="warning">{{ msg }}</p>
{% endif %}
- <fieldset class="fieldset">
- <legend ><strong>{% trans "Login with your OpenID" %}</strong></legend>
- <div id="openid_choice">
- <p>{% trans "select openid provider" %}</p>
- <div id="openid_btns">
- </div>
- <br><br><br>
- <p>{% trans "verify openid link and login" %}</p>
+ {% if answer %}
+ <div class="message">
+ {% 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 %}
+ </div>
+ {% endif %}
+ {% if question %}
+ <div class="message">
+ {% blocktrans with question.title as title and question.summary as summary %}Your question
+ {{title}} {{summary}} will be posted once you log in
+ {% endblocktrans %}
</div>
- <p>
- {{ form2.openid_url }} <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" class="openid-login-submit" />
- </p>
- </fieldset>
- </form>
+ {% endif %}
+ <div style="width:600px;float:left;margin-bottom:5px;">{% trans "Click to sign in through any of these services." %}</div>
+ <form id="openid_form" name="openid_form" class="openid" method="post" action="{% url user_signin %}">
+ <ul class="providers">
+ <li class="openid" title="OpenID">
+ <div class="logo_box openid_box">
+ <img src="/content/jquery-openid/images/openid.gif" alt="icon" />
+ </div>
+ <span><strong>http://{your-openid-url}</strong></span>
+ </li>
+ <li class="direct" title="Google">
+ <div class="logo_box google_box">
+ <img src="/content/jquery-openid/images/google.gif" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
+ </div>
+ </li>
+ <li class="direct" title="Yahoo">
+ <div class="logo_box yahoo_box">
+ <img src="/content/jquery-openid/images/yahoo.gif" alt="icon" /><span>http://yahoo.com/</span>
+ </div>
+ </li>
+ <li class="username" title="AOL screen name">
+ <div class="logo_box aol_box">
+ <img src="/content/jquery-openid/images/aol.gif" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
+ </div>
+ </li>
+ <li class="username first_tiny_li" title="MyOpenID user name">
+ <img src="/content/jquery-openid/images/myopenid.ico" alt="icon" />
+ <span>http://<strong>username</strong>.myopenid.com/</span>
+ </li>
+ <li class="username" title="Flickr user name">
+ <img src="/content/jquery-openid/images/flickr.ico" alt="icon" />
+ <span>http://flickr.com/<strong>username</strong>/</span>
+ </li>
+ <li class="username" title="Technorati user name">
+ <img src="/content/jquery-openid/images/technorati.ico" alt="icon" />
+ <span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
+ </li>
+ <li class="username" title="Wordpress blog name">
+ <img src="/content/jquery-openid/images/wordpress.ico" alt="icon" />
+ <span>http://<strong>username</strong>.wordpress.com</span>
+ </li>
+ <li class="username" title="Blogger blog name">
+ <img src="/content/jquery-openid/images/blogger.ico" alt="icon" />
+ <span>http://<strong>username</strong>.blogspot.com/</span>
+ </li>
+ <li class="username" title="LiveJournal blog name">
+ <img src="/content/jquery-openid/images/livejournal.ico" alt="icon" />
+ <span>http://<strong>username</strong>.livejournal.com</span>
+ </li>
+ <li class="username" title="ClaimID user name">
+ <img src="/content/jquery-openid/images/claimid.ico" alt="icon" />
+ <span>http://claimid.com/<strong>username</strong></span>
+ </li>
+ <li class="username" title="Vidoop user name">
+ <img src="/content/jquery-openid/images/vidoop.ico" alt="icon" />
+ <span>http://<strong>username</strong>.myvidoop.com/</span>
+ </li>
+ <li class="username" title="Verisign user name">
+ <img src="/content/jquery-openid/images/verisign.ico" alt="icon" />
+ <span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
+ </li>
+ </ul>
+ {{ form2.next }}
+ <fieldset>
+ <p id="provider_name_slot">{% trans 'Enter your <span id="enter_your_what">Provider user name</span>' %}</p>
+ <div><p><span></span>
+ <input id="openid_username" type="text" name="openid_username" /><span></span>
+ <input type="submit" value="Login" />
+ </p></div>
+ </fieldset>
+ <fieldset>
+ <p>{% trans 'Enter your <a class="openid_logo" href="http://openid.net">OpenID</a> web address' %}</p>
+ <div><p><input id="openid_url" type="text" value="http://" name="openid_url" />
+ <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" /></p></div>
+ </fieldset>
+ </form>
+<div class="login">
+ <p style="display:none">{% trans "we support two login modes" %}</p>
<div style="display:none">
<br>
{% if form1.errors %}
@@ -60,7 +138,7 @@
<div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div>
<div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}">
<a href="">{% trans "Forgot your password?" %}</a>
- <a href="">{% trans "Create new acccount" %}</a></div>
+ <a href="">{% trans "Create new account" %}</a></div>
</fieldset>
</form>
</div>
@@ -93,3 +171,5 @@
</div>
{% endblock%}
+ <script type="text/javascript"> $( function() { $("form.openid:eq(0)").openid(); })</script>
+<!-- end signin.html -->
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html
index a4460aa3..a65dafdc 100644
--- a/templates/authopenid/signup.html
+++ b/templates/authopenid/signup.html
@@ -1,4 +1,6 @@
{% extends "base.html" %}
+<!--signup.html-->
+{% load i18n %}
{% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %}
{% block content %}
@@ -50,3 +52,4 @@
</form>
</div>
{% endblock %}
+<!--end signup.html-->
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 21:47:10 +0000