2 files changed, 14 insertions, 22 deletions
diff --git a/rpkid/rpki/gui/app/templates/base.html b/rpkid/rpki/gui/app/templates/base.html
index 89aa0b9a..aa0f6a58 100644
--- a/rpkid/rpki/gui/app/templates/base.html
+++ b/rpkid/rpki/gui/app/templates/base.html
@@ -1,3 +1,5 @@
+{% load url from future %}
+
 <!DOCTYPE HTML>
 <html lang="en">
   <head>
@@ -24,7 +26,7 @@
 	  {% if user.is_authenticated %}
 	    <li><p class="navbar-text">Logged in as {{ user }}</li>
 	    <li class="divider-vertical"></li>
-	    <li><a href="{% url rpki.gui.views.logout %}">Log Out</a></li>
+	    <li><a href="{% url "rpki.gui.views.logout" %}">Log Out</a></li>
 	  {% endif %}
 	  </ul>
 	</div>
diff --git a/rpkid/rpki/gui/app/templates/registration/login.html b/rpkid/rpki/gui/app/templates/registration/login.html
index d2ee9468..0d6fb6fd 100644
--- a/rpkid/rpki/gui/app/templates/registration/login.html
+++ b/rpkid/rpki/gui/app/templates/registration/login.html
@@ -1,35 +1,25 @@
 {% extends "base.html" %}
+{% load url from future %}
 
 {% block content %}
+<div class="page-header">
+  <h1>Login</h1>
+</div>
 
 {% if form.errors %}
-<div class='alert-message error'>
-	<p>Your username and password didn't match. Please try again.</p>
+<div class='alert'>
+  <p>Your username and password didn't match. Please try again.</p>
 </div>
 {% endif %}
 
-<form method="post" action="{% url rpki.gui.views.login %}">
+<form class="form-horizontal" method="post" action="{% url "rpki.gui.views.login" %}">
   {% csrf_token %}
-
-  <div class="clearfix">
-    {{ form.username.label_tag }}
-    <div class="input">
-      {{ form.username }}
-    </div>
-  </div>
-
-  <div class="clearfix">
-    {{ form.password.label_tag }}
-    <div class="input">
-      {{ form.password }}
-    </div>
-  </div>
-
-  <div class="actions">
-    <input type="submit" value="Login" class="btn primary" />
-  </div>
+  {% include "app/bootstrap_form.html" %}
 
   <input type="hidden" name="next" value="{{ next }}" />
+  <div class="form-actions">
+    <input type="submit" value="Login" class="btn btn-primary" />
+  </div>
 </form>
 
 {% endblock %}