Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

[htsworkflow.git] / htsworkflow / frontend / templates / registration / login.html

diff --git a/htsworkflow/frontend/templates/registration/login.html b/htsworkflow/frontend/templates/registration/login.html
index 5442caff62b02c0c1a66eacb03b35d1af380d8e2..cd28d5997ee32092f85fc4b8cdecac82f08bcde0 100644 (file)
--- a/htsworkflow/frontend/templates/registration/login.html
+++ b/htsworkflow/frontend/templates/registration/login.html
@@ -1,29 +1,36 @@
-{% extends "flowcell_libraries_app.html" %}
+{% extends "app_base.html" %}
+{% load i18n %}
 
-{% block title %}
-Login
+{% block additional_css %}{% load adminmedia %}{{ block.super }}
+<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/base.css" />
+<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/login.css" />
 {% endblock %}
+{% block title %}Login{% endblock %}
+{% block bodyclass %}login{% endblock %}
 
 {% block content %}
-
-{% if form.errors %}
-<p>Your username and password didn't match. Please try again.</p>
+{% if error_message %}
+<p class="errornote">{{ error_message }}</p>
 {% endif %}
-
-<form method="post" action="{% url django.contrib.auth.views.login %}">
-<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" />
-<input type="hidden" name="next" value="{{ next }}" />
+<div id="container">
+  <div id="header">
+    <h1>Login</h1>
+  </div>
+<form action="{{ app_path }}" method="post" id="login-form">
+  <div class="form-row">
+    <label for="id_username">{% trans 'Username:' %}</label> <input type="text" name="username" id="id_username" />
+  </div>
+  <div class="form-row">
+    <label for="id_password">{% trans 'Password:' %}</label> <input type="password" name="password" id="id_password" />
+    <input type="hidden" name="this_is_the_login_form" value="1" />
+  </div>
+  <div class="submit-row">
+    <label>&nbsp;</label><input type="submit" value="{% trans 'Log in' %}" />
+  </div>
 </form>
 
+<script type="text/javascript">
+document.getElementById('id_username').focus()
+</script>
+</div>
 {% endblock %}