Merge branch 'config' into dockerize2

templates/banned.html

@@ -1,7 +1,7 @@
 {% filter remove_whitespace %}
 {# Automatically removes unnecessary whitespace #}
 <div class="ban">
-	<iframe width="420" height="315" src="https://www.youtube.com/embed/FXPKJUE86d0" frameborder="0" allowfullscreen></iframe>
+	<img style="display:block;margin-left:auto;margin-right:auto;" width="420" height="600" src="static/banned.jpg" alt="Purge list: you">
 	{% if ban.expires and time() >= ban.expires %}
 		<h2>{% trans %}You were banned! ;_;{% endtrans %}</h2>
 	{% else %}
@@ -31,7 +31,7 @@
 	{% endif %}
 	<p>
 		{% trans %}Your ban was filed on{% endtrans %}
-			<strong>{{ ban.created|date(config.ban_date) }}</strong>
+			<strong> {{ ban.created|date(config.ban_date) }}</strong>
 			{% if config.show_modname %}
 				{% if ban.username %}
 					{% trans %}by{% endtrans %} <strong> {{ ban.username }} </strong>
@@ -44,9 +44,7 @@
 			{% trans %} has since expired. Refresh the page to continue.{%  endtrans %}
 		{% elseif ban.expires %}
 			{% trans %}expires{% endtrans %} <span id="countdown">{{ ban.expires|until }}</span> {% trans %}from now, which is on{% endtrans %}
-			<strong>
+			<strong> {{ ban.expires|date(config.ban_date) }} </strong>
-				{{ ban.expires|date(config.ban_date) }}
-			</strong>
 			<script>
 				var secondsLeft = {{ ban.expires - time() }};
 				var end = new Date().getTime() + secondsLeft*1000;