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

1 files changed, 11 insertions, 3 deletions

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 @@
 <p class="message">{% trans "Traditional signup info" %}</p>
 <form action="{% url user_signup %}" method="post" accept-charset="utf-8">
     <ul class="form-horizontal-rows">
-    {{form.as_ul}}
+    <li><label for="usename_id">{{form.username.label}}</label>{{form.username}}{{form.username.errors}}</li>
+    <li><label for="email_id">{{form.email.label}}</label>{{form.email}}{{form.email.errors}}</li>
+    <li><label for="password1_id">{{form.password1.label}}</label>{{form.password1}}{{form.password1.errors}}</li>
+    <li><label for="password2_id">{{form.password2.label}}</label>{{form.password2}}{{form.password2.errors}}</li>
     </ul>
-    <p style="margin:10px 0px 0px 3px;">{% trans "receive updates motivational blurb" %}</p>
-    {% include "edit_user_email_feeds_form.html" %}
+    <p class="signup_p">{% trans "receive updates motivational blurb" %}</p>
+    <p class="signup_p">{% trans "Please select your preferred email update schedule for the following groups of questions:" %}</p>
+    <div class='simple-subscribe-options'>
+    {{email_feeds_form.subscribe}}
+    </div>
+    <p class="signup_p">{% trans "Please read and type in the two words below to help us prevent automated account creation." %}</p>
+    {{form.recaptcha}}
     <div class="submit-row"><input type="submit" class="submit" value="{% trans "Create Account" %}" /> 
     <strong>{% trans "or" %}
     <a href="{% url user_signin %}">{% trans "return to OpenID login" %}</a></strong></div>