From 026541b6a70cd183d49ffec205232cfb0b205b25 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev
Date: Wed, 5 Aug 2009 22:49:44 -0400
Subject: added anonymous posting, per-question subscription and fixes by
Pothers and some more, see development.log
---
templates/404.html | 2 +-
templates/500.html | 4 +-
templates/answer_edit.html | 2 +-
templates/answer_edit_tips.html | 2 +-
templates/ask.html | 52 +++----
templates/authopenid/changeemail.html | 100 ++++++++++----
templates/authopenid/changeopenid.html | 2 +
templates/authopenid/changepw.html | 2 +
templates/authopenid/complete.html | 17 +--
templates/authopenid/confirm_email.txt | 17 +--
templates/authopenid/delete.html | 2 +
templates/authopenid/failure.html | 3 +-
templates/authopenid/sendpw.html | 2 +
templates/authopenid/sendpw_email.txt | 18 +--
templates/authopenid/settings.html | 2 +
templates/authopenid/signin.html | 124 ++++++++++++++---
templates/authopenid/signup.html | 2 +
templates/badge.html | 2 +-
templates/badges.html | 15 ++-
templates/base.html | 29 ++--
templates/base_content.html | 27 ++--
templates/book.html | 2 +-
templates/close.html | 2 +-
templates/content/js/com.cnprog.i18n.js | 8 +-
templates/content/js/com.cnprog.post.js | 23 +++-
templates/content/js/com.cnprog.utils.js | 2 +-
templates/content/style/openid.css | 2 +-
templates/content/style/style.css | 212 +++++++++++++++++++----------
templates/faq.html | 223 ++++++++++++++++++-------------
templates/footer.html | 2 +-
templates/header.html | 37 +++--
templates/index.html | 10 +-
templates/logout.html | 4 +-
templates/pagesize.html | 2 +
templates/question.html | 21 ++-
templates/question_edit.html | 2 +-
templates/question_retag.html | 25 ++--
templates/questions.html | 28 ++--
templates/revisions_answer.html | 2 +-
templates/revisions_question.html | 3 +-
templates/unanswered.html | 2 +-
templates/user.html | 6 +-
templates/user_edit.html | 2 +-
templates/user_favorites.html | 2 +-
templates/user_info.html | 2 +
templates/user_preferences.html | 15 ++-
templates/user_recent.html | 2 +-
templates/user_reputation.html | 2 +-
templates/user_responses.html | 2 +-
templates/user_stats.html | 2 +-
templates/user_tabs.html | 2 -
templates/user_votes.html | 2 +-
52 files changed, 678 insertions(+), 399 deletions(-)
(limited to 'templates')
diff --git a/templates/404.html b/templates/404.html
index d24edaf0..cd23a36b 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,5 +1,5 @@
-
{% extends "base_content.html" %}
+
{% load i18n %}
{% block title %}{% spaceless %}404 Error{% endspaceless %}{% endblock %}
{% block forestyle%}
diff --git a/templates/500.html b/templates/500.html
index c99774b3..52dcafae 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -1,5 +1,5 @@
-
{% extends "base_content.html" %}
+
{% load i18n %}
{% block title %}{% spaceless %}500 Error{% endspaceless %}{% endblock %}
{% block forejs %}
@@ -19,7 +19,7 @@
-
{% trans "sorry, system error"
+
{% trans "sorry, system error" %}
{% trans "system error log is recorded, error will be fixed as soon as possible" %}
{% trans "please report the error to the site administrators if you wish" %}
diff --git a/templates/answer_edit.html b/templates/answer_edit.html
index 008d9f78..9f0f1bec 100644
--- a/templates/answer_edit.html
+++ b/templates/answer_edit.html
@@ -1,5 +1,5 @@
-
{% extends "base.html" %}
+
{% load i18n %}
{% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %}
{% block forejs %}
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html
index 565c5298..31f71e34 100644
--- a/templates/answer_edit_tips.html
+++ b/templates/answer_edit_tips.html
@@ -35,7 +35,7 @@
- {% trans "image" %} :![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
+ {% trans "image" %} :![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
diff --git a/templates/ask.html b/templates/ask.html
index 1b00a701..4aa18dd5 100644
--- a/templates/ask.html
+++ b/templates/ask.html
@@ -1,5 +1,5 @@
-
{% extends "base.html" %}
+
{% load i18n %}
{% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %}
{% block forejs %}
@@ -62,6 +62,19 @@
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 %}
-
-
- {% trans "Account: change email" %}
-
-
-{% 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 %}
-{% if form.errors %}
-{% trans "Please correct errors below:" %}
- {% if form.email.errors %}
- {{ form.email.errors|join:", " }}
- {% endif %}
- {% if form.password.errors %}
- {{ form.password.errors|join:", " }}
- {% endif %}
-
-{% endif %}
+
+{% ifequal action_type "change" %}
+
+ {% trans "Change email" %}
+
+
+ {% blocktrans %}change {{email}} info{% endblocktrans %}
+
+ {% if form.errors %}
+ {% trans "Please correct errors below:" %}
+ {% if form.email.errors %}
+ {{ form.email.errors|join:", " }}
+ {% endif %}
+ {% if form.password.errors %}
+ {{ form.password.errors|join:", " }}
+ {% endif %}
+
+ {% endif %}
-{% if msg %}
-{{ msg }}
-{% endif %}
+ {% if msg %}
+ {{ msg }}
+ {% endif %}
-
+{% endifequal %}
+{% ifequal action_type "validate" %}
+
+ {% trans "Validate email" %}
+
+
+ {% blocktrans %}validate {{email}} info{% endblocktrans %}
+
+{% endifequal %}
+{% ifequal action_type "keep" %}
+
+ {% trans "Email not changed" %}
+
+
+ {% blocktrans %}old {{email}} kept{% 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
index c1f3d180..9b5a196a 100644
--- a/templates/authopenid/changeopenid.html
+++ b/templates/authopenid/changeopenid.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+
{% load i18n %}
{% block content %}
@@ -31,3 +32,4 @@
{% endblock %}
+
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" %}
+
{% load i18n %}
{% block head %}
@@ -31,3 +32,4 @@
{% endblock %}
+
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" %}
+
{% 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" %}
-
{% trans "Your OpenID is accepted. Please complete this to finish registration." %}
+
+ {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
+
{% trans "This account already exists, please use another." %}
@@ -41,12 +44,9 @@
{{ form.next }}
-
- {% trans "New account" %}
- {% trans "User name (will be shown to others, cannot be modified )" %} {{ form1.username }}
- {% trans "Email (not shared with anyone )" %} {{ form1.email }}
-
-
+ {% trans "Screen name label" %} {{ form1.username }}
+ {% trans "Email address label" %} {{ form1.email }}
+
@@ -65,3 +65,4 @@
{% endblock %}
+
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" %}
+
{% load i18n %}
@@ -36,3 +37,4 @@
{% endblock %}
+
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 @@
+
OpenID failed
@@ -10,4 +11,4 @@
{{ message|escape }}
-
\ No newline at end of file
+