rest of martin's changes, without reverting lineend issues

4 files changed, 76 insertions, 76 deletions

diff --git a/templates/profiles/create_profile.html b/templates/profiles/create_profile.html
index 7e32597..a147160 100644
--- a/templates/profiles/create_profile.html
+++ b/templates/profiles/create_profile.html
@@ -1,13 +1,13 @@
-{% extends "base.html" %}

-

-{% block content %}

-

-<form method="post">

-{{ form.as_p }}

-<input type="submit" />

-</form>

-

-{% if form.errors %}

- <p class="errornote">Please correct the errors below</p>

-{% endif %}

+{% extends "base.html" %}
+
+{% block content %}
+
+<form method="post">
+{{ form.as_p }}
+<input type="submit" />
+</form>
+
+{% if form.errors %}
+ <p class="errornote">Please correct the errors below</p>
+{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/profiles/edit_profile.html b/templates/profiles/edit_profile.html
index 7e32597..a147160 100644
--- a/templates/profiles/edit_profile.html
+++ b/templates/profiles/edit_profile.html
@@ -1,13 +1,13 @@
-{% extends "base.html" %}

-

-{% block content %}

-

-<form method="post">

-{{ form.as_p }}

-<input type="submit" />

-</form>

-

-{% if form.errors %}

- <p class="errornote">Please correct the errors below</p>

-{% endif %}

+{% extends "base.html" %}
+
+{% block content %}
+
+<form method="post">
+{{ form.as_p }}
+<input type="submit" />
+</form>
+
+{% if form.errors %}
+ <p class="errornote">Please correct the errors below</p>
+{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/profiles/profile_detail.html b/templates/profiles/profile_detail.html
index baf3fae..cf2fb76 100644
--- a/templates/profiles/profile_detail.html
+++ b/templates/profiles/profile_detail.html
@@ -1,14 +1,14 @@
-{% extends "base.html" %}

-

-{% block contentheader %}

-<h1>Profile for {{ profile }}</h1>

-{% endblock %}

-

-{% block content %}

-

-{{ profile }}

-

-{% if form.errors %}

- <p class="errornote">Please correct the errors below</p>

-{% endif %}

+{% extends "base.html" %}
+
+{% block contentheader %}
+<h1>Profile for {{ profile }}</h1>
+{% endblock %}
+
+{% block content %}
+
+{{ profile }}
+
+{% if form.errors %}
+ <p class="errornote">Please correct the errors below</p>
+{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/profiles/select_profile.html b/templates/profiles/select_profile.html
index 810efd2..e18191b 100644
--- a/templates/profiles/select_profile.html
+++ b/templates/profiles/select_profile.html
@@ -1,40 +1,40 @@
-{% extends "base.html" %}

-

-{% block content %}

-

-<h2>Troggle profile selection page</h2>

-

-Hello, {{ user }}.

-

-<br /><br />

-

-{% if user.person %}

-This is where you go to associate a new user account with a pre-existing profile from old expo data.

-

-<br /><br />

-

-However, you already have a profile- your name should be {{user.person.first_name}} {{user.person.last_name}}. If you don't believe me, go see it at: <br /><br /> <a href= {{ user.person.get_absolute_url }}> {{ user.person.get_absolute_url }} </a> <br /><br /> or edit it at:

-<br /><br /> <a href= {{ user.person.get_admin_url }}> {{ user.person.get_admin_url }} </a>.<br /><br />

-

-If your account is associated with the wrong person's profile due to inebriation or incompetance during account setup, click <a href="{{ user.person.get_absolute_url }}/?clear_profile=True">here</a> to dissasociate your profile from your user account.

-

-{% else %}

-

-You have an account in the system, but no profile. If you have been on expo before, please choose yourself from the list below.

-<br /><br />

-

-<form method="post">

-{{ form.as_p }}

-<input name="" type="submit" value="This is me!" />

-</form>

-<br />

-

-Yes, you could choose the wrong person if you want. That would be lame. Instead, do something that's actually funny. For example, fry a random object or maybe take some mac and cheese somewhere it doesn't usually get to go. Perhaps you can start a new tradition of laminating the expo leader.

-

-

-{% endif %}

-

-{% if form.errors %}

- <p class="errornote">Please correct the errors below</p>

-{% endif %}

+{% extends "base.html" %}
+
+{% block content %}
+
+<h2>Troggle profile selection page</h2>
+
+Hello, {{ user }}.
+
+<br /><br />
+
+{% if user.person %}
+This is where you go to associate a new user account with a pre-existing profile from old expo data.
+
+<br /><br />
+
+However, you already have a profile- your name should be {{user.person.first_name}} {{user.person.last_name}}. If you don't believe me, go see it at: <br /><br /> <a href= {{ user.person.get_absolute_url }}> {{ user.person.get_absolute_url }} </a> <br /><br /> or edit it at:
+<br /><br /> <a href= {{ user.person.get_admin_url }}> {{ user.person.get_admin_url }} </a>.<br /><br />
+
+If your account is associated with the wrong person's profile due to inebriation or incompetance during account setup, click <a href="{{ user.person.get_absolute_url }}/?clear_profile=True">here</a> to dissasociate your profile from your user account.
+
+{% else %}
+
+You have an account in the system, but no profile. If you have been on expo before, please choose yourself from the list below.
+<br /><br />
+
+<form method="post">
+{{ form.as_p }}
+<input name="" type="submit" value="This is me!" />
+</form>
+<br />
+
+Yes, you could choose the wrong person if you want. That would be lame. Instead, do something that's actually funny. For example, fry a random object or maybe take some mac and cheese somewhere it doesn't usually get to go. Perhaps you can start a new tradition of laminating the expo leader.
+
+
+{% endif %}
+
+{% if form.errors %}
+ <p class="errornote">Please correct the errors below</p>
+{% endif %}
 {% endblock %}
\ No newline at end of file