Merge branch 'feature/sliders' into develop

cvkbrno/templates/registration/login.html~

@@ -1,53 +0,0 @@
-{% extends "cvkbrnobase.html" %}
-
-{% block content %}
-
-{% if form.errors %}
-<p>Your username and password didn't match. Please try again.</p>
-{% endif %}
-
-<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
-{% 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" />
-
-{% if next %}
-	<input type="hidden" name="next" value="{{ next }}" />
-{% else %}
-	<input type="hidden" name="next" value="." />
-{% endif %}
-
-
-</form>
-
-<h1>Lod&#283; na vod&#283;</h1>
-
-<table class="listtable" width=100%>
-<thead>
-	<tr>
-	<th>Boat</th>
-	<th>Departure time</th>
-	</tr>
-</thead>
-<tbody>
-	{% for outing in activeoutings %}
-	<tr>
-		<td> {{ outing.boat.boatname }} </td>
-		<td> {{ outing.starttime }} </td>
-	</tr>
-	{% endfor %}
-	
-</tbody>
-</table>
-
-{% endblock %}