2 files changed, 26 insertions, 0 deletions
diff --git a/scipy/templates/login.html b/scipy/templates/login.html
index c360438..2f29ea4 100644
--- a/scipy/templates/login.html
+++ b/scipy/templates/login.html
@@ -1,6 +1,13 @@
 {% extends 'page.html' %}
 {% block content %}
 <div class="large-6 large-centered columns">
+{% if status == "in" %}
+<div data-alert class="alert-box alert">
+<p>Invalid username or password.</p>
+<a href="#" class="close">&times;</a>
+</div>
+{% endif %}
+
   <form class="form-signin" action="/2013/accounts/login/" method="POST" enctype="multipart/form-data"> {% csrf_token %}
     <h3 class="form-signin-heading">Please sign in</h3>
     {{ form.as_p }}
diff --git a/scipy/templates/login.html~ b/scipy/templates/login.html~
new file mode 100644
index 0000000..2f29ea4
--- /dev/null
+++ b/scipy/templates/login.html~
@@ -0,0 +1,19 @@
+{% extends 'page.html' %}
+{% block content %}
+<div class="large-6 large-centered columns">
+{% if status == "in" %}
+<div data-alert class="alert-box alert">
+<p>Invalid username or password.</p>
+<a href="#" class="close">&times;</a>
+</div>
+{% endif %}
+
+  <form class="form-signin" action="/2013/accounts/login/" method="POST" enctype="multipart/form-data"> {% csrf_token %}
+    <h3 class="form-signin-heading">Please sign in</h3>
+    {{ form.as_p }}
+    <input type="hidden" name = "next" value="{{ next }}">
+    <button class="success expand" type="submit">Sign in</button>
+  </form>
+  <h6>Dont have an scipy account? <a href="/2013/accounts/register"><u>Register Here.</u></a></h6>
+</div>
+{% endblock %}