projects / matthijs / projects / xerxes.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9922f7b)
* Restructure HTML, add a link to the main EE CSS and add some other CSS (Brenda).
authorMatthijs Kooijman <matthijs@stdio.flexvps.nl>
Fri, 8 Feb 2008 21:54:00 +0000 (22:54 +0100)
committerMatthijs Kooijman <matthijs@stdio.flexvps.nl>
Fri, 8 Feb 2008 21:54:00 +0000 (22:54 +0100)
static/base/css/base.css patch | blob | history
templates/base/base.html patch | blob | history

diff --git a/static/base/css/base.css b/static/base/css/base.css
index d16f8833486c3ddde58842c86568f77704abcebb..27bda31e1f70f3b47a8d62ca482476d819690a7e 100644 (file)
--- 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 8fefc9a32e661ac8533285c676859885cf880fd6..3cbb3533511ef3ad5975eaa2a558f1bc705a7a4d 100644 (file)
--- a/templates/base/base.html
+++ b/templates/base/base.html
@@ -1,28 +1,72 @@
 {% load i18n %}
 <html>
 <head>
+<link rel="stylesheet" type="text/css" href="http://www.evolution-events.nl/algemeen/css.php?skin=winter"/>
 <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">
+<div class="logo"></div>
+
+<div class="navrechts">
+       <div class="borderNavRight">
+               <div class="topleft">&nbsp;</div>
+               <div class="topright">&nbsp;</div>
+               <div class="topline">&nbsp;</div>
+       </div>  
+       <div class="kalender">
 {% if user.is_authenticated %}
        <p>{% blocktrans with user.username as username %}You are currently logged in as {{ username }}{% endblocktrans %} 
        -- <a href="{% url logout %}">{% trans "Logout" %}</a></p>
+{% else %}
+       <p>{% blocktrans %}Please login{% endblocktrans %}</a></p>
 {% endif %}
+       </div>
+       <div class="borderNavRight">
+               <div class="botleft">&nbsp;</div>
+               <div class="botright">&nbsp;</div>
+               <div class="botline">&nbsp;</div>
+       </div>  
+</div>
+
+
+<div class="navleft">
+       <div class="borderNavleft">
+               <div class="topleft">&nbsp;</div>
+               <div class="topright">&nbsp;</div>
+
+               <div class="topline">&nbsp;</div>
+       </div>  
+               <div class="navleftbox">
+               <ul>
+                       <li><a href="/influences/">Home</a></li>
+                       <li><a href="/accounts/logout/">Logout</a></li>
+               </ul>
+               </div>
+               <div class="borderNavleft">
+                       <div class="botleft">&nbsp;</div>
+                       <div class="botright">&nbsp;</div>
+
+                       <div class="botline">&nbsp;</div>
+               </div>  
+</div>
+
+<div class="midden">
+       <div class="borderNavmidden">
+               <div class="topleft">&nbsp;</div>
+               <div class="topright">&nbsp;</div>
+               <div class="topline">&nbsp;</div>
+       </div>
+
+       <div class="navmidden">
+{% block content %}
+{% endblock %}
+       </div>
+       <div class="borderNavmidden">
+
+               <div class="botleft">&nbsp;</div>
+               <div class="botright">&nbsp;</div>
+               <div class="botline">&nbsp;</div>
+       </div>
 </div>
 
 </body>
Xerxes - Evolution Events informatiesysteem