From 85e7995d35bfb6d48a55a517ea982b56b899ae67 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Wed, 1 Dec 2010 17:19:07 -0800 Subject: [PATCH] Make the inventory login page look a bit nicer. This involved adjusting some of the base django templates. Whenever given a choice I try to make our pages look more like the admin site. --- htsworkflow/frontend/templates/app_base.html | 23 ++++++--- .../templates/registration/login.html | 49 +++++++++++-------- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/htsworkflow/frontend/templates/app_base.html b/htsworkflow/frontend/templates/app_base.html index 728cc01..1babcf6 100644 --- a/htsworkflow/frontend/templates/app_base.html +++ b/htsworkflow/frontend/templates/app_base.html @@ -16,13 +16,20 @@ - - - {% block msg %} -

- {% endblock %} - {% block content %} - {{ body }} - {% endblock %} + + +

+ {% block pretitle %}{% endblock %} + {% block content_title %}{% if title %}

{% endif %}{% endblock %} + {% block content %} + {% block object-tools %}{% endblock %} + {{ body }} + {% endblock %} + {% block sidebar %}{% endblock %} +
+

+ + + {% block footer %}{% endblock %} diff --git a/htsworkflow/frontend/templates/registration/login.html b/htsworkflow/frontend/templates/registration/login.html index 5442caf..cd28d59 100644 --- 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 }} + + {% endblock %} +{% block title %}Login{% endblock %} +{% block bodyclass %}login{% endblock %} {% block content %} - -{% if form.errors %} -

Your username and password didn't match. Please try again.

+{% if error_message %} +

{% endif %} - - {% endblock %} -- 2.30.2

{{ form.username.label_tag }}	{{ form.username }}
{{ form.password.label_tag }}	{{ form.password }}

{{ title }}

Login