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

5 files changed, 242 insertions, 0 deletions

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 %}
+<div class="headNormal">
+    {% trans "MediaWiki User Registration" %}
+</div>
+{% endif %}
+<div id="mediawiki-login">
+{% if request.is_include_virtual %}
+<form name="fregister" action="/wiki/index.php" accept-charset="UTF-8" method="post">
+        <input type="hidden" name="command" value="/backend/account/yourwiki/signup/"/>
+        <input type="hidden" name="title" value="Special:UserRegister"/>
+{% else %}
+<form name="fregister" action="." accept-charset="UTF-8" method="post">
+{% endif %}
+    {% with form as f %}
+        {{ f.next }}
+        <h2>{% trans "Basic information" %}</h2>
+        <div class="login-information">
+        <p>
+            <label for="id_login_name">{{f.login_name.label}}</label>
+            {{f.login_name}}
+        </p>
+        {% if f.login_name.errors %}
+        <p class="error">{{ f.login_name.errors|join:", " }}</p>
+        {% endif %}
+        <p>
+            <label for="id_password1">{{f.password1.label}}</label>
+            {{f.password1}}
+            {% if f.password1.errors %}
+                <span class="error">{{ f.password1.errors|join:", " }}</span>
+            {% endif %}
+        </p>
+        <p>
+            <label for="id_password2">{{f.password2.label}}</label>
+            {{f.password2}}
+            {% if f.password2.errors %}
+                <span class="error">{{ f.password2.errors|join:", " }}</span>
+            {% endif %}
+        </p>
+        <p>
+            <label for="id_email">{{f.email.label}}</label>
+            {{f.email}}
+            {% if f.email.errors %}
+                <span class="error">{{ f.email.errors|join:", " }}</span>
+            {% endif %}
+        </p>
+        </div>
+        <h2>{% trans "Your Name" %}</h2>
+        <p>{% trans "<strong>1) Real name</strong> - required for the Wiki, but not shown on the forum by default" %}</p>
+        <table>
+            <tr>
+                <td><label for="id_first_name">{{f.first_name.label}}</label></td>
+                <td><label for="id_screen_name">{{f.last_name.label}}</label></td>
+                <td><label for="id_user_title">{{f.user_title.label}}</label></td>
+            </tr>
+            <tr>
+                <td>
+                    {{f.first_name}}
+                    {% if f.first_name.errors %}
+                        <p class="error">{{ f.first_name.errors|join:", " }}</p>
+                    {% endif %}
+                </td>
+                <td>
+                    {{f.last_name}}
+                    {% if f.last_name.errors %}
+                        <p class="error">{{ f.last_name.errors|join:", " }}</p>
+                    {% endif %}
+                </td>
+                <td>
+                    {{f.user_title}}
+                    {% if f.user_title.errors %}
+                        <p class="error">{{ f.user_title.errors|join:", " }}</p>
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+        <p>{% trans "<strong>2) Forum screen name</strong>" %}</p>
+        <p>{% trans "Just skip this to use your full name at the forum, otherwise please check below" %}</p>
+        <p>
+                {{f.use_separate_screen_name}}
+                <label for="id_use_separate_screen_name">
+                    {{f.use_separate_screen_name.label}}
+                </label>
+        </p>
+        <p class="optional-screen-name">
+                {{f.screen_name}}
+        </p> 
+        {% if f.screen_name.errors %}
+        <p class="error screen-name-error">{{ f.screen_name.errors|join:", " }}</p>
+        {% endif %}
+        <p class="optional-screen-name">{% trans "Please remember that forum screen name is not your login name.<br/>Screen name allows you stay anonymous at the forum - you can change it at any time too. Login name cannot be changed." %}</p>
+        <h2>{% trans "Update subscription" %}</h2>
+        <p>{% trans "receive updates motivational blurb" %}</p> 
+        {{f.subscribe}}
+        {% if f.subscribe.errors %}
+            <p class="error">{{ f.subscribe.errors|join:", " }}</p>
+        {% endif %}
+    <h2>{% trans "Almost there..." %}</h2>
+    <p>{% trans "recaptcha explained" %}</p>
+    <p>{{f.recaptcha.errors|join:", "}}
+    <div style="clear:both; display:block;">{{f.recaptcha}}</div>
+    {% endwith %}
+    <input type="submit" value="{% trans "Create account" %}" class="submit"/>
+    {% comment %}<!-- this stuff was used for the wizard that fails with recaptcha so commented out-->
+    <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
+    {{ previous_fields|safe }}
+    {% endcomment %}
+    </form>
+</div>
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 %}
+<script type="text/javascript">
+$wgUserName = '{{user_name}}';
+$(document).ready(function(){
+$('#p-personal div').html('\
+<ul>\
+<li id="pt-0"><a href="/wiki/index.php?title=User:{{user_name}}" class="new">{{user_name}}</a></li>\
+<li id="pt-1"><a href="/wiki/index.php?title=UserWiki:{{user_name}}" class="new">my page</a></li>\
+<li id="pt-mytalk"><a href="/wiki/index.php?title=User_talk:{{user_name}}" title="My talk page [n]" accesskey="n" class="new">My talk</a></li>\
+<li id="pt-preferences"><a href="/wiki/index.php?title=Special:Preferences" title="My preferences">My preferences</a></li>\
+<li id="pt-watchlist"><a href="/wiki/index.php?title=Special:Watchlist" title="The list of pages you\'re monitoring for changes [l]" accesskey="l">My watchlist</a></li>\
+<li id="pt-mycontris"><a href="/wiki/index.php?title=Special:Contributions/{{user_name}}" title="List of my contributions [y]" accesskey="y">My contributions</a></li>\
+<li id="pt-logout"><a href="/wiki/index.php?title=Special:Userlogout&amp;returnto=Special:UserRegister" title="Log out">Log out</a></li>\
+</ul>\
+');
+});
+</script>
+{% endwith %}
+{% if wiki_user.user_title == 'prof' %}
+<script type="text/javascript">
+    var documentTitle = 'Professor {{wiki_user.user_last_name}}, Welcome to Wiki!';
+</script>
+{% else %}
+    {% if wiki_user.title == 'dr' %}
+    <script type="text/javascript">
+        var documentTitle = 'Dr. {{wiki_user.user_last_name}}, Welcome to Wiki!';
+    </script>
+    {% else %}
+    <script type="text/javascript">
+        var documentTitle = '{{wiki_user.user_first_name}}, Welcome to Wiki!';
+    </script>
+    {% endif %}
+{% endif %}
+<script type="text/javascript">
+    $(document).ready( function(){
+        document.title = documentTitle;
+        $('h1.firstHeading').html(documentTitle);
+    });
+</script>
+{% if wiki_user.user_title == 'prof' %}
+<p>Dear Professor {{wiki_user.user_last_name}},
+{% else %}
+    {% if wiki_user.title == 'dr' %}
+    <p>Dear Dr. {{wiki_user.user_last_name}},
+    {% else %}
+    <p>Dear {{wiki_user.user_first_name}},
+    {% endif %}
+{% endif %}
+thanks joining Wiki!</p>
+<p><strong>Could you help our community right now?</strong><br/> 
+Please answer some of the questions from our Q&amp;A forum:</p>
+<ul>
+    {% for q in questions %}
+        <li><a href="http://yourwiki.org/question/{{q.id}}/{{q.title|slugify}}">{{q.title}}</a></li>
+    {% endfor %}
+</ul>
+<p>Your answers will be <strong>indispensable</strong>.<br/> 
+Please feel free to ask something too! Hopefully you will like this forum and the wiki and invite your coworkers and friends to join.
+</p>
+<p>Might you consider <strong>sharing some of the digital documentation and pulse sequences</strong> that
+perhaps had accumulated in your lab?<br/> It's very easy to upload 
+files to the wiki as it is to edit the pages directly.
+</p>
+<p>Best wishes,<br/>
+Wiki Server Admin.
+</p>
+<p>P.S. An email with the confirmation code has been sent to <strong>{{wiki_user.user_email}}</strong>. 
+Please follow the included link to confirm your email address.
+{% if wiki_user.user_title == 'prof' %}
+<br/>
+Also, you are always welcome to <strong>advertise open positions</strong> in your laboratory on the wiki.  </p>
+{% endif %}
+</p>
+{% 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 %}