From 752a65962938d525ce307e56da4a3d65a387c934 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Fri, 8 Feb 2008 22:54:00 +0100 Subject: [PATCH] * Restructure HTML, add a link to the main EE CSS and add some other CSS (Brenda). --- static/base/css/base.css | 24 ++++--------- templates/base/base.html | 74 ++++++++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 32 deletions(-) diff --git a/static/base/css/base.css b/static/base/css/base.css index d16f883..27bda31 100644 --- a/static/base/css/base.css +++ b/static/base/css/base.css @@ -1,23 +1,13 @@ -.LeftBar { - border:solid black; - float:left; - width:200px; - margin-right: 10px; +table { + font-family:Verdana, Georgia,Arial, sans-serif; + font-size:9pt; } -.Content { - float:left; - border: solid black; - width: 900px; - padding: 10px; -} -.Clear { - clear: both; +.navrechts p { + margin-bottom: 0px; } -.Footer { - border: solid black; - padding-left: 10px; - margin-top:10px; +.navrechts { + margin-top:0px; } diff --git a/templates/base/base.html b/templates/base/base.html index 8fefc9a..3cbb353 100644 --- a/templates/base/base.html +++ b/templates/base/base.html @@ -1,28 +1,72 @@ {% load i18n %} + -

-{% block content %} -{% endblock %} -

- -

+ +

{% if user.is_authenticated %}

{% blocktrans with user.username as username %}You are currently logged in as {{ username }}{% endblocktrans %} -- {% trans "Logout" %}

+{% else %} +

{% blocktrans %}Please login{% endblocktrans %}

{% endif %} +

+ + +

+ +

Home
Logout

+ +

+{% block content %} +{% endblock %} +

+ +

-- 2.30.2