2 files changed, 56 insertions, 1 deletions
diff --git a/templates/login/logout.html b/templates/login/logout.html
index 12094c2..ccbc200 100644
--- a/templates/login/logout.html
+++ b/templates/login/logout.html
@@ -27,7 +27,7 @@ This is because Django is Opinionated and does lots of Invisible Defaults
 	<div class='align-center'>
 	<div class='space'></div>
 	<div class='align-center'>
-		<form action="/login/" method="post" accept-charset="utf-8">{% csrf_token %}
+		<form action="/accounts/login/" method="post" accept-charset="utf-8">{% csrf_token %}
 			<table class='form'>
 			{{form.as_table}}
 			</table>
diff --git a/templates/registration/login.html b/templates/registration/login.html
new file mode 100644
index 0000000..ac1d15c
--- /dev/null
+++ b/templates/registration/login.html
@@ -0,0 +1,55 @@
+{% extends 'base.html' %}
+
+{% block content %}
+<!-- To understand how this all works, with invisible default behaviour, see
+
+troggle/templates/login/logout.html
+troggle/templates/registration/ 
+
+because magic 
+This is because Django is Opinionated and does lots of Invisible Defaults
+
+This file is actually identical to troggle/templates/login/index.html
+-->
+<div class='middle'>
+<h2>Troggle user login</h2>
+</div>
+
+{% if message %}
+    <div style='width: 350px;'  class='middle3 login'>
+        {% if title %}
+        <div class='align-center'>
+        <h3>{{title}}</h3>
+        <div class='space'></div>
+        {% endif %}
+    <p>{{message }}</p>
+    </div>
+{% endif %}
+<h3>Troggle ordinary user login - no access to Django control panel</h3>
+<p>(This is using template registration/login.html)
+<div style='width: 250px;'  class='middle3 login'>
+<div class='align-center'>
+
+<div class='space'></div>
+{% if invalid %}
+	<p class='error'>The username and password you provided don't match. Please try again.</p>
+	<p>Have you <a href='/accounts/forgottenpassword/'>forgotten your password</a>?<br/>
+	   Or perhaps <a href='/accounts/forgottenusername/'>your username</a>?</p>
+       
+    <p>Neither of those links work yet, by the way, I'm only trying to *appear* helpful.
+
+	<div class='space'></div>
+{% endif %}
+<div class='align-center'>
+    <form action="" method="post" accept-charset="utf-8">{% csrf_token %}
+        <table class='form'>
+            <tr><th><label for="id_username">Username:</label></th><td><input id="id_username" type="text" name="username" maxlength="30" /></td></tr>
+            <tr><th><label for="id_password">Password:</label></th><td><input type="password" name="password" id="id_password" /></td></tr>
+        </table>
+        <div class='space'></div>
+    
+    <br/>
+    <p><input type="submit" value="Login &rarr;"></p>
+    </form>
+</div>
+{% endblock %}