design accueil pour demo recteur

diff --git a/auf_savoirs_en_partage/media/css/global.css b/auf_savoirs_en_partage/media/css/global.css
index 92e07ed..53fa66d 100644 (file)
--- a/auf_savoirs_en_partage/media/css/global.css
+++ b/auf_savoirs_en_partage/media/css/global.css
@@ -49,7 +49,7 @@ sup{font-size: smaller; vertical-align: 0.5em; line-height: 1px;}
 #fond {padding:0; margin:0; display:block; position:relative; width:100%; height:auto !important; height:100%; min-height:100%; background: url(../img/background-fond.jpg) no-repeat 50% 0; text-align:left;}
 #enrobage {padding:0; margin:0 auto; display:block; position:relative; width:960px; height:auto !important; height:100%; min-height:100%;}
 
-div.sous-menu { float:right; padding-top:1px; color:#fff; }
+div.sous-menu { float:right; padding-top:1px; color:#fff; font-weight:bold; }
 div.sous-menu a { display:block; height:19px; padding:5px 10px 1px 10px; color:#fff; font-size:1.1em; text-decoration:none; float:right; white-space:nowrap; background-color:#4c4030;}
 div.sous-menu a:hover { text-decoration:underline;}
 div.sous-menu a.bout-gauche { background:#4c4030 url(../img/sous-menu-top-coin-gauche.gif) no-repeat 0 0; padding-right:5px;}

diff --git a/auf_savoirs_en_partage/savoirs/templatetags/sep_menu.py b/auf_savoirs_en_partage/savoirs/templatetags/sep_menu.py
index 6cf086e..69e8f52 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/templatetags/sep_menu.py
+++ b/auf_savoirs_en_partage/savoirs/templatetags/sep_menu.py
@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
 from django import template
+from datamaster_modeles.models import Region
 from savoirs.models import Discipline
 
-
-
 def sep_menu ():
-    disciplines = Discipline.objects.all ()
-    return {'disciplines': disciplines}
+    regions = Region.objects.filter(actif=True).order_by('nom')
+    disciplines = Discipline.objects.all()
+    return {'disciplines': disciplines, 'regions':regions}
 
 register = template.Library()
 register.inclusion_tag('menu.html')(sep_menu)

diff --git a/auf_savoirs_en_partage/templates/menu.html b/auf_savoirs_en_partage/templates/menu.html
index 3ab0a77..6a955c5 100644 (file)
--- a/auf_savoirs_en_partage/templates/menu.html
+++ b/auf_savoirs_en_partage/templates/menu.html
@@ -27,6 +27,13 @@
 </ul>
 {% endcomment %}
 
+<h4><a href="">Régions</a></h4>
+<ul>
+    {% for r in regions %}
+    <li><a href="{% url savoirs.views.avancee %}?type=avancee&operator=or&subject={{ r.nom }}">{{ r.nom }}</a></li>
+    {% endfor %}
+</ul>
+
 <h4><a href="">Disciplines</a></h4>
 <ul>
     {% for d in disciplines %}