projects / matthijs / projects / xerxes.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 17c4e95)
* Add a base css file.
authorMatthijs Kooijman <matthijs@stdin.nl>
Sun, 27 Jan 2008 13:50:02 +0000 (14:50 +0100)
committerMatthijs Kooijman <matthijs@stdin.nl>
Sun, 27 Jan 2008 13:50:02 +0000 (14:50 +0100)
 * Add some stuff in the base template, there is now a menu and a footer.

static/base/css/.base.css.swp [new file with mode: 0644] patch | blob
static/base/css/base.css [new file with mode: 0644] patch | blob
templates/base/base.html patch | blob | history

diff --git a/static/base/css/.base.css.swp b/static/base/css/.base.css.swp
new file mode 100644 (file)
index 0000000..80efe5c
Binary files /dev/null and b/static/base/css/.base.css.swp differ
diff --git a/static/base/css/base.css b/static/base/css/base.css
new file mode 100644 (file)
index 0000000..d16f883
--- /dev/null
+++ b/static/base/css/base.css
@@ -0,0 +1,23 @@
+.LeftBar {
+       border:solid black;
+       float:left;
+       width:200px;
+       margin-right: 10px;
+}
+
+.Content {
+       float:left;
+       border: solid black;
+       width: 900px;
+       padding: 10px;
+} 
+
+.Clear {
+       clear: both;
+}
+
+.Footer {
+       border: solid black;
+       padding-left: 10px;
+       margin-top:10px;
+}
diff --git a/templates/base/base.html b/templates/base/base.html
index ab807ba9d71434107415d643affa5664bb2950c9..4a35e870d7e07a281466f86d25f06ae012c5a1a9 100644 (file)
--- a/templates/base/base.html
+++ b/templates/base/base.html
@@ -1,8 +1,29 @@
+{% load i18n %}
 <html>
 <head>
+<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{{ STATIC_URL_PREFIX }}/base/css/base.css{% endblock %}"/>
 </head>
 <body>
+<div class="Center">
+<div class="LeftBar">
+<ul>
+       <li><a href="/influences/">Home</a></li>
+       <li><a href="/accounts/logout/">Logout</a></li>
+</ul>
+</div>
+<div class="Content">
 {% block content %}
 {% endblock %}
+</div>
+</div>
+<!-- Dummy class, margins with regard to floats don't work. -->
+<div class="Clear"></div>
+<div class="Footer">
+{% if user.is_authenticated %}
+       <p>{% blocktrans with user.username as username %}You are currently logged in as {{ username }}{% endblocktrans %} 
+       -- <a href="../logout/">{% trans "Logout" %}</a></p>
+{% endif %}
+</div>
+
 </body>
 </html>
Xerxes - Evolution Events informatiesysteem