changeset 34:e9bed7886bc8

Added a var to not show the left main if is not None and move the left menu to the base.djhtml
author Jonathan Gonzalez V <zeus@lunareja.(none)>
date Mon, 25 May 2009 01:20:12 -0400
parents 927ad55a803c
children 2cf69823169f
files media/css/Savannah.css savane/main/views.py template/base.djhtml template/index.djhtml
diffstat 4 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/media/css/Savannah.css
+++ b/media/css/Savannah.css
@@ -156,6 +156,8 @@
    height: 300px;
    background-color: #ffe4b7;
    float: left;
+   margin: 4px;
+   border: thin dotted #E0C080;
 }
 
 /* End Menu */
--- a/savane/main/views.py
+++ b/savane/main/views.py
@@ -3,7 +3,5 @@
 from django.http import HttpResponse
 
 def index(request):
-    authenticated = request.user.is_authenticated()
-
-    return render_to_response( 'index.djhtml', RequestContext( request, {'authenticated': authenticated},
+    return render_to_response( 'index.djhtml', RequestContext( request, {'has_left_menu': False},
                                                                ) )
--- a/template/base.djhtml
+++ b/template/base.djhtml
@@ -59,8 +59,14 @@
     {% endif %}
     <div class="root">
       <div class="body">
+        {% ifequal has_left_menu None %}
+        <div class="menu_left">
+        </div>
+        {% endifequal %}
+        <div class="content">
         {% block content %}
         {% endblock %}
+        </div>
       </div>
     </div>
 
--- a/template/index.djhtml
+++ b/template/index.djhtml
@@ -1,7 +1,6 @@
 {%  extends "base.djhtml" %}
 
 {% block content %}
-<div class="content">
 	<p>
 		Welcome to <strong>Savannah</strong>, the software forge for people
 		committed to <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>:
@@ -154,5 +153,4 @@
 			<span><a href="/search/?type_of_search=soft&amp;words=%%%&amp;type=1">[all Official GNU software projects]</a></span>
 		</div>
 	</div>
-</div>
 {% endblock %}