Commits

Luke Plant committed 8bc0e13

tabs to spaces in HTML templates, and associated fixups

Comments (0)

Files changed (39)

templates/404.html

 {% extends "cciw/base.html" %}
 {% block title %}CCIW: Page Not Found{% endblock %}
 {% block main %}
-	<div id="mainbase">
-		<div id="pageTitle">
-			<h1>404: Page Not Found</h1>
-		</div>
-		<div id="contentBody">
-			<p>The page at this address has not been found.
-			If you arrived at this page from another link
-			within the website, the web master will have been notified
-			of the problem.  Otherwise, if you think the page
-			should be here, please notify the web master.</p>
-			{% block content %}
-			{% endblock %}
-		</div>
-	</div>
+  <div id="mainbase">
+    <div id="pageTitle">
+      <h1>404: Page Not Found</h1>
+    </div>
+    <div id="contentBody">
+      <p>The page at this address has not been found.
+      If you arrived at this page from another link
+      within the website, the web master will have been notified
+      of the problem.  Otherwise, if you think the page
+      should be here, please notify the web master.</p>
+      {% block content %}
+      {% endblock %}
+    </div>
+  </div>
 {% endblock %}

templates/500.html

         <div id="branding">
 
 <div id="header2">
-	<div id="headerlogo">
-	  <div id="helplink"><a href="mailto:webmaster@cciw.co.uk">Help</a></div>
-	</div>
+  <div id="headerlogo">
+    <div id="helplink"><a href="mailto:webmaster@cciw.co.uk">Help</a></div>
+  </div>
 </div>
 
         </div>

templates/admin/base_site.html

 {% endblock %}
 {% block branding %}
 <div id="header2">
-	<div id="headerlogo">
-	  <div id="helplink"><a href="mailto:webmaster@cciw.co.uk">Help</a></div>
-	</div>
+  <div id="headerlogo">
+    <div id="helplink"><a href="mailto:webmaster@cciw.co.uk">Help</a></div>
+  </div>
 </div>
 {% endblock %}
 {% block userlinks %}<a href="/officers/">Officer homepage</a> / <a href="/admin/password_change/">Change password</a> / <a href="/admin/logout/">Log out</a>{% endblock %}

templates/cciw/awards/index.html

 which is a list of 'Award' objects
 {% endcomment %}
 {% block content %}
-	{% for award in object_list %}
-		<h2><a name="{{ award.nice_name|slugify }}">{{award.nice_name}}</a></h2>
-		<div class="awardDescription">
-		<img src="{{ award.imageurl }}" alt="{{ award.nice_name }} image" />  {{award.description}}
-		</div>
-		<div class="awardList">
+  {% for award in object_list %}
+    <h2><a name="{{ award.nice_name|slugify }}">{{award.nice_name}}</a></h2>
+    <div class="awardDescription">
+    <img src="{{ award.imageurl }}" alt="{{ award.nice_name }} image" />  {{award.description}}
+    </div>
+    <div class="awardList">
                 {% with award.personal_awards.all as pawards %}
                 {% if pawards %}
-			<p>Awarded to:</p>
-			<ul>
-			{% for paward in pawards %}
-				<li>{{ paward.member.get_link }}
-					{% if paward.date_awarded %}, on {{ paward.date_awarded|date:"d M Y" }} {% endif %}
-				for:<br/> {{ paward.reason }}</li>
-			{% endfor %}
-			</ul>
-		
-		{% else %}
-			<p>Not awarded to anyone yet.</p>
-		{% endif %}
+      <p>Awarded to:</p>
+      <ul>
+      {% for paward in pawards %}
+        <li>{{ paward.member.get_link }}
+          {% if paward.date_awarded %}, on {{ paward.date_awarded|date:"d M Y" }} {% endif %}
+        for:<br/> {{ paward.reason }}</li>
+      {% endfor %}
+      </ul>
+    
+    {% else %}
+      <p>Not awarded to anyone yet.</p>
+    {% endif %}
                 {% endwith %}
-		</div>
-	{% endfor %}
+    </div>
+  {% endfor %}
 {% endblock %}

templates/cciw/base.html

   </div>
 </div>
 {% block main %}
-	<div id="mainbase">
-		<div id="pageTitle">
-			<h1>{{ title }}</h1>
-		</div>
-		<div id="contentBody">
-			{% block content %}
-			{% endblock %}
-		</div>
-	</div>
+  <div id="mainbase">
+    <div id="pageTitle">
+      <h1>{{ title }}</h1>
+    </div>
+    <div id="contentBody">
+      {% block content %}
+      {% endblock %}
+    </div>
+  </div>
 {% endblock %}
 
     <!--[if lte IE 6]>

templates/cciw/bookings/index.html

 
 
     <div><a href="{{ MEDIA_URL }}{{ bookingform }}">Download the CCIW
-	booking form for {{ thisyear }}</a> </div>
+        booking form for {{ thisyear }}</a> </div>
 
     <p><br/>The completed booking form must be sent to:</p>
 

templates/cciw/camps/detail.html

 {% load url from future %}
 
 {% block content %}
-	<br/>
+  <br/>
 {% if camp.is_past %}
-	<h2>Links</h2>
-	<ul>
-		<li><a href="{{ camp.get_absolute_url }}forum/">Forum</a></li>
-		<li><a href="{{ camp.get_absolute_url }}photos/">Photos</a></li>
-	</ul>
+  <h2>Links</h2>
+  <ul>
+    <li><a href="{{ camp.get_absolute_url }}forum/">Forum</a></li>
+    <li><a href="{{ camp.get_absolute_url }}photos/">Photos</a></li>
+  </ul>
 {% endif %}
 <h2>Information</h2>
 <table class="sideheaders">
-	<tr>
-		<th scope="row">Location:</th>
-		<td><a href="{{ camp.site.get_absolute_url }}">{{ camp.site.short_name }}</a></td>
-	</tr>
-	<tr>
-		<th scope="row">Date:</th>
-		<td>{{ camp.start_date|date:"d M"}} - {{ camp.end_date|date:"d M Y" }}</td>
-	</tr>
-	<tr>
-		<th scope="row">Age:</th>
-		<td>{{ camp.age }}</td>
-	</tr>
-	{% if camp.next_camps.all %}
-	<tr>
-		<th scope="row">Following camp:</th>
-		<td>
-			{% for next_camp in camp.next_camps.all %}
-				{{ next_camp.get_link }}<br/>
-			{% endfor %}
-		</td>
-	</tr>
-	{% endif %}
-	{% if camp.previous_camp %}
-	<tr>
-		<th scope="row">Previous camp:</th>
-		<td>
-			{{ camp.previous_camp.get_link }}
-		</td>
-	</tr>
-	{% endif %}
-	<tr>
-		<th scope="row">Leaders:</th>
-		<td>
-			<ul class="leaderlist">
-				{% for leader in camp.leaders.all %}
-					<li>{{ leader.name }}:<br/>
-					{{ leader.info|escape|linebreaksbr }}</li>
-				{% endfor %}
-                                {% if camp.chaplain %}
-                                        <li>{{ camp.chaplain.name }}:<br/>
-        				{{ camp.chaplain.info|escape|linebreaksbr }}</li>
-                                {% endif %}
-			</ul>
-		</td>
-	</tr>
-        {% if camp.year == thisyear and camp.is_booking_open %}
-        <tr>
-               <th scope="row">Places:</th>
-               <td>
-                 {% with total=camp.get_places_left.0 %}
-                 {% if total > 0 %}
-                     {{ total }} places still available:<br/><br/> <a class="booknow" href="{% url 'cciw.bookings.views.start' %}">Book online now!</a><br/><br/>
-                     <a href="{% url 'cciw.bookings.views.index' %}">See other booking options and prices</a>
-                 {% else %}
-                     No more places available on this camp, sorry.
-                 {% endif %}
-                 {% endwith %}
-               </td>
-        </tr>
+  <tr>
+    <th scope="row">Location:</th>
+    <td><a href="{{ camp.site.get_absolute_url }}">{{ camp.site.short_name }}</a></td>
+  </tr>
+  <tr>
+    <th scope="row">Date:</th>
+    <td>{{ camp.start_date|date:"d M"}} - {{ camp.end_date|date:"d M Y" }}</td>
+  </tr>
+  <tr>
+    <th scope="row">Age:</th>
+    <td>{{ camp.age }}</td>
+  </tr>
+  {% if camp.next_camps.all %}
+  <tr>
+    <th scope="row">Following camp:</th>
+    <td>
+      {% for next_camp in camp.next_camps.all %}
+        {{ next_camp.get_link }}<br/>
+      {% endfor %}
+    </td>
+  </tr>
+  {% endif %}
+  {% if camp.previous_camp %}
+  <tr>
+    <th scope="row">Previous camp:</th>
+    <td>
+      {{ camp.previous_camp.get_link }}
+    </td>
+  </tr>
+  {% endif %}
+  <tr>
+    <th scope="row">Leaders:</th>
+    <td>
+      <ul class="leaderlist">
+        {% for leader in camp.leaders.all %}
+          <li>{{ leader.name }}:<br/>
+          {{ leader.info|escape|linebreaksbr }}
+          </li>
+        {% endfor %}
+        {% if camp.chaplain %}
+          <li>{{ camp.chaplain.name }}:<br/>
+            {{ camp.chaplain.info|escape|linebreaksbr }}</li>
         {% endif %}
+      </ul>
+    </td>
+  </tr>
+  {% if camp.year == thisyear and camp.is_booking_open %}
+  <tr>
+    <th scope="row">Places:</th>
+    <td>
+      {% with total=camp.get_places_left.0 %}
+      {% if total > 0 %}
+      {{ total }} places still available:<br/><br/> <a class="booknow" href="{% url 'cciw.bookings.views.start' %}">Book online now!</a><br/><br/>
+      <a href="{% url 'cciw.bookings.views.index' %}">See other booking options and prices</a>
+      {% else %}
+      No more places available on this camp, sorry.
+      {% endif %}
+      {% endwith %}
+    </td>
+  </tr>
+  {% endif %}
 </table>
 {% endblock %}

templates/cciw/camps/index.html

 
 {% regroup camps by year as grouped %}
 {% for yeargroup in grouped %}
-	<h2><a name="year{{ yeargroup.grouper }}">{{ yeargroup.grouper }}</a></h2>
-	<div><a href="/camps/{{ yeargroup.grouper }}/all/forum/">General forum</a></div>
-	<ul class="camplist">
-		{% for camp in yeargroup.list %}
-			<li><a href="{{ camp.get_absolute_url }}" title="{{ camp.nice_name }}">
-				Camp {{ camp.number }}</a>,
-				led by {{ camp.leaders.all|join:", " }}, 
-				chaplain {{ camp.chaplain }}
-				<ul>
-					<li><a href="{{ camp.get_absolute_url }}forum/" 
-						title="Message board for {{ camp.nice_name }}">Forum</a></li>
-					<li><a href="{{ camp.get_absolute_url }}photos/"
-						title="Photo gallery for {{ camp.nice_name }}">Photos</a></li>
-				</ul>
-			</li>
-		{% endfor %}
-	</ul>
+  <h2><a name="year{{ yeargroup.grouper }}">{{ yeargroup.grouper }}</a></h2>
+  <div><a href="/camps/{{ yeargroup.grouper }}/all/forum/">General forum</a></div>
+  <ul class="camplist">
+    {% for camp in yeargroup.list %}
+      <li><a href="{{ camp.get_absolute_url }}" title="{{ camp.nice_name }}">
+        Camp {{ camp.number }}</a>,
+        led by {{ camp.leaders.all|join:", " }}, 
+        chaplain {{ camp.chaplain }}
+        <ul>
+          <li><a href="{{ camp.get_absolute_url }}forum/" 
+            title="Message board for {{ camp.nice_name }}">Forum</a></li>
+          <li><a href="{{ camp.get_absolute_url }}photos/"
+            title="Photo gallery for {{ camp.nice_name }}">Photos</a></li>
+        </ul>
+      </li>
+    {% endfor %}
+  </ul>
 {% endfor %}
 {% if show_ancient %}
 <h2><a name="year1999">Pre-CCIW: 1999</a></h2>
 <ul>
-	<li><a href="/camps/1999/tywyn_site/photos/" title="Photos for pre-CCIW camps on the Tywyn site">Tywyn site</a></li>
-	<li><a href="/camps/1999/llys_andreas_site/photos/" title="Photos for pre-CCIW camps on the Llys Andreas site">Llys Andreas site</a></li>
+  <li><a href="/camps/1999/tywyn_site/photos/" title="Photos for pre-CCIW camps on the Tywyn site">Tywyn site</a></li>
+  <li><a href="/camps/1999/llys_andreas_site/photos/" title="Photos for pre-CCIW camps on the Llys Andreas site">Llys Andreas site</a></li>
 </ul>
 
 <h2><a name="yearancient">Pre-CCIW: Ancient</a></h2>
 <ul>
-	<li><a href="/camps/ancient/misc_sites/photos/" title="Really old photos on various sites">Misc sites</a></li>
+  <li><a href="/camps/ancient/misc_sites/photos/" title="Really old photos on various sites">Misc sites</a></li>
 </ul>
 {% endif %}
 

templates/cciw/camps/thisyear.html

 {% extends "cciw/standard.html" %}
 {% load standardpage %}
 {% block content %}
-	{% if camps %}
-		{% htmlchunk camp_dates_intro_text %}
-		<h2>Dates</h2>
-		<div>
-		<table class="topheaders" summary="Details of all camps running in {{ thisyear }}">
-			<thead>
-			<tr>
-				<th scope="col" abbr="Num">#</th>
-				<th scope="col">Age</th>
-				<th scope="col">Dates</th>
-				<th scope="col">Leaders</th>
-				<th scope="col">Chaplain</th>
-			</tr>
-			</thead>
-				<tbody>
-			{% regroup camps by site_id as campgroups %}
-			{% for campgroup in campgroups %}
-					<tr>
-						<th scope="rowgroup" colspan="5" class="siteDivision">
-						<a href="{{ campgroup.list.0.site.get_absolute_url }}">{{ campgroup.list.0.site }}</a>
-						</th>
-					</tr>
-				
+  {% if camps %}
+    {% htmlchunk camp_dates_intro_text %}
+    <h2>Dates</h2>
+    <div>
+    <table class="topheaders" summary="Details of all camps running in {{ thisyear }}">
+      <thead>
+      <tr>
+        <th scope="col" abbr="Num">#</th>
+        <th scope="col">Age</th>
+        <th scope="col">Dates</th>
+        <th scope="col">Leaders</th>
+        <th scope="col">Chaplain</th>
+      </tr>
+      </thead>
+        <tbody>
+      {% regroup camps by site_id as campgroups %}
+      {% for campgroup in campgroups %}
+          <tr>
+            <th scope="rowgroup" colspan="5" class="siteDivision">
+            <a href="{{ campgroup.list.0.site.get_absolute_url }}">{{ campgroup.list.0.site }}</a>
+            </th>
+          </tr>
+        
 
-					{% for camp in campgroup.list %}
-					<tr>
-						<td><a href="{{ camp.get_absolute_url }}" 
-							title="{{ camp.nice_name }}">{{ camp.number }}</a></td>
-						<td>{{ camp.age	}}</td>
-						<td>{{ camp.start_date|date:"d M"}} - {{ camp.end_date|date:"d M" }}</td>
-						<td><a href="{{ camp.get_absolute_url }}" title="{{ camp.nice_name }}">{{ camp.leaders.all|join:", " }}</a></td>
-						<td>{% if camp.chaplain %}{{ camp.chaplain }}{% else %}TBA{% endif %}</td>
-					</tr>
-					{% endfor %}
-			{% endfor %}
-				</tbody>
-		</table>
-		</div>
-		{% htmlchunk camp_dates_outro_text %}
-	{% else %}
-	<p>Information for camps in {{thisyear}} is not yet available.</p>
-	{% endif %}
+          {% for camp in campgroup.list %}
+          <tr>
+            <td><a href="{{ camp.get_absolute_url }}" 
+              title="{{ camp.nice_name }}">{{ camp.number }}</a></td>
+            <td>{{ camp.age  }}</td>
+            <td>{{ camp.start_date|date:"d M"}} - {{ camp.end_date|date:"d M" }}</td>
+            <td><a href="{{ camp.get_absolute_url }}" title="{{ camp.nice_name }}">{{ camp.leaders.all|join:", " }}</a></td>
+            <td>{% if camp.chaplain %}{{ camp.chaplain }}{% else %}TBA{% endif %}</td>
+          </tr>
+          {% endfor %}
+      {% endfor %}
+        </tbody>
+    </table>
+    </div>
+    {% htmlchunk camp_dates_outro_text %}
+  {% else %}
+  <p>Information for camps in {{thisyear}} is not yet available.</p>
+  {% endif %}
 
 
 {% endblock %}

templates/cciw/errors.html

 
-	{% if errors %}
-		<div class="userError">
-		Please check your input:
-		<ul>
-		{% for error in errors %}
-			<li>{{ error }}</li>
-		{% endfor %}
-		</ul>
-		</div>
-	{% endif %}	
+  {% if errors %}
+    <div class="userError">
+    Please check your input:
+    <ul>
+    {% for error in errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+    </div>
+  {% endif %}  

templates/cciw/forums/add_news.html

 {% extends "cciw/standard.html" %}
 {% block content %}
-	{% if message %}
-	<p>{{ message }}</p>
-	{% endif %}
+  {% if message %}
+  <p>{{ message }}</p>
+  {% endif %}
 
-	{% if show_form %}
-	<p>Enter the subject and body of the news item.</p>
-	<form action="#messageform" method="post">{% csrf_token %}
-		{% include "cciw/errors.html" %}
-		{% include "cciw/msgpreview.html" %}
-		{% if preview %}
-			<p>Make any changes below, and choose
-			'Preview' again or 'Post'.</p>
-		{% endif %}
-		<table class="simpleform">
-			<tr>
-				<th scope="row">Subject:</th>
-				<td><input type="text" size="50" name="subject" value="{{ subject_text }}" /></td>
-			</tr>
-			<tr>
-				<th scope="row">Body of news item:</th>
-				<td>
-					{% include "cciw/message.html" %}
-				</td>
-			</tr>
-		</table>
-		<div>
-		<br/><input type="submit" name="preview" value="Preview"/>&nbsp;
-		<input type="submit" name="post" value="Post" />
-		</div>
-	</form>
-	{% endif %}
+  {% if show_form %}
+  <p>Enter the subject and body of the news item.</p>
+  <form action="#messageform" method="post">{% csrf_token %}
+    {% include "cciw/errors.html" %}
+    {% include "cciw/msgpreview.html" %}
+    {% if preview %}
+      <p>Make any changes below, and choose
+      'Preview' again or 'Post'.</p>
+    {% endif %}
+    <table class="simpleform">
+      <tr>
+        <th scope="row">Subject:</th>
+        <td><input type="text" size="50" name="subject" value="{{ subject_text }}" /></td>
+      </tr>
+      <tr>
+        <th scope="row">Body of news item:</th>
+        <td>
+          {% include "cciw/message.html" %}
+        </td>
+      </tr>
+    </table>
+    <div>
+    <br/><input type="submit" name="preview" value="Preview"/>&nbsp;
+    <input type="submit" name="post" value="Post" />
+    </div>
+  </form>
+  {% endif %}
 {% endblock %}

templates/cciw/forums/add_topic.html

 {% extends "cciw/standard.html" %}
 {% block content %}
-	{% if message %}
-	<p>{{ message }}</p>
-	{% endif %}
+  {% if message %}
+  <p>{{ message }}</p>
+  {% endif %}
 
-	{% if show_form %}
-	<p>Enter the subject and the first post of the new topic below.</p>
-	<form action="#messageform" method="post">{% csrf_token %}
-		{% include "cciw/errors.html" %}
-		{% include "cciw/msgpreview.html" %}
-		{% if preview %}
-			<p>Make any changes below, and choose
-			'Preview' again or 'Post'.</p>
-		{% endif %}
-		<table class="simpleform">
-			<tr>
-				<th scope="row">Subject:</th>
-				<td><input type="text" size="50" name="subject" value="{{ subject_text }}" /></td>
-			</tr>
-			<tr>
-				<th scope="row">Message:</th>
-				<td>
-					{% include "cciw/message.html" %}
-				</td>
-			</tr>
-		</table>
-		<div>
-		<br/><input type="submit" name="preview" value="Preview"/>&nbsp;
-		<input type="submit" name="post" value="Post" />
-		</div>
-	</form>
-	{% endif %}
+  {% if show_form %}
+  <p>Enter the subject and the first post of the new topic below.</p>
+  <form action="#messageform" method="post">{% csrf_token %}
+    {% include "cciw/errors.html" %}
+    {% include "cciw/msgpreview.html" %}
+    {% if preview %}
+      <p>Make any changes below, and choose
+      'Preview' again or 'Post'.</p>
+    {% endif %}
+    <table class="simpleform">
+      <tr>
+        <th scope="row">Subject:</th>
+        <td><input type="text" size="50" name="subject" value="{{ subject_text }}" /></td>
+      </tr>
+      <tr>
+        <th scope="row">Message:</th>
+        <td>
+          {% include "cciw/message.html" %}
+        </td>
+      </tr>
+    </table>
+    <div>
+    <br/><input type="submit" name="preview" value="Preview"/>&nbsp;
+    <input type="submit" name="post" value="Post" />
+    </div>
+  </form>
+  {% endif %}
 {% endblock %}

templates/cciw/forums/edit_poll.html

 {% endif %}
 
 {% if form.errors %}
-	<div class="userError">
-	Please check your input:
-	</div>
+  <div class="userError">
+    Please check your input:
+  </div>
 {% endif %}
 
 <form action="" method="post" id="editpollform" class="ajaxify">{% csrf_token %}

templates/cciw/forums/newsindex.html

 
 {% block breadcrumb %}{% endblock %}
 {% block content %}
-	{% if object_list %}
-		{% for topic in object_list %}
-			<div class="newsItem">
-				<h2>{{ topic.news_item.subject }}</h2>
-				<div class="newsItemDetails">Posted: {{ topic.news_item.created_at|date:"d M Y, H:i" }}, 
-				by {{ topic.news_item.created_by.get_link }}</div>
-				<div class="newsItemSummary">
-				{{ topic.news_item.summary|bb2html }}
-				</div>
-				
-				{% if topic.news_item.has_full_item %}
-				<div class="newsItemReadMore"><a href="{{ topic.get_absolute_url }}" 
-				title="Read full article '{{ topic.news_item.subject }}'" >Read more</a></div>
-				{% endif %}
+  {% if object_list %}
+    {% for topic in object_list %}
+      <div class="newsItem">
+        <h2>{{ topic.news_item.subject }}</h2>
+        <div class="newsItemDetails">Posted: {{ topic.news_item.created_at|date:"d M Y, H:i" }}, 
+        by {{ topic.news_item.created_by.get_link }}</div>
+        <div class="newsItemSummary">
+        {{ topic.news_item.summary|bb2html }}
+        </div>
+        
+        {% if topic.news_item.has_full_item %}
+        <div class="newsItemReadMore"><a href="{{ topic.get_absolute_url }}" 
+        title="Read full article '{{ topic.news_item.subject }}'" >Read more</a></div>
+        {% endif %}
 
-			</div>
-		{% endfor %}
-		<div class="paging">{% paging_control %}</div>
-	{% else %}
-		<p>There are no news items yet.</p>
-	{% endif %}
+      </div>
+    {% endfor %}
+    <div class="paging">{% paging_control %}</div>
+  {% else %}
+    <p>There are no news items yet.</p>
+  {% endif %}
 
 {% endblock %} 

templates/cciw/forums/photo.html

 {% extends "cciw/forums/thread.html" %}
 
 {% block thread_top %}
-	<div class="photo">
-		{% if current_member %}
-		<img class="photo" src="{{ MEDIA_URL }}photos/real/{{ photo.filename }}" alt="Photo {{ photo.filename }}" />
-		{% else %}
-		<img class="photo" src="{{ MEDIA_URL }}photos/thumbnails/{{ photo.filename }}" alt="Photo {{ photo.filename }}" />
-		<br/><span class="note">You must be logged in to see full images</span>
-		{% endif %}
-	</div>
+  <div class="photo">
+    {% if current_member %}
+    <img class="photo" src="{{ MEDIA_URL }}photos/real/{{ photo.filename }}" alt="Photo {{ photo.filename }}" />
+    {% else %}
+    <img class="photo" src="{{ MEDIA_URL }}photos/thumbnails/{{ photo.filename }}" alt="Photo {{ photo.filename }}" />
+    <br/><span class="note">You must be logged in to see full images</span>
+    {% endif %}
+  </div>
 {% endblock %} 
 
 {% block thread_bottom %}
-	<div class='bottombreadcrumb'>{{ breadcrumb }}</div>
+  <div class='bottombreadcrumb'>{{ breadcrumb }}</div>
 {% endblock %} 

templates/cciw/forums/photoindex.html

 {% load standardpage %}
 {% load view_extras %}
 {% block content %}
-	<p>Click on the photo thumbnail to see the full image and comments.</p>
-	{% if object_list %}
-		<div class="paging">{% paging_control %}</div>
-		<table class="topheaders">
-			<tr>
-				<th scope="col" class="photoDateAddedCol">Date added {% sorting_control "aca" "dca" "Click to sort by date added, oldest first" "Click to sort by date added, newest first" %}</th>
-				<th scope="col">Thumbnail</th>
-				<th scope="col">Description/Tags</th>
-				<th scope="col">Posts {% sorting_control "apc" "dpc" "Sort by number of posts ascending" "Sort by number of posts descending"%}</th>
-				<th scope="col" class="photoLastPostCol">Last comment {% sorting_control "alp" "dlp" "Click to sort by date of last post, oldest first" "Click to sort by date of last post, newest first" %}</th>
-			</tr>
-		{% for photo in object_list %}
-			<tr>
-				<td>{% if photo.created_at %}{{ photo.created_at|date:"d M Y H:i" }}{% endif %}</td>
-				<td class="photoCol"><a href="{{ photo.get_absolute_url }}"><img class="photoThumbnail" src="{{ MEDIA_URL }}photos/thumbnails/{{ photo.filename }}" alt="Photo {{ photo.filename }}" /></a>
-				</td>
-				<td>{{ photo.description }}
-				</td>
-				<td>{{ photo.post_count }}</td>
-				<td>{% if photo.last_post_at %}{{ photo.last_post_at|date:"d M Y H:i" }}<br/>{% endif %}
-				    {% if photo.last_post_by_id %}{{ photo.last_post_by.get_link }}{% endif %}</td>
-			</tr>
-		{% endfor %}
-		</table>
-		<div class="paging">{% paging_control %}</div>
-	{% else %}
-		<p>There are no photos yet in this gallery.</p>
-	{% endif %}
+  <p>Click on the photo thumbnail to see the full image and comments.</p>
+  {% if object_list %}
+    <div class="paging">{% paging_control %}</div>
+    <table class="topheaders">
+      <tr>
+        <th scope="col" class="photoDateAddedCol">Date added {% sorting_control "aca" "dca" "Click to sort by date added, oldest first" "Click to sort by date added, newest first" %}</th>
+        <th scope="col">Thumbnail</th>
+        <th scope="col">Description/Tags</th>
+        <th scope="col">Posts {% sorting_control "apc" "dpc" "Sort by number of posts ascending" "Sort by number of posts descending"%}</th>
+        <th scope="col" class="photoLastPostCol">Last comment {% sorting_control "alp" "dlp" "Click to sort by date of last post, oldest first" "Click to sort by date of last post, newest first" %}</th>
+      </tr>
+    {% for photo in object_list %}
+      <tr>
+        <td>{% if photo.created_at %}{{ photo.created_at|date:"d M Y H:i" }}{% endif %}</td>
+        <td class="photoCol"><a href="{{ photo.get_absolute_url }}"><img class="photoThumbnail" src="{{ MEDIA_URL }}photos/thumbnails/{{ photo.filename }}" alt="Photo {{ photo.filename }}" /></a>
+        </td>
+        <td>{{ photo.description }}
+        </td>
+        <td>{{ photo.post_count }}</td>
+        <td>{% if photo.last_post_at %}{{ photo.last_post_at|date:"d M Y H:i" }}<br/>{% endif %}
+            {% if photo.last_post_by_id %}{{ photo.last_post_by.get_link }}{% endif %}</td>
+      </tr>
+    {% endfor %}
+    </table>
+    <div class="paging">{% paging_control %}</div>
+  {% else %}
+    <p>There are no photos yet in this gallery.</p>
+  {% endif %}
 
 {% endblock %} 

templates/cciw/forums/poll_vote_box.html

 {% load forums %}
 {% if show_form %}
 <div class="pollVoteBox">
-	<form action="{{ action_url }}" method="post">{% csrf_token %}
-	<div><h{{ heading_level }}>{{ poll.title }}</h{{ heading_level }}>
-	{{ poll.intro_text|bb2html }}
-	<ul>
-	{% for polloption in poll.poll_options.all %}
-		<li
-			><input type="radio" id="poll_{{ topic.poll_id }}_{{ polloption.id }}" name="polloption" value="{{ polloption.id }}" 
-			/>&nbsp; <label for="poll_{{ topic.poll_id }}_{{ polloption.id }}">{{ polloption.text|bb2html }}</label
-		></li>
-	{% endfor %}
-	</ul>
-	{{ poll.outro_text|bb2html }}
-	<div>
-		<input type="submit" name="vote" value="Vote" />
-	</div>
-	</div>
-	</form>
+  <form action="{{ action_url }}" method="post">{% csrf_token %}
+  <div><h{{ heading_level }}>{{ poll.title }}</h{{ heading_level }}>
+  {{ poll.intro_text|bb2html }}
+  <ul>
+  {% for polloption in poll.poll_options.all %}
+    <li
+      ><input type="radio" id="poll_{{ topic.poll_id }}_{{ polloption.id }}" name="polloption" value="{{ polloption.id }}" 
+      />&nbsp; <label for="poll_{{ topic.poll_id }}_{{ polloption.id }}">{{ polloption.text|bb2html }}</label
+    ></li>
+  {% endfor %}
+  </ul>
+  {{ poll.outro_text|bb2html }}
+  <div>
+    <input type="submit" name="vote" value="Vote" />
+  </div>
+  </div>
+  </form>
 </div>
 {% else %}
 <div>
-	{% if message %}<div>{{ message }}</div>{% endif %}
-	{% if login_link %}&laquo; <a href="{{ login_link }}">Log in to vote</a> &raquo;{% endif %}
+  {% if message %}<div>{{ message }}</div>{% endif %}
+  {% if login_link %}&laquo; <a href="{{ login_link }}">Log in to vote</a> &raquo;{% endif %}
 </div>
 {% endif %}

templates/cciw/forums/posts.html

 {% block content %}
 {% if object_list %}
 {% for post in object_list %}
-	<div class="individualPost">
-		<div class="postHeader">
-		{% ifchanged %}
-			<h2>
-			{% if post.topic_id %}{% if post.is_parent_visible %}In topic <a href="{{ post.topic.get_absolute_url }}">{{ post.topic.subject }}</a>:{% else %}In a hidden topic:{% endif %}{% endif %}
-			{% if post.photo_id %}On photo <a href="{{ post.photo.get_absolute_url }}">{{ post.photo.id }}</a>:{% endif %}
-			</h2>
-		{% endifchanged %}
-		From {{ post.posted_by.get_link }}, at {{ post.posted_at|date:"d M y, H:i" }}{% if post.is_parent_visible %} &mdash; <span class="readmore"><a href="{{ post.get_absolute_url }}">view in context</a></span>{% endif %}:
-		</div>
-		<div class="postMessage">
-		{% if post.subject %}<div class="postSubject">{{ post.subject|bb2html }}</div>{% endif %}
-		{{ post.message|bb2html }}
-		</div>
-		
-	</div>
+  <div class="individualPost">
+    <div class="postHeader">
+    {% ifchanged %}
+      <h2>
+      {% if post.topic_id %}{% if post.is_parent_visible %}In topic <a href="{{ post.topic.get_absolute_url }}">{{ post.topic.subject }}</a>:{% else %}In a hidden topic:{% endif %}{% endif %}
+      {% if post.photo_id %}On photo <a href="{{ post.photo.get_absolute_url }}">{{ post.photo.id }}</a>:{% endif %}
+      </h2>
+    {% endifchanged %}
+    From {{ post.posted_by.get_link }}, at {{ post.posted_at|date:"d M y, H:i" }}{% if post.is_parent_visible %} &mdash; <span class="readmore"><a href="{{ post.get_absolute_url }}">view in context</a></span>{% endif %}:
+    </div>
+    <div class="postMessage">
+    {% if post.subject %}<div class="postSubject">{{ post.subject|bb2html }}</div>{% endif %}
+    {{ post.message|bb2html }}
+    </div>
+    
+  </div>
 {% endfor %}
 {% else %}
-	<p>No posts found.</p>
+  <p>No posts found.</p>
 {% endif %}
 <div class="paging">{% paging_control %}</div>
 {% endblock %}

templates/cciw/forums/thread.html

 {% load forums %}
 {% load url from future %}
 {% block content %}
-	{% block thread_top %}{% endblock %}
+  {% block thread_top %}{% endblock %}
 
-	<div class="paging"><a name="comments"></a>{% paging_control #comments %}</div>
-	<table class="topheaders">
-		<tr>
-		{% if news_item or photo or poll %}
-			<th class="commentHeader" colspan="2">
-			Comments
-			</th>
-		{% else %}
-			{% if topic %}
-				<th class="topicSubject" colspan="2">
-				<h2>{{ topic.subject }}</h2></th>
-			{% endif %}
-		{% endif %}
-		</tr>
-		<tr>
-			<th scope="col" class="postFromCol">From</th>
-			<th scope="col">Message</th>
-		</tr>
-		{% if object_list %}
-			{% for post in object_list %}
-			<tr>
-				<td class="postFrom">
-					<span class="postMemberIcon">{{ post.posted_by.get_icon }}</span>
-					{{ post.posted_by.get_link }}<br/>
-					<span class="postDate">{% if post.posted_at %}{{ post.posted_at|date:"d M y, H:i" }}{% endif %}</span>
-					{% if post.hidden %}
-						{% if moderator %}
-							<br/><span class="postHiddenMsg">HIDDEN</span>
-						{% else %}
-							<br/><span class="postHiddenMsg">HIDDEN</span> (awaiting moderator approval)
-						{% endif %}
-					{% endif %}
-					{% if moderator %}&nbsp;<span class="editPost"><a href="{% url 'admin:forums_post_change' post.id %}" title="Edit this post" ><img width="16" height="16" src="{% static "images/edit.png" %}" alt="Edit this post" /></a></span>
-					{% endif %}
-				</td>
-				<td class="postMessage" id="id{{ post.id }}">
-					{% if post.subject %}<div class="postSubject">{{ post.subject }}</div>{% endif %}
-					{{ post.message|bb2html }}
-				</td>
-			</tr>
-			{% endfor %}
-		{% else %}
-			<tr>
-				<td  colspan="2">There are no posts yet here.</td>
-			</tr>
-		{% endif %}
-	</table>
-	<div class="paging">{% paging_control #comments %}</div>
+  <div class="paging"><a name="comments"></a>{% paging_control #comments %}</div>
+  <table class="topheaders">
+    <tr>
+    {% if news_item or photo or poll %}
+      <th class="commentHeader" colspan="2">
+      Comments
+      </th>
+    {% else %}
+      {% if topic %}
+        <th class="topicSubject" colspan="2">
+        <h2>{{ topic.subject }}</h2></th>
+      {% endif %}
+    {% endif %}
+    </tr>
+    <tr>
+      <th scope="col" class="postFromCol">From</th>
+      <th scope="col">Message</th>
+    </tr>
+    {% if object_list %}
+      {% for post in object_list %}
+      <tr>
+        <td class="postFrom">
+          <span class="postMemberIcon">{{ post.posted_by.get_icon }}</span>
+          {{ post.posted_by.get_link }}<br/>
+          <span class="postDate">{% if post.posted_at %}{{ post.posted_at|date:"d M y, H:i" }}{% endif %}</span>
+          {% if post.hidden %}
+            {% if moderator %}
+              <br/><span class="postHiddenMsg">HIDDEN</span>
+            {% else %}
+              <br/><span class="postHiddenMsg">HIDDEN</span> (awaiting moderator approval)
+            {% endif %}
+          {% endif %}
+          {% if moderator %}&nbsp;<span class="editPost"><a href="{% url 'admin:forums_post_change' post.id %}" title="Edit this post" ><img width="16" height="16" src="{% static "images/edit.png" %}" alt="Edit this post" /></a></span>
+          {% endif %}
+        </td>
+        <td class="postMessage" id="id{{ post.id }}">
+          {% if post.subject %}<div class="postSubject">{{ post.subject }}</div>{% endif %}
+          {{ post.message|bb2html }}
+        </td>
+      </tr>
+      {% endfor %}
+    {% else %}
+      <tr>
+        <td  colspan="2">There are no posts yet here.</td>
+      </tr>
+    {% endif %}
+  </table>
+  <div class="paging">{% paging_control #comments %}</div>
 <script type="text/javascript">
 <!--
 (function($) {
 })(jQuery);
 //-->
 </script>
-	
-	{% if show_message_form %}
-		{% if not has_next %}
-			<form action="#messageform" method="post">{% csrf_token %}
-			<h2 id="messageform">Add message:</h2>
-			{% include "cciw/errors.html" %}
-			{% include "cciw/msgpreview.html" %}
-			{% if preview %}
-				<p>Make any changes below, and choose
-				'Preview' again or 'Post'.</p>
-			{% endif %}
-			<table class="simpleform">
-				<tr>
-					<th scope="row">Message:</th>
-					<td>
-						{% include "cciw/message.html" %}
-					</td>
-				</tr>
-			</table>
-			<div>
-			<br/><input type="submit" name="preview" value="Preview" id="preview" />&nbsp;
-			<input type="submit" name="post" value="Post" id="post" />
-			</div>
-			</form>
-		{% endif %}
-	{% else %}
-		{% if not has_next %}
-			{% if login_link %}
-				<div><a href="{{ login_link }}">Login to post a
+  
+  {% if show_message_form %}
+    {% if not has_next %}
+      <form action="#messageform" method="post">{% csrf_token %}
+      <h2 id="messageform">Add message:</h2>
+      {% include "cciw/errors.html" %}
+      {% include "cciw/msgpreview.html" %}
+      {% if preview %}
+        <p>Make any changes below, and choose
+        'Preview' again or 'Post'.</p>
+      {% endif %}
+      <table class="simpleform">
+        <tr>
+          <th scope="row">Message:</th>
+          <td>
+            {% include "cciw/message.html" %}
+          </td>
+        </tr>
+      </table>
+      <div>
+      <br/><input type="submit" name="preview" value="Preview" id="preview" />&nbsp;
+      <input type="submit" name="post" value="Post" id="post" />
+      </div>
+      </form>
+    {% endif %}
+  {% else %}
+    {% if not has_next %}
+      {% if login_link %}
+        <div><a href="{{ login_link }}">Login to post a
 message.</a></div>
-			{% endif %}
-		{% endif %}
-	{% endif %}
-	{% block thread_bottom %}{% endblock %}
+      {% endif %}
+    {% endif %}
+  {% endif %}
+  {% block thread_bottom %}{% endblock %}
 {% endblock %}
 

templates/cciw/forums/topic.html

 {% load forums %}
 
 {% block thread_top %}
-	{{ introtext }}
-	{% if news_item %}
-	<br/>
-	<div class="newsItem">
-		<div class="newsItemDetails">Posted: {{ news_item.created_at|date:"d M Y, H:i" }}, 
-		by {{ news_item.created_by.get_link }}</div>
-		<div class="newsItemFull">
-		{% if news_item.full_item %}
-			{{ news_item.full_item|safe|standard_subs }}
-		{% else %}
-			{{ news_item.summary|bb2html }}
-		{% endif %}
-		</div>
-	</div>
-	{% endif %}
-	{% if poll %}
-		{% if show_poll_results %}
-		<div class="pollresults">
-			<h2>{{ poll.title }}</h2>
-			{{ poll.intro_text|bb2html }}
-			<p>Results:</p>
-			<table>
-			{% for polloption in poll.poll_options.all %}
-				<tr>
-					<td>{{ polloption.text|bb2html }}</td>
-					<td>{{ polloption.total }} votes &nbsp;&nbsp;</td>
-					<td>{{ polloption.percentage }}</td>
-					<td><div class="pollBarChartTotal"><div style="width: {{ polloption.bar_width }}px; " class="pollBarChart"></div></div></td>
-				</tr>
-			{% endfor %}
-			</table>
-			{{ poll.outro_text|bb2html }}
-		</div>
-		<br/>
-		{% endif %}
-		{% if voting_errors %}
-			<div class="userError">
-			Vote could not be registered:
-			<ul>
-			{% for error in voting_errors %}
-				<li>{{ error }}</li>
-			{% endfor %}
-			</ul>
-			</div>
-		{% endif %}
-		{% if voting_message %}<p><i>{{ voting_message }}</i></p>{% endif %}
-		
-		{% if show_vote_box %}
-			{% poll_vote_box request topic poll 2 %}
-		{% else %}
-			{% if allow_voting_box %}
-				<form action="" method="get"><div>
-				Show the voting form: 
-				<input type="submit" name="showvotebox" value="Show" />
-				</div></form>
-			{% endif %}
-		{% endif %}
+  {{ introtext }}
+  {% if news_item %}
+  <br/>
+  <div class="newsItem">
+    <div class="newsItemDetails">Posted: {{ news_item.created_at|date:"d M Y, H:i" }}, 
+    by {{ news_item.created_by.get_link }}</div>
+    <div class="newsItemFull">
+    {% if news_item.full_item %}
+      {{ news_item.full_item|safe|standard_subs }}
+    {% else %}
+      {{ news_item.summary|bb2html }}
+    {% endif %}
+    </div>
+  </div>
+  {% endif %}
+  {% if poll %}
+    {% if show_poll_results %}
+    <div class="pollresults">
+      <h2>{{ poll.title }}</h2>
+      {{ poll.intro_text|bb2html }}
+      <p>Results:</p>
+      <table>
+      {% for polloption in poll.poll_options.all %}
+        <tr>
+          <td>{{ polloption.text|bb2html }}</td>
+          <td>{{ polloption.total }} votes &nbsp;&nbsp;</td>
+          <td>{{ polloption.percentage }}</td>
+          <td><div class="pollBarChartTotal"><div style="width: {{ polloption.bar_width }}px; " class="pollBarChart"></div></div></td>
+        </tr>
+      {% endfor %}
+      </table>
+      {{ poll.outro_text|bb2html }}
+    </div>
+    <br/>
+    {% endif %}
+    {% if voting_errors %}
+      <div class="userError">
+      Vote could not be registered:
+      <ul>
+      {% for error in voting_errors %}
+        <li>{{ error }}</li>
+      {% endfor %}
+      </ul>
+      </div>
+    {% endif %}
+    {% if voting_message %}<p><i>{{ voting_message }}</i></p>{% endif %}
+    
+    {% if show_vote_box %}
+      {% poll_vote_box request topic poll 2 %}
+    {% else %}
+      {% if allow_voting_box %}
+        <form action="" method="get"><div>
+        Show the voting form: 
+        <input type="submit" name="showvotebox" value="Show" />
+        </div></form>
+      {% endif %}
+    {% endif %}
 
-		{% if poll.can_anyone_vote %}
-		<p><small><i>Voting starts: {{ poll.voting_starts|date:"d M Y, H:i" }}<br/>
-		 Voting ends: {{ poll.voting_ends|date:"d M Y, H:i" }}<br/>
-		Rules: {{ poll.verbose_rules }}</i></small></p>
-		{% else %}
-		<p><i>Voting closed.</i></p>
-		{% endif %}
-		{% if current_member %}
-			{% if current_member.can_add_poll %}
-				{% if current_member == poll.created_by %}
-				<br/>&raquo; <a href="../edit_poll/{{ poll.id }}/">Edit poll</a>
-				{% endif %}
-			{% endif %}
-		{% endif %}
-	{% endif %}
+    {% if poll.can_anyone_vote %}
+    <p><small><i>Voting starts: {{ poll.voting_starts|date:"d M Y, H:i" }}<br/>
+     Voting ends: {{ poll.voting_ends|date:"d M Y, H:i" }}<br/>
+    Rules: {{ poll.verbose_rules }}</i></small></p>
+    {% else %}
+    <p><i>Voting closed.</i></p>
+    {% endif %}
+    {% if current_member %}
+      {% if current_member.can_add_poll %}
+        {% if current_member == poll.created_by %}
+        <br/>&raquo; <a href="../edit_poll/{{ poll.id }}/">Edit poll</a>
+        {% endif %}
+      {% endif %}
+    {% endif %}
+  {% endif %}
 {% endblock %} 
 

templates/cciw/forums/topicindex.html

 {% load forums %}
 
 {% block content %}
-	<p>Select from the list of topics below by clicking on the topic name.</p>
-	{% if object_list %}
-		<div class="paging">{% paging_control %}</div>
-		<table class="topheaders">
-			<tr>
-				<th scope="col">Topic</th>
-				<th scope="col" class="topicStartedCol">Started 
-					{% sorting_control "aca" "dca" "Click to sort by date started, oldest first" "Sort by date started, newest first" %}</th>
-				<th scope="col">Posts 
-					{% sorting_control "apc" "dpc" "Click to sort by number of posts, ascending" "Sort by number of posts, descending" %}</th>
-				<th scope="col" class="topicLastPostCol">Last post 
-					{% sorting_control "alp" "dlp" "Click to sort by date of last post, oldest first" "Sort by date of last post, newest first" %}</th>
-				<th scope="col">Status</th>
-			</tr>
-		{% for topic in object_list %}
-			<tr>
-				<td class="topicLink">
-				{% if topic.news_item_id %}<div class="center">NEWS ITEM</div>{% endif %}
-				{% if topic.poll_id %}<div class="center">POLL</div>
-					{% poll_vote_box request topic topic.poll 2 %}
-				{% endif %}
-				{{ topic.get_link }}
-				{% if moderator %}&nbsp;<span class="editTopic"><a href="/admin/cciwmain/topic/{{ topic.id }}/" title="Edit this topic" ><img width="16" height="16" src="{% static "images/edit.png" %}" alt="Edit this topic" /></a></span>
-				{% endif %}
-				{% if topic.hidden %}
-					{% if moderator %}
-						<br/><span class="topicHidden">HIDDEN</span>
-					{% else %}
-						<br/><span class="topicHidden">HIDDEN</span> (awaiting moderator approval)
-					{% endif %}
-				{% endif %}
-				</td>
-				<td>{% if topic.created_at %}{{ topic.created_at|date:"d M Y H:i" }}<br/>{% endif %}
-				    {% if topic.started_by_id %}{{ topic.started_by.get_link }}{% endif %}</td>
-				<td>{{ topic.post_count }}</td>
-				<td>{% if topic.last_post_at %}{{ topic.last_post_at|date:"d M Y H:i" }}<br/>{% endif %}
-				    {% if topic.last_post_by_id %}{{ topic.last_post_by.get_link }}{% endif %}</td>
-				<td>{% if topic.open %}Open{% else %}Closed{% endif %}</td>
-			</tr>
-		{% endfor %}
-		</table>
-		<div class="paging">{% paging_control %}</div>
-	{% else %}
-		<p>There are no topics yet in this forum.</p>
-	{% endif %}
-	{% if forum.open %}
-		<p>&raquo; <a href="add/">Add new topic</a>
-		{% if current_member %}
-			{% if current_member.can_add_news %}
-				<br/>&raquo; <a href="add_news/">Add news item</a>
-			{% endif %}
-			{% if current_member.can_add_poll %}
-				<br/>&raquo; <a href="add_poll/">Add poll</a>
-			{% endif %}
-		{% endif %}
-		</p>
-	{% endif %}
+  <p>Select from the list of topics below by clicking on the topic name.</p>
+  {% if object_list %}
+    <div class="paging">{% paging_control %}</div>
+    <table class="topheaders">
+      <tr>
+        <th scope="col">Topic</th>
+        <th scope="col" class="topicStartedCol">Started 
+          {% sorting_control "aca" "dca" "Click to sort by date started, oldest first" "Sort by date started, newest first" %}</th>
+        <th scope="col">Posts 
+          {% sorting_control "apc" "dpc" "Click to sort by number of posts, ascending" "Sort by number of posts, descending" %}</th>
+        <th scope="col" class="topicLastPostCol">Last post 
+          {% sorting_control "alp" "dlp" "Click to sort by date of last post, oldest first" "Sort by date of last post, newest first" %}</th>
+        <th scope="col">Status</th>
+      </tr>
+    {% for topic in object_list %}
+      <tr>
+        <td class="topicLink">
+        {% if topic.news_item_id %}<div class="center">NEWS ITEM</div>{% endif %}
+        {% if topic.poll_id %}<div class="center">POLL</div>
+          {% poll_vote_box request topic topic.poll 2 %}
+        {% endif %}
+        {{ topic.get_link }}
+        {% if moderator %}&nbsp;<span class="editTopic"><a href="/admin/cciwmain/topic/{{ topic.id }}/" title="Edit this topic" ><img width="16" height="16" src="{% static "images/edit.png" %}" alt="Edit this topic" /></a></span>
+        {% endif %}
+        {% if topic.hidden %}
+          {% if moderator %}
+            <br/><span class="topicHidden">HIDDEN</span>
+          {% else %}
+            <br/><span class="topicHidden">HIDDEN</span> (awaiting moderator approval)
+          {% endif %}
+        {% endif %}
+        </td>
+        <td>{% if topic.created_at %}{{ topic.created_at|date:"d M Y H:i" }}<br/>{% endif %}
+            {% if topic.started_by_id %}{{ topic.started_by.get_link }}{% endif %}</td>
+        <td>{{ topic.post_count }}</td>
+        <td>{% if topic.last_post_at %}{{ topic.last_post_at|date:"d M Y H:i" }}<br/>{% endif %}
+            {% if topic.last_post_by_id %}{{ topic.last_post_by.get_link }}{% endif %}</td>
+        <td>{% if topic.open %}Open{% else %}Closed{% endif %}</td>
+      </tr>
+    {% endfor %}
+    </table>
+    <div class="paging">{% paging_control %}</div>
+  {% else %}
+    <p>There are no topics yet in this forum.</p>
+  {% endif %}
+  {% if forum.open %}
+    <p>&raquo; <a href="add/">Add new topic</a>
+    {% if current_member %}
+      {% if current_member.can_add_news %}
+        <br/>&raquo; <a href="add_news/">Add news item</a>
+      {% endif %}
+      {% if current_member.can_add_poll %}
+        <br/>&raquo; <a href="add_poll/">Add poll</a>
+      {% endif %}
+    {% endif %}
+    </p>
+  {% endif %}
 {% endblock %} 

templates/cciw/forums/topics.html

 
 {% block content %}
 
-	{% if object_list %}
-	<ul>
-		{% for topic in object_list %}
-		<li>
-		<div class="individualTopic">
-			<h2><a href="{{ topic.get_absolute_url }}">{{ topic.subject }}</a></h2>
-			<div>(In <a href="{{ topic.forum.get_absolute_url }}">{{ topic.forum.nice_name }}</a>,
-	started by {{ topic.started_by.get_link }}, at {{ topic.created_at|date:"d M y, H:i" }})<br/><br/></div>
-	
-		</div></li>
-		{% endfor %}
-	</ul>
-	<div class="paging">{% paging_control %}</div>
-	{% else %}
-	<p>No topics.</p>
-	{% endif %}
+  {% if object_list %}
+  <ul>
+    {% for topic in object_list %}
+    <li>
+    <div class="individualTopic">
+      <h2><a href="{{ topic.get_absolute_url }}">{{ topic.subject }}</a></h2>
+      <div>(In <a href="{{ topic.forum.get_absolute_url }}">{{ topic.forum.nice_name }}</a>,
+  started by {{ topic.started_by.get_link }}, at {{ topic.created_at|date:"d M y, H:i" }})<br/><br/></div>
+  
+    </div></li>
+    {% endfor %}
+  </ul>
+  <div class="paging">{% paging_control %}</div>
+  {% else %}
+  <p>No topics.</p>
+  {% endif %}
 
 {% endblock %}

templates/cciw/members/change_email.html

 {% block content %}
 
 {% if success_message %}
-	<div class="successMessage">{{ success_message }}</div>
+  <div class="successMessage">{{ success_message }}</div>
 {% endif %}
 {% if error_message %}
-	<div class="userError">
-	{{ error_message }}
-	</div>
+  <div class="userError">
+    {{ error_message }}
+  </div>
 {% endif %}
 
 {% endblock %}

templates/cciw/members/change_password.html

 {% extends "cciw/standard.html" %}
 {% block content %}
 {% if success_message %}
-	<div class="successMessage">{{ success_message }}</div>
-	{% if current_member %}
-		<div><a href="{{ current_member.get_absolute_url }}">Go back to your personal page</a></div>
-	{% else %}
-		<div><a href="/login/">Log in</a></div>
-	{% endif %}
+  <div class="successMessage">{{ success_message }}</div>
+  {% if current_member %}
+    <div><a href="{{ current_member.get_absolute_url }}">Go back to your personal page</a></div>
+  {% else %}
+    <div><a href="/login/">Log in</a></div>
+  {% endif %}
 {% else %}
-	{% if error_message %}
-		<div class="userError">
-		{{ error_message }}
-		</div>
-	{% endif %}
-	{% if show_form %}
-		<p>Enter your new password (5-20 characters), and confirm it
-		with the same password in the second box.</p>
-		<form action="" method="post">{% csrf_token %}
-		<div class="formrow"><label for="new_password">New password:</label>
-			<input name="new_password" type="password" id="new_password" />
-		</div>
-		<div class="formrow"><label for="new_password2">Confirm:</label>
-			<input name="new_password2" type="password" id="new_password2" />
-		</div>
-		<div><input type="submit" name="submit" value="Change" /></div>
-		</form>
-	{% endif %}
+  {% if error_message %}
+    <div class="userError">
+    {{ error_message }}
+    </div>
+  {% endif %}
+  {% if show_form %}
+    <p>Enter your new password (5-20 characters), and confirm it
+    with the same password in the second box.</p>
+    <form action="" method="post">{% csrf_token %}
+    <div class="formrow"><label for="new_password">New password:</label>
+      <input name="new_password" type="password" id="new_password" />
+    </div>
+    <div class="formrow"><label for="new_password2">Confirm:</label>
+      <input name="new_password2" type="password" id="new_password2" />
+    </div>
+    <div><input type="submit" name="submit" value="Change" /></div>
+    </form>
+  {% endif %}
 {% endif %}
 
 {% endblock %}

templates/cciw/members/detail.html

 {% load forums %}
 {% load standardpage %}
 {% block content %}
-	
-	<h2>{{ member.user_name }}'s stuff</h2>
-	<ul>
-		<li><a href="posts/">Recent posts by {{ member.user_name }}</a></li>
-	</ul>
+  
+  <h2>{{ member.user_name }}'s stuff</h2>
+  <ul>
+    <li><a href="posts/">Recent posts by {{ member.user_name }}</a></li>
+  </ul>
 
-	{% if current_member %}
-		{% if current_member.user_name == member.user_name %}
-			<h2>Actions</h2>
-			<ul>
-				<li><a href="/memberadmin/preferences/">Preferences</a></li>
-				<li><a href="/memberadmin/change-password/">Change password</a><br/><br/></li>
-				<li><a href="messages/">Send a message</a></li>
-				<li><a href="messages/inbox/">View {{ current_member.new_messages }} new message(s)</a></li>
-				<li><a href="messages/archived/">View {{ current_member.saved_messages }} saved message(s)</a><br/><br/></li>
-				
-				
-				<li><div><form method="post" action="{{request.url}}">{% csrf_token %}
-				<p><input type="submit" name="logout" value="Log out" /></p>
-				</form></div></li>
-			</ul>
-		{% else %}
-			<h2>Actions</h2>
-			<ul>
-				<li><a href="messages/">Leave a message for {{ member.user_name }}</a></li>
-			</ul>
-		{% endif %}
-	{% else %}
-		<h2>Actions</h2>
-		<ul>
-			<li><a href="messages/">Leave a message for {{ member.user_name }}</a></li>
-		</ul>
-	{% endif %}
+  {% if current_member %}
+    {% if current_member.user_name == member.user_name %}
+      <h2>Actions</h2>
+      <ul>
+        <li><a href="/memberadmin/preferences/">Preferences</a></li>
+        <li><a href="/memberadmin/change-password/">Change password</a><br/><br/></li>
+        <li><a href="messages/">Send a message</a></li>
+        <li><a href="messages/inbox/">View {{ current_member.new_messages }} new message(s)</a></li>
+        <li><a href="messages/archived/">View {{ current_member.saved_messages }} saved message(s)</a><br/><br/></li>
+        
+        
+        <li><div><form method="post" action="{{request.url}}">{% csrf_token %}
+        <p><input type="submit" name="logout" value="Log out" /></p>
+        </form></div></li>
+      </ul>
+    {% else %}
+      <h2>Actions</h2>
+      <ul>
+        <li><a href="messages/">Leave a message for {{ member.user_name }}</a></li>
+      </ul>
+    {% endif %}
+  {% else %}
+    <h2>Actions</h2>
+    <ul>
+      <li><a href="messages/">Leave a message for {{ member.user_name }}</a></li>
+    </ul>
+  {% endif %}
 
-	<div class="memberinfo">
-		<h2>Information</h2>
-		<table class="sideheaders">
-			<tr>
-				<th scope="row">User name</th>
-				<td>{{ member.user_name }}</td>
-			</tr>
-			<tr>
-				<th scope="row">'Real' name</th>
-				<td>{{ member.real_name }}</td>
-			</tr>
-			<tr>
-				<th scope="row">Icon</th>
-				<td>{{ member.get_icon }}</td>
-			</tr>
-			{% if member.show_email %}
-			<tr>
-				<th scope="row">Email</th>
-				<td>{{ member.email|obfuscate_email }}</td>
-			</tr>
-			{% endif %}
-			<tr>
-				<th scope="row">Date joined</th>
-				<td>{% if member.date_joined %}{{ member.date_joined|date:"d M Y H:i:s" }}{% endif %}</td>
-			</tr>
-			<tr>
-				<th scope="row">Last seen</th>
-				<td>{% if member.last_seen %}{{ member.last_seen|date:"d M Y H:i:s" }}{% endif %}</td>
-			</tr>
-			{% if member.comments %}
-			<tr>
-				<th scope="row">Comments</th>
-				<td>{{ member.comments|bb2html }}</td>
-			</tr>
-			{% endif %}
-			{% if member.website %}
-			<tr>
-				<th scope="row">Website</th>
-				<td>{{ member.website }}</td>
-			</tr>
-			{% endif %}
-		</table>
-		<br/>
+  <div class="memberinfo">
+    <h2>Information</h2>
+    <table class="sideheaders">
+      <tr>
+        <th scope="row">User name</th>
+        <td>{{ member.user_name }}</td>
+      </tr>
+      <tr>
+        <th scope="row">'Real' name</th>
+        <td>{{ member.real_name }}</td>
+      </tr>
+      <tr>
+        <th scope="row">Icon</th>
+        <td>{{ member.get_icon }}</td>
+      </tr>
+      {% if member.show_email %}
+      <tr>
+        <th scope="row">Email</th>
+        <td>{{ member.email|obfuscate_email }}</td>
+      </tr>
+      {% endif %}
+      <tr>
+        <th scope="row">Date joined</th>
+        <td>{% if member.date_joined %}{{ member.date_joined|date:"d M Y H:i:s" }}{% endif %}</td>
+      </tr>
+      <tr>
+        <th scope="row">Last seen</th>
+        <td>{% if member.last_seen %}{{ member.last_seen|date:"d M Y H:i:s" }}{% endif %}</td>
+      </tr>
+      {% if member.comments %}
+      <tr>
+        <th scope="row">Comments</th>
+        <td>{{ member.comments|bb2html }}</td>
+      </tr>
+      {% endif %}
+      {% if member.website %}
+      <tr>
+        <th scope="row">Website</th>
+        <td>{{ member.website }}</td>
+      </tr>
+      {% endif %}
+    </table>
+    <br/>
 
-		{% if awards %}
-			<h2>Awards</h2>
-			<p><b>{{ member.user_name }}</b> has received the following awards:</p>
-			{% for paward in awards %}
-			<div class="awardInfo">
-				<a href="{{paward.award.get_absolute_url}}" class="awardlink"><img class="award" alt="{{paward.award.nice_name}}" src="{{paward.award.imageurl}}" /></a><br/>
-				<span class="awardname">
-				{{ paward.award.nice_name }}</span>
-				{% if paward.date_awarded %}
- 					on {{ paward.date_awarded|date:"d M Y" }}
-				{% endif %}
-				<br/>
-				Reason for award:
-				<p>{{ paward.reason }}</p>
-			</div>
-	
-			{% endfor %}
+    {% if awards %}
+      <h2>Awards</h2>
+      <p><b>{{ member.user_name }}</b> has received the following awards:</p>
+      {% for paward in awards %}
+      <div class="awardInfo">
+        <a href="{{paward.award.get_absolute_url}}" class="awardlink"><img class="award" alt="{{paward.award.nice_name}}" src="{{paward.award.imageurl}}" /></a><br/>
+        <span class="awardname">
+        {{ paward.award.nice_name }}</span>
+        {% if paward.date_awarded %}
+           on {{ paward.date_awarded|date:"d M Y" }}
+        {% endif %}
+        <br/>
+        Reason for award:
+        <p>{{ paward.reason }}</p>
+      </div>
+  
+      {% endfor %}
 
 
-		{% endif %}
-	</div>
+    {% endif %}
+  </div>
 {% endblock %}

templates/cciw/members/help_logging_in.html

 {% block content %}
 
 {% if success_message %}
-	<div class="successMessage">{{ success_message }}</div>
+  <div class="successMessage">{{ success_message }}</div>
 {% else %}
-	{% htmlchunk help_logging_in_intro %}
-	{% if error_message %}
-		<div class="userError">{{ error_message }}</div>
-	{% endif %}
-	
-	
-	<form action="" method="post">{% csrf_token %}
-	<div>
-	<label for="email">E-mail address:</label> <input type="text" name="email" id="email" value="{{ email }}" /><br/><br/>
-	Choose:<br/>
-	<input type="submit" name="newpassword" value="Send me a new password." /><br/>
-	or: <br/>
-	<input type="submit" name="usernamereminder" value="Remind me of my user name" /><br/>
-	</div>
-	</form>
+  {% htmlchunk help_logging_in_intro %}
+  {% if error_message %}
+    <div class="userError">{{ error_message }}</div>
+  {% endif %}
+  
+  
+  <form action="" method="post">{% csrf_token %}
+  <div>
+  <label for="email">E-mail address:</label> <input type="text" name="email" id="email" value="{{ email }}" /><br/><br/>
+  Choose:<br/>
+  <input type="submit" name="newpassword" value="Send me a new password." /><br/>
+  or: <br/>
+  <input type="submit" name="usernamereminder" value="Remind me of my user name" /><br/>
+  </div>
+  </form>
 {% endif %}
 
 {% endblock %}

templates/cciw/members/index.html

 {% load forums %}
 
 {% block content %}
-	<form method='get' action='/members/'>
-		<p>
-		<label>Search:
-		<input type='text' name='search' id='search' value="{{ request.GET.search }}" /></label><br/>
-		<label>Online users only: <input type="checkbox" name="online" value="1"
-			{% if request.GET.online %}
-				checked="checked"
-			{% endif %} /></label> <input type="submit" name="go" value="Go" />
-		</p>
-		{% forward_query_param "order" %}
-	</form>
-	{% if object_list %}
-	<div class="paging">{% paging_control %}</div>
-	<table class="topheaders">
-		<tr>
-			<th scope="col">Icon</th>
-			<th scope="col">Member name&nbsp;{% sorting_control "aun" "dun" "Sort by user name ascending" "Sort by user name descending" %}</th>
-			<th scope="col">'Real' name&nbsp;{% sorting_control "arn" "drn" "Sort by real name ascending" "Sort by real name descending" %}</th>
-			<th scope="col">Comments</th>
-			<th scope="col">Joined&nbsp;{% sorting_control "adj" "ddj" "Sort by 'date joined' ascending" "Sort by 'date joined' descending" %}</th>
-			<th scope="col">Last seen&nbsp;{% sorting_control "als" "dls" "Sort by 'last seen' ascending" "Sort by 'last seen' descending" %}</th>
-		</tr>
+  <form method='get' action='/members/'>
+    <p>
+    <label>Search:
+    <input type='text' name='search' id='search' value="{{ request.GET.search }}" /></label><br/>
+    <label>Online users only: <input type="checkbox" name="online" value="1"
+      {% if request.GET.online %}
+        checked="checked"
+      {% endif %} /></label> <input type="submit" name="go" value="Go" />
+    </p>
+    {% forward_query_param "order" %}
+  </form>
+  {% if object_list %}
+  <div class="paging">{% paging_control %}</div>
+  <table class="topheaders">
+    <tr>
+      <th scope="col">Icon</th>
+      <th scope="col">Member name&nbsp;{% sorting_control "aun" "dun" "Sort by user name ascending" "Sort by user name descending" %}</th>
+      <th scope="col">'Real' name&nbsp;{% sorting_control "arn" "drn" "Sort by real name ascending" "Sort by real name descending" %}</th>
+      <th scope="col">Comments</th>
+      <th scope="col">Joined&nbsp;{% sorting_control "adj" "ddj" "Sort by 'date joined' ascending" "Sort by 'date joined' descending" %}</th>
+      <th scope="col">Last seen&nbsp;{% sorting_control "als" "dls" "Sort by 'last seen' ascending" "Sort by 'last seen' descending" %}</th>
+    </tr>
 
-		{% for member in object_list %}
-		<tr>
-			<td>{{ member.get_icon }}</td>
-			<td>{{ member.get_link }}{% if member.hidden %}<br/>HIDDEN{% endif %}{% if member.banned %}<br/>BANNED{% endif %}</td>
-			<td>{{ member.real_name }}</td>
-			<td>{{ member.comments|bb2html }}</td>
-			<td>
-			{% if member.date_joined %}
-				{{ member.date_joined|date:"d M Y" }}
-			{% endif %}
-			</td>
-			<td>
-			{% if member.last_seen %}
-				{{ member.last_seen|date:"d M Y H:i" }}
-			{% endif %}
-			</td>
-		</tr>
-		{% endfor %}
-	</table>
-	<div class="paging">{% paging_control %}</div>
-	{% else %}
-	<p>No members found.</p>
-	{% endif %}
+    {% for member in object_list %}
+    <tr>
+      <td>{{ member.get_icon }}</td>
+      <td>{{ member.get_link }}{% if member.hidden %}<br/>HIDDEN{% endif %}{% if member.banned %}<br/>BANNED{% endif %}</td>
+      <td>{{ member.real_name }}</td>
+      <td>{{ member.comments|bb2html }}</td>
+      <td>
+      {% if member.date_joined %}
+        {{ member.date_joined|date:"d M Y" }}
+      {% endif %}
+      </td>
+      <td>
+      {% if member.last_seen %}
+        {{ member.last_seen|date:"d M Y H:i" }}
+      {% endif %}
+      </td>
+    </tr>
+    {% endfor %}
+  </table>
+  <div class="paging">{% paging_control %}</div>
+  {% else %}
+  <p>No members found.</p>
+  {% endif %}
 
 {% endblock %}

templates/cciw/members/login.html

 {% extends "cciw/standard.html" %}
 {% load url from future %}
 {% block content %}
-	{% if error_message %}
-	<div class="userError">{{ error_message }}</div>
-	{% else %}
-		{% if isFromRedirect %}
-		<p>Log in to continue.</p>
-		{% endif %}
-	{% endif %}
-	<p>Enter your user name and password below:</p>
-	<form action="" method="post">{% csrf_token %}
-		<div class="formrow">
-			<label for='user_name'>User name:</label>
-			<input type='text' name='user_name' id='user_name' />
-		</div>
-		<div class="formrow">
-			<label for='password'>Password:</label>
-			<input type='password' name='password' id='password' />
-		</div>
-		<div>
-		<input type="hidden" name="this_is_the_login_form" value="1" />
-		<input type="submit" name="login" value="Login" />
-		</div>
-	</form>
-	<br/>
-	<ul><li><small><a href="/help/logging-in/">Forgotten your username or password?</a></small></li>
-	<li><small><a href="/signup/">Sign up</a> if you haven't done so already</small></li>
+  {% if error_message %}
+  <div class="userError">{{ error_message }}</div>
+  {% else %}
+    {% if isFromRedirect %}
+    <p>Log in to continue.</p>
+    {% endif %}
+  {% endif %}
+  <p>Enter your user name and password below:</p>
+  <form action="" method="post">{% csrf_token %}
+    <div class="formrow">
+      <label for='user_name'>User name:</label>
+      <input type='text' name='user_name' id='user_name' />
+    </div>
+    <div class="formrow">
+      <label for='password'>Password:</label>
+      <input type='password' name='password' id='password' />
+    </div>
+    <div>
+    <input type="hidden" name="this_is_the_login_form" value="1" />
+    <input type="submit" name="login" value="Login" />
+    </div>
+  </form>
+  <br/>
+  <ul><li><small><a href="/help/logging-in/">Forgotten your username or password?</a></small></li>
+  <li><small><a href="/signup/">Sign up</a> if you haven't done so already</small></li>
         <li><small>Need to log in to the <strong>officer</strong> section of the website?  <a href="{% url 'cciw.officers.views.index' %}">Go here</a></small></li>
-	</ul>
+  </ul>
 {% endblock %}

templates/cciw/members/messages/index.html

 {% load url from future %}
 {% block content %}
 {% if object_list %}
-	<form action="" method="post" >{% csrf_token %}
-	<div class="paging">{% paging_control %}</div>
-	<table class="topheaders">
-		<tr>
-			<th scope="col" class="postFromCol">From</th>
-			<th scope="col">Message</th>
-			<th scope="col">Select</th>
-		</tr>
-		{% for message in object_list %}
-		<tr>
-			<td class="postFrom">
-				<span class="postMemberIcon">{{ message.from_member.get_icon }}</span>
-				{{ message.from_member.get_link }}<br/>
-				<span class="postDate">{% if message.time %}{{ message.time|date:"d M y, H:i" }}{% endif %}</span><br/>
-				<a href="{% url 'cciwmain.members.send_message' user_name=message.from_member.user_name %}" title="Reply to {{ message.from_member.user_name }}">&raquo; reply</a>
-			</td>
-			<td class="postMessage">{{ message.text|bb2html }}</td>
-			<td style="text-align: center;"><input type="checkbox" name="msg_{{ message.id }}" /></td>
-		</tr>
-		{% endfor %}
-	</table>
-	<div class="paging">{% paging_control %}</div>
-	<div>Action for selected messages:
-	{% if show_delete_button %}<input type="submit" name="delete" value="Delete"/>{% endif %}
-	{% if show_archive_button %}<input type="submit" name="archive" value="Archive"/>{% endif %}
-	{% if show_move_inbox_button %}<input type="submit" name="inbox" value="Move to inbox"/>{% endif %}
-	</div>
+  <form action="" method="post" >{% csrf_token %}
+  <div class="paging">{% paging_control %}</div>
+  <table class="topheaders">
+    <tr>
+      <th scope="col" class="postFromCol">From</th>
+      <th scope="col">Message</th>
+      <th scope="col">Select</th>
+    </tr>
+    {% for message in object_list %}
+    <tr>
+      <td class="postFrom">
+        <span class="postMemberIcon">{{ message.from_member.get_icon }}</span>
+        {{ message.from_member.get_link }}<br/>
+        <span class="postDate">{% if message.time %}{{ message.time|date:"d M y, H:i" }}{% endif %}</span><br/>
+        <a href="{% url 'cciwmain.members.send_message' user_name=message.from_member.user_name %}" title="Reply to {{ message.from_member.user_name }}">&raquo; reply</a>
+      </td>
+      <td class="postMessage">{{ message.text|bb2html }}</td>
+      <td style="text-align: center;"><input type="checkbox" name="msg_{{ message.id }}" /></td>
+    </tr>
+    {% endfor %}
+  </table>
+  <div class="paging">{% paging_control %}</div>
+  <div>Action for selected messages:
+  {% if show_delete_button %}<input type="submit" name="delete" value="Delete"/>{% endif %}
+  {% if show_archive_button %}<input type="submit" name="archive" value="Archive"/>{% endif %}
+  {% if show_move_inbox_button %}<input type="submit" name="inbox" value="Move to inbox"/>{% endif %}
+  </div>
 
-	</form>
+  </form>
 {% else %}
-	<p>No messages found.</p>
+  <p>No messages found.</p>
 
 {% endif %}
 {% endblock %}

templates/cciw/members/preferences.html

 
 {% if image_error %}
 <div class="userError">
-	Your icon has not been changed: {{ image_error }}
+  Your icon has not been changed: {{ image_error }}
 </div>
 {% endif %}
 

templates/cciw/members/signup.html

 
 {% block content %}
 
-	<form action="/signup/" method="post">{% csrf_token %}
+<form action="/signup/" method="post">{% csrf_token %}
 {% if stage == "start" %}
-	<p>Before signing up, please read the terms of service below.</p>
-	
-	<h1>Terms of service</h1>
-	{% htmlchunk website_terms_of_service %}
-	
-	<h2>Continue</h2>
-	
-	<p>If you agree to abide by the terms and rules above, press
-	'I agree' to continue.</p>
-	
-	<div><input type="submit" name="agreeterms" value="I agree" /></div>
+  <p>Before signing up, please read the terms of service below.</p>
+
+  <h1>Terms of service</h1>
+  {% htmlchunk website_terms_of_service %}
+
+  <h2>Continue</h2>
+
+  <p>If you agree to abide by the terms and rules above, press
+  'I agree' to continue.</p>
+
+  <div><input type="submit" name="agreeterms" value="I agree" /></div>
 
 {% else %}{% if stage == "email" %}
 
-	<h2>E-mail address</h2>
-	
-	{% if alreadyused %}
-		<div class="userError">The e-mail address <b>{{ email }}</b> is already used.
-		If you have forgotten your username you can <a href="/help/logging-in/?email={{ email|urlencode }}">get a reminder</a>.</div>
-	{% else %}
-		{% if error_message %}
-			<div class="userError">{{ error_messagex }}</div>
-		{% else %}
-			<p>Please enter your e-mail address to continue.</p>
-		{% endif %}
-	{% endif %}
-	<div><label for="idemail">E-mail address:</label> 
-	<input type="text" name="email" id="idemail" value="{{ email }}" />
-	</div>
-	
-	<p>After clicking 'submit', you will be sent an e-mail
-	containing instructions on how to finish the signup process.</p>
-	
-	<div><input type="submit" name="submit_email" value="Submit" /></div>
+  <h2>E-mail address</h2>
+
+  {% if alreadyused %}
+    <div class="userError">The e-mail address <b>{{ email }}</b> is already used.
+    If you have forgotten your username you can <a href="/help/logging-in/?email={{ email|urlencode }}">get a reminder</a>.</div>
+  {% else %}
+    {% if error_message %}
+      <div class="userError">{{ error_messagex }}</div>
+    {% else %}
+      <p>Please enter your e-mail address to continue.</p>