Template layout enhancement

templates/contest/overview.html

@@ -5,8 +5,8 @@
 <div class="row">
 	<div class="col-sm-6">
 		<div class="panel panel-default">
+			<div class="panel-heading"><h3 class="panel-title">The Contest</h3></div>
 			<div class="panel-body">
-				<div class="panel-heading">The Contest</div>
 				<p>
 				Welcome to {{ contest.name }}!
 				<p/>
@@ -20,8 +20,8 @@
 	</div>
 	<div class="col-sm-6">
 		<div class="panel panel-default">
+			<div class="panel-heading"><h3 class="panel-title">QRGs</h3></div>
 			<div class="panel-body">
-			<div class="panel-heading">QRGs</div>
 				<p>The following frequencies may be used in this contest</p>
 				<table class="table table-inverse">
 					<thead class="thead-inverse">

templates/index.html

@@ -5,8 +5,16 @@
 {% block content %}
 
 <div class="row">
-	<div class="col-sm-6">
+	<div class="col-sm-12">
 		<p class="lead">Hello and welcome to the 2nd DK0TU CQ TU contest, the CQ TU 2107!</p>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-sm-6">
+		<div class="panel panel-default">
+			<div class="panel-heading"><h3 class="panel-title">Participate</h3></div>
+			<div class="panel-body">
 				<p>
 				What next? Here are some ideas:
 				</p>
@@ -17,9 +25,23 @@
 					<li>Already have an account? Login on the right.</li>
 				</ul>
 				</p>
+				<p>
+				Und nun noch ein Wort von unserem Sponsor:
+				<blockquote>
+					Serverbasierte Loesung finde ich nach eingem Ueberlegen doof.
+					<footer>DL7BST</footer>
+				</blockquote>
+				</p>
+			</div>
+		</div>
 	</div>
 	<div class="col-sm-6">
+		<div class="panel panel-default">
+			<div class="panel-heading"><h3 class="panel-title">Login</h3></div>
+			<div class="panel-body">
+				<p>
 				Login with callsign (uppercase) and password.
+				</p>
 				<form method="post" action="{% url "login" %}" class="uniForm">
 					{% csrf_token %}
 					{{ loginForm|crispy }}
@@ -28,15 +50,12 @@
 					</div>
 				</form>
 			</div>
+		</div>
+	</div>
 </div>
 
 <div class="row">
 	<div class="col-sm-12">
-		Und nun noch ein Wort von unserem Sponsor:
-        <blockquote>
-            Serverbasierte Loesung finde ich nach eingem Ueberlegen doof.
-            <footer>DL7BST</footer>
-        </blockquote>
 	</div>
 </div>
 {% endblock %}

templates/registration/login.html

@@ -3,10 +3,12 @@
 {% load crispy_forms_tags %}
 
 {% block content %}
-<h2>Welcome!</h2>
 <div class="row">
 	<div class="col-sm-4 col-sm-offset-4">
-		<h2 class="text-center">Please login</h2>
+		<!-- <h2 class="text-center">Please login</h2> -->
+		<div class="panel panel-primary">
+			<div class="panel-heading">Login</div>
+			<div class="panel-body">
 				<p>
 				Don't have an account? <a href="{% url 'register' %}">Register here!</a>
 				</p>
@@ -18,9 +20,11 @@
 					{% csrf_token %}
 					{{ form|crispy }}
 
-			<button type="submit" class="btn btn-default" value="Login">Login</button>
+					<button type="submit" class="btn btn-primary" value="Login">Login</button>
 				</form>
 			</div>
+		</div>
+	</div>
 </div>
 <!--
 <div class="row">

templates/registration/register.html

@@ -1,18 +1,25 @@
 {% extends "base.html" %}
 
+{% load crispy_forms_tags %}
+
 {% block content %}
-<h2>Welcome!</h2>
 <div class="row">
 	<div class="col-sm-12">
-		I have {{ call_count }} callsigns in my Database!
+		<div class="panel panel-default">
+			<div class="panel-heading">Registration</div>
+			<div class="panel-body">
+				<p>
+				Please register with your (uppercase) Callsign as Usernames.
+				For DN-Calls, /[A-Z] is allowed.
+				</p>
 				<form method="POST" action="{% url 'register' %}">
 				{% csrf_token %}
-		<table>
+				{{ form|crispy }}
-		{{ form.as_table }}
+				<input type="submit" value="Register">
-		</table>
-		<input type="submit" value="Create User">
 				</form>
 			</div>
+		</div>
+	</div>
 </div>
 {% endblock %}