remove all the DOS linefeeds

templates/registration/activate.html

@@ -1,25 +1,25 @@
-{% extends "base.html" %}
-
-{% block title %}
-New troggle account registered
-{% endblock %}
-
-{% block header %}
-<h1>activate.html</h1>
-{% endblock %}
-
-{% block content %}
-
-{% if account %}
-<p>
-Hello, {{ account }}! Your account is now activated. Now you can <a href="{%url auth_login%}">log in</a> with the password you chose. Use the links in the upper right to control this in the future.
-</p>
-
-<p>
-If you have been on the expedition in the past, you already have a profile in the system; <a href={% url profiles_select_profile %}>click here </a> to find it and link it to your account. Otherwise, please <a href={% url profiles_create_profile %}> create yourself a new profile</a>. 
-</p>
-{% else %}
-
-The activation key you entered has already been used or was invalid.
-{% endif %}
+{% extends "base.html" %}
+
+{% block title %}
+New troggle account registered
+{% endblock %}
+
+{% block header %}
+<h1>activate.html</h1>
+{% endblock %}
+
+{% block content %}
+
+{% if account %}
+<p>
+Hello, {{ account }}! Your account is now activated. Now you can <a href="{%url auth_login%}">log in</a> with the password you chose. Use the links in the upper right to control this in the future.
+</p>
+
+<p>
+If you have been on the expedition in the past, you already have a profile in the system; <a href={% url profiles_select_profile %}>click here </a> to find it and link it to your account. Otherwise, please <a href={% url profiles_create_profile %}> create yourself a new profile</a>. 
+</p>
+{% else %}
+
+The activation key you entered has already been used or was invalid.
+{% endif %}
 {% endblock %}

templates/registration/activation_email.html

@@ -1,10 +1,10 @@
-<P>Hello {{ form.user }},</P>
-
-<P>Glad you're joining the CUCC EXPO team! Please go to</P>
-
-<P><a href="{{ site }}{% url registration_activate activation_key %}">{{ site }}{% url registration_activate activation_key %}</a></P>
-
-<P>to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.</P>
-
-<P>Yours,<BR>
-The magical troggle</P>
+<P>Hello {{ form.user }},</P>
+
+<P>Glad you're joining the CUCC EXPO team! Please go to</P>
+
+<P><a href="{{ site }}{% url registration_activate activation_key %}">{{ site }}{% url registration_activate activation_key %}</a></P>
+
+<P>to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.</P>
+
+<P>Yours,<BR>
+The magical troggle</P>

templates/registration/activation_email.txt

@@ -1,10 +1,10 @@
-Hello {{ form.user }},
-
-Glad you're joining the CUCC EXPO team! Please go to
-
-{{ site }}{% url registration_activate activation_key %}
-
-to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.
-
-Yours,
+Hello {{ form.user }},
+
+Glad you're joining the CUCC EXPO team! Please go to
+
+{{ site }}{% url registration_activate activation_key %}
+
+to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.
+
+Yours,
 The magical troggle

templates/registration/login.html

@@ -1,20 +1,20 @@
-{% extends "base.html" %}
-{% load csrffaker %} 
-
-{% block content %}
-
-{% if form.errors %}
-<p>Your username and password didn't match. Please try again.</p>
-{% endif %}
-
-<form method="post" action=".">{% csrf_token %}
-<table>
-<tr><td>{{ form.username.label_tag }}</td><td>{{ form.username }}</td></tr>
-<tr><td>{{ form.password.label_tag }}</td><td>{{ form.password }}</td></tr>
-</table>
-
-<input type="submit" value="login" />
-<input type="hidden" name="next" value="{{ next }}" />
-</form>
-
-{% endblock %}
+{% extends "base.html" %}
+{% load csrffaker %} 
+
+{% block content %}
+
+{% if form.errors %}
+<p>Your username and password didn't match. Please try again.</p>
+{% endif %}
+
+<form method="post" action=".">{% csrf_token %}
+<table>
+<tr><td>{{ form.username.label_tag }}</td><td>{{ form.username }}</td></tr>
+<tr><td>{{ form.password.label_tag }}</td><td>{{ form.password }}</td></tr>
+</table>
+
+<input type="submit" value="login" />
+<input type="hidden" name="next" value="{{ next }}" />
+</form>
+
+{% endblock %}

templates/registration/logout.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
-{% block content %}
-	You have been logged out.
+{% extends "base.html" %}
+{% block content %}
+	You have been logged out.
 {% endblock %}

templates/registration/registration_activate.html

@@ -1,6 +1,6 @@
-{% extends “base.html” %}
-{% block body %}
-Hello {{ account }}!
-
-Check your email to confirm the activation. There are {{ expiration_days }} days left to do it.
+{% extends “base.html” %}
+{% block body %}
+Hello {{ account }}!
+
+Check your email to confirm the activation. There are {{ expiration_days }} days left to do it.
 {% endblock %}

templates/registration/registration_complete.html

@@ -1,13 +1,13 @@
-{% extends "base.html" %}
-
-{% block title %}
-{{ block.super }}: registration complete
-{% endblock %}
-
-{% block contentheader %}
-<h1>Registration Complete</h1>
-{% endblock %}
-
-{% block content %}
-<p>Thank you for signing up. An email with the activation code has been sent to your inbox. </p>
+{% extends "base.html" %}
+
+{% block title %}
+{{ block.super }}: registration complete
+{% endblock %}
+
+{% block contentheader %}
+<h1>Registration Complete</h1>
+{% endblock %}
+
+{% block content %}
+<p>Thank you for signing up. An email with the activation code has been sent to your inbox. </p>
 {% endblock %}