Whole heap of registration and error template changes

templates/registration/acceptance_email.txt

@@ -1,12 +0,0 @@
-{% load url from future %}
-Welcome {{ profile.first_name }},
-
-You request to become a user on {{ site }} has been approved by an administrator.
-
-To continue the registration process please visit http://{{ site.domain }}{% url 'registration_activate' activation_key=activation_key %}.
-This link will be active for the next {{ expiration_days }} days.
-
-{% if message %}
-Message from administrator:
-{{ message }}
-{% endif %} 

templates/registration/acceptance_email_subject.txt

@@ -1 +0,0 @@
-{{ site }} user {{ user }} activation {{ activation_key }}

templates/registration/activation_email.txt

@@ -1,5 +1,7 @@
-Congratulations {{ user.first_name }}. You are now fully registered on {{ site }}.
+{% load url from future %}
+Welcome {{ user }},
 
-{% if is_generated %}
-You password for this site has been automatically set to {{ password }}. It is recommend you change this as soon as possible.
-{% endif %}
+Thank you for registering on {{ site }}
+
+To continue the registration process please visit http://{{ site.domain }}{% url 'registration_activate' activation_key=activation_key %}.
+This link will be active for the next {{ expiration_days }} days.

templates/registration/activation_email_subject.txt

@@ -1 +1 @@
-{{ user }} activation successful
+{{ user }} activation required

templates/registration/activation_form.html

@@ -1,17 +0,0 @@
-{% extends 'base.html' %}
-{% load widget_tweaks %}
-{% block title %}Activation{% endblock %}
-
-{% block content %}
-<form action="" method="post" class="form-horizontal" role="form">{% csrf_token %}
-    {% for field in form %}
-    	<div class="form-group">
-    		<label for="{{ field.id_for_label }}" class="control-label col-sm-2">{{ field.label }}</label>
-    		<div class="controls col-sm-10">
-    			{% render_field field class+="form-control" placeholder=field.label %}
-    		</div>
-    	</div>
-    {% endfor %}
-    <p><input type="submit" value="Activate Account" class="btn btn-primary pull-right"></p>
-</form>
-{% endblock %}

templates/registration/notification_email.txt

@@ -1,3 +0,0 @@
-A new user has just registered on {{ site }} with username {{ user.username }} and email {{ user.email }}.
-
-Please visit {{ site.domain }}{% url admin:registration_registrationprofile_change user.registration_profile.id %} to moderate this activation.

templates/registration/notification_email_subject.txt

@@ -1 +0,0 @@
-{{ site }} New User Approval Require

templates/registration/registration_email.txt

@@ -1,3 +0,0 @@
-You account has been created but now requires approval by one of our moderation team.
-
-Please wait while this is done.

templates/registration/registration_email_subject.txt

@@ -1 +0,0 @@
-{{ site }} User Awaiting Approval