From ad2e22b999b3b795f60e0f95abcaf3b339567294 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 24 Jan 2010 19:53:24 -0500 Subject: recaptcha for conventional registration\n\ simpler email subscription form at registration\n\ fixed urls in rss feed\n\ added experimental remote password login api (cleartext password for remote site entered locally)\n\ included example for Mediawiki Authentication plugin\n\ very simple message to everyone management command --- templates/about.html | 23 ++--- templates/authopenid/complete.html | 14 ++- .../authopenid/external_legacy_login_info.html | 2 +- templates/authopenid/signup.html | 14 ++- templates/badge.html | 2 +- templates/badges.html | 4 +- templates/base.html | 4 +- templates/base_content.html | 6 +- templates/content/images/logo.png | Bin 1902 -> 0 bytes .../content/jquery-openid/images/local-login.png | Bin 2522 -> 0 bytes templates/content/jquery-openid/jquery.openid.js | 2 +- templates/content/js/com.cnprog.admin.js | 2 +- templates/content/js/com.cnprog.editor.js | 2 +- templates/content/js/com.cnprog.i18n.js | 2 + templates/content/js/com.cnprog.post.js | 63 ++++++------ templates/content/js/com.cnprog.tag_selector.js | 45 +++++---- templates/content/js/com.cnprog.utils.js | 51 +++++----- templates/content/js/mediawiki-login.js | 29 ++++++ templates/content/style/mediawiki-login.css | 63 ++++++++++++ templates/content/style/style.css | 22 ++++- templates/footer.html | 23 +++-- templates/header.html | 6 -- templates/mediawiki/mediawiki_signup.html | 9 ++ templates/mediawiki/mediawiki_signup_content.html | 110 +++++++++++++++++++++ templates/mediawiki/thanks_for_joining.html | 76 ++++++++++++++ templates/mediawiki/welcome_email.txt | 28 ++++++ templates/mediawiki/welcome_professor_email.txt | 19 ++++ templates/notarobot.html | 15 +++ templates/tag_selector.html | 2 +- 29 files changed, 511 insertions(+), 127 deletions(-) delete mode 100644 templates/content/images/logo.png delete mode 100644 templates/content/jquery-openid/images/local-login.png create mode 100644 templates/content/js/mediawiki-login.js create mode 100644 templates/content/style/mediawiki-login.css create mode 100644 templates/mediawiki/mediawiki_signup.html create mode 100644 templates/mediawiki/mediawiki_signup_content.html create mode 100644 templates/mediawiki/thanks_for_joining.html create mode 100644 templates/mediawiki/welcome_email.txt create mode 100644 templates/mediawiki/welcome_professor_email.txt create mode 100644 templates/notarobot.html (limited to 'templates') diff --git a/templates/about.html b/templates/about.html index ec4b6a73..66dcc3fd 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,24 +12,25 @@
-

{{settings.APP_SHORT_NAME}} is a collaboratively edited question and answer site created with - OSQA: The Open Source Q&A System.

+

Please customize file templates/about.html

Here you can ask and answer questions, comment and vote for the questions of others and their answers. Both questions and answers can be revised and improved. Questions can be tagged with - the relevant keywords to simplify future access and organize the accumulated material.

+ the relevant keywords to simplify future access and organize the accumulated material. +

-

This OSQA site is moderated by its members, hopefully - including yourself! +

This Q&A site is moderated by its members, hopefully - including yourself! Moderation rights are gradually assigned to the site users based on the accumulated "reputation" points. These points are added to the users account when others vote for his/her questions or answers. - These points (very) roughly reflect the level of trust of the community.

- -

No points are necessary to ask or answer the questions - so please - join - us!

- -

If you would like to find out more about this site - please see frequently - asked questions.

+ These points (very) roughly reflect the level of trust of the community. +

+

No points are necessary to ask or answer the questions - so please - + join us! +

+

+ If you would like to find out more about this site - please see frequently asked questions. +

{% endblock %} diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html index 1606cfc5..c967e8e2 100644 --- a/templates/authopenid/complete.html +++ b/templates/authopenid/complete.html @@ -11,7 +11,7 @@ parameters: * 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 +* email_feeds_form forum.forms.SimpleEmailSubscribeForm * openid_username_exists {% endcomment %} {% load i18n %} @@ -92,9 +92,11 @@ parameters: {% endif %} {{ form1.email }} -

{% trans "receive updates motivational blurb" %}

- {% include "edit_user_email_feeds_form.html" %} -

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

+

{% trans "receive updates motivational blurb" %}

+
+ {{email_feeds_form.subscribe}} +
+

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

@@ -108,7 +110,9 @@ parameters:

{{ form2.username }}

{{ form2.password }}

(Optional) receive updates by email - only sent when there are any.

- {% include "edit_user_email_feeds_form.html" %} +
+ {{email_feeds_form.subscribe}} +
diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html index c200b29d..3318499c 100644 --- a/templates/authopenid/external_legacy_login_info.html +++ b/templates/authopenid/external_legacy_login_info.html @@ -9,7 +9,7 @@ {% spaceless %}
-{% trans "how to login with password through external login website" %} +{% blocktrans %}how to login with password through external login website or use {{feedback_url}}{% endblocktrans %}
{% endspaceless %} {% endblock %} diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html index 45dfb51b..d800eaf9 100644 --- a/templates/authopenid/signup.html +++ b/templates/authopenid/signup.html @@ -10,10 +10,18 @@

{% trans "Traditional signup info" %}

    - {{form.as_ul}} +
  • {{form.username}}{{form.username.errors}}
    • +
  • {{form.email}}{{form.email.errors}}
    • +
  • {{form.password1}}{{form.password1.errors}}
    • +
  • {{form.password2}}{{form.password2.errors}}
-

{% trans "receive updates motivational blurb" %}

- {% include "edit_user_email_feeds_form.html" %} + + +
+ {{email_feeds_form.subscribe}} +
+ + {{form.recaptcha}}
{% trans "or" %} {% trans "return to OpenID login" %}
diff --git a/templates/badge.html b/templates/badge.html index 73cba4ba..af6aa2a2 100644 --- a/templates/badge.html +++ b/templates/badge.html @@ -28,7 +28,7 @@
{% for award in awards %} -

{{ award.name }} {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}

+

{{ award.name }} {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}

{% endfor %}
diff --git a/templates/badges.html b/templates/badges.html index 1902a3b0..8de93df5 100644 --- a/templates/badges.html +++ b/templates/badges.html @@ -33,10 +33,10 @@ {% endifequal %} {% endfor %} -
+
● {{ badge.name }} × {{ badge.awarded_count|intcomma }}
-

+

{{ badge.description }}

diff --git a/templates/base.html b/templates/base.html index a33512cc..17a32ef2 100755 --- a/templates/base.html +++ b/templates/base.html @@ -11,7 +11,7 @@ {% endspaceless %} {% if settings.GOOGLE_SITEMAP_CODE %} - + {% endif %} @@ -46,7 +46,7 @@ body { margin-top:2.4em; } - + + {% endif %} diff --git a/templates/header.html b/templates/header.html index 42074763..466659de 100644 --- a/templates/header.html +++ b/templates/header.html @@ -32,12 +32,6 @@ {% endif %} {% trans "badges" %} {% trans "unanswered questions" %} - - {% comment %} - {% if request.user.is_authenticated %} - {% trans "my profile" %} - {% endif %} - {% endcomment %}
{% trans "ask a question" %}
diff --git a/templates/mediawiki/mediawiki_signup.html b/templates/mediawiki/mediawiki_signup.html new file mode 100644 index 00000000..d1ecb96c --- /dev/null +++ b/templates/mediawiki/mediawiki_signup.html @@ -0,0 +1,9 @@ +{% extends "base_content.html" %} +{% load i18n %} +{% block forejs %} + {{form.media}} +{% endblock %} +{% block title %}{% spaceless %}{% trans "MediaWiki User Registration" %}{% endspaceless %}{% endblock %} +{% block content %} +{% include "mediawiki/mediawiki_signup_content.html" %} +{% endblock %} diff --git a/templates/mediawiki/mediawiki_signup_content.html b/templates/mediawiki/mediawiki_signup_content.html new file mode 100644 index 00000000..a09de107 --- /dev/null +++ b/templates/mediawiki/mediawiki_signup_content.html @@ -0,0 +1,110 @@ +{% load smart_if %} +{% load i18n %} +{% if request.is_include_virtual == False %} +
+ {% trans "MediaWiki User Registration" %} +
+{% endif %} +
+{% if request.is_include_virtual %} + + + +{% else %} + +{% endif %} + {% with form as f %} + {{ f.next }} +

{% trans "Basic information" %}

+ +

{% trans "Your Name" %}

+

{% trans "1) Real name - required for the Wiki, but not shown on the forum by default" %}

+ + + + + + + + + + + +
+ {{f.first_name}} + {% if f.first_name.errors %} +

{{ f.first_name.errors|join:", " }}

+ {% endif %} + 		+ {{f.last_name}} + {% if f.last_name.errors %} +

{{ f.last_name.errors|join:", " }}

+ {% endif %} + 		+ {{f.user_title}} + {% if f.user_title.errors %} +

{{ f.user_title.errors|join:", " }}

+ {% endif %} +
+

{% trans "2) Forum screen name" %}

+

{% trans "Just skip this to use your full name at the forum, otherwise please check below" %}

+

+ {{f.use_separate_screen_name}} + +

+

+ {{f.screen_name}} +

+ {% if f.screen_name.errors %} +

{{ f.screen_name.errors|join:", " }}

+ {% endif %} +

{% trans "Please remember that forum screen name is not your login name.
Screen name allows you stay anonymous at the forum - you can change it at any time too. Login name cannot be changed." %}

+

{% trans "Update subscription" %}

+

{% trans "receive updates motivational blurb" %}

+ {{f.subscribe}} + {% if f.subscribe.errors %} +

{{ f.subscribe.errors|join:", " }}

+ {% endif %} +

{% trans "Almost there..." %}

+

{% trans "recaptcha explained" %}

+

{{f.recaptcha.errors|join:", "}} +

{{f.recaptcha}}
+ {% endwith %} + + {% comment %} + + {{ previous_fields|safe }} + {% endcomment %} + +
diff --git a/templates/mediawiki/thanks_for_joining.html b/templates/mediawiki/thanks_for_joining.html new file mode 100644 index 00000000..9695ba05 --- /dev/null +++ b/templates/mediawiki/thanks_for_joining.html @@ -0,0 +1,76 @@ +{% spaceless %} +{% load smart_if %} +{% with wiki_user.user_name as user_name %} + +{% endwith %} +{% if wiki_user.user_title == 'prof' %} + +{% else %} + {% if wiki_user.title == 'dr' %} + + {% else %} + + {% endif %} +{% endif %} + +{% if wiki_user.user_title == 'prof' %} +

Dear Professor {{wiki_user.user_last_name}}, +{% else %} + {% if wiki_user.title == 'dr' %} +

Dear Dr. {{wiki_user.user_last_name}}, + {% else %} +

Dear {{wiki_user.user_first_name}}, + {% endif %} +{% endif %} +thanks joining Wiki!

+

Could you help our community right now?
+Please answer some of the questions from our Q&A forum:

+ +

Your answers will be indispensable.
+Please feel free to ask something too! Hopefully you will like this forum and the wiki and invite your coworkers and friends to join. +

+

Might you consider sharing some of the digital documentation and pulse sequences that +perhaps had accumulated in your lab?
It's very easy to upload +files to the wiki as it is to edit the pages directly. +

+

Best wishes,
+Wiki Server Admin. +

+

P.S. An email with the confirmation code has been sent to {{wiki_user.user_email}}. +Please follow the included link to confirm your email address. +{% if wiki_user.user_title == 'prof' %} +
+Also, you are always welcome to advertise open positions in your laboratory on the wiki.

+{% endif %} +

+{% endspaceless %} diff --git a/templates/mediawiki/welcome_email.txt b/templates/mediawiki/welcome_email.txt new file mode 100644 index 00000000..c282d9e5 --- /dev/null +++ b/templates/mediawiki/welcome_email.txt @@ -0,0 +1,28 @@ +{% spaceless %} +{% load i18n %} +{% load smart_if %} +{% if title == 'prof' %} +{% blocktrans %}Dear Professor {{last_name}},{% endblocktrans %} +{% endif %} +{% if title == 'dr' %} +{% blocktrans %}Dear Dr. {{last_name}},{% endblocktrans %} +{% endif %} +{% if title == 'none' %} +{% blocktrans %}Dear {{first_name}},{% endblocktrans %} +{% endif %} +{% endspaceless %} + +{% trans "Thank you for joining OSQA online community!" %} + +{% trans "A very brief introduction to OSQA community follows this technical information, included for your record:" %} +{% blocktrans %}* please visit {{email_confirmation_url}} to confirm your email for the OSQA wiki +* your OSQA login name is {{login_name}}, email address {{user_email}}. +* password recovery information can be always found here: {{password_recovery_url}}{% endblocktrans %} + +{% trans "A brief introduction to the OSQA online community for the new user." %} + +{% blocktrans %}Sincerely, +Adminstrator of the OSQA website.{% endblocktrans %} + +{% blocktrans %}P.S. If you believe that this message was sent in error please tell us +about it by email at {{admin_email}}.{% endblocktrans %} diff --git a/templates/mediawiki/welcome_professor_email.txt b/templates/mediawiki/welcome_professor_email.txt new file mode 100644 index 00000000..6b05889d --- /dev/null +++ b/templates/mediawiki/welcome_professor_email.txt @@ -0,0 +1,19 @@ +{% spaceless %} +{% load i18n %} +{% blocktrans %}Dear Professor {{last_name}},{% endblocktrans %} +{% endspaceless %} + +{% trans "Thanks a lot for joining OSQA online community!" %} + +{% trans "A very brief introduction to OSQA community follows this technical information, included for your record:" %} +{% blocktrans %}* please visit {{email_confirmation_url}} to confirm your email for the OSQA wiki +* your OSQA login name is {{login_name}}, email address {{user_email}}. +* password recovery information can be always found here: {{password_recovery_url}}{% endblocktrans %} + +{% trans "A brief introduction to the OSQA online community for the new professor user." %} + +{% blocktrans %}Sincerely, +Adminstrator of the OSQA website.{% endblocktrans %} + +{% blocktrans %}P.S. If you believe that this message was sent in error please tell us +about it by email at {{admin_email}}.{% endblocktrans %} diff --git a/templates/notarobot.html b/templates/notarobot.html new file mode 100644 index 00000000..698c5696 --- /dev/null +++ b/templates/notarobot.html @@ -0,0 +1,15 @@ +{% extends "base_content.html" %} +{% load i18n %} +{% block title %}{% spaceless %}{% trans "Please prove that you are a Human Being" %}{% endspaceless %}{% endblock %} +{% block content %} +{% comment %} this form is set up to be used in wizards {% endcomment %} +
+
+ {{form}} +
+ + + {{ previous_fields|safe }} +
+ +{% endblock %} diff --git a/templates/tag_selector.html b/templates/tag_selector.html index 6edc5cc8..94d23f3c 100644 --- a/templates/tag_selector.html +++ b/templates/tag_selector.html @@ -37,6 +37,6 @@

- +

-- cgit v1.2.3-1-g7c22