Specific CSS whith specific URL - #85\nDisplay of shortcuts are optionnal - #83

git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@70 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864

5 files changed, 18 insertions, 9 deletions

diff --git a/chimere/main/models.py b/chimere/main/models.py
index c977446..283ae1d 100644
--- a/chimere/main/models.py
+++ b/chimere/main/models.py
@@ -29,7 +29,6 @@ from chimere import settings
 from chimere.main.widgets import PointField, RouteField, \
                                  ManyToManyField_NoSyncdb
 
-
 class News(models.Model):
     """News of the site
     """
@@ -337,7 +336,7 @@ class Area(models.Model, SimpleArea):
     """Rectangular area of the map
     """
     name = models.CharField(_("Name"), max_length=150)
-    url = models.CharField(_("Url"), max_length=100, blank=True)
+    urn = models.CharField(_("Area urn"), max_length=100, blank=True)
     subcategories = ManyToManyField_NoSyncdb(SubCategory,
                 related_name='subcategories', blank=True, null=True,
                 db_table=u'subcategory_areas')
diff --git a/chimere/main/views.py b/chimere/main/views.py
index dae5f82..fc5e4c4 100644
--- a/chimere/main/views.py
+++ b/chimere/main/views.py
@@ -52,6 +52,9 @@ def get_base_response(area_name=""):
         base_url = '/' + area_name + base_url
     base_response_dct['extra_url'] = base_url
     base_response_dct['area_name'] = area_name
+    if settings.CSS_AREAS:
+        base_response_dct['css_area'] = area_name + ".css"
+    base_response_dct['area_name'] = area_name
     return base_response_dct
 
 def index(request, area_name=None, default_area=None):
@@ -74,12 +77,14 @@ def index(request, area_name=None, default_area=None):
         request.session['last_visit'] = today
         display_welcome = True
     response_dct = get_base_response(area_name)
+    areas = None
+    if settings.DISPLAY_AREAS:
+        areas = Area.getAvailable()
     response_dct.update({'actions':actions, 'action_selected':('view',),
                          'error_message':'', 'default_area':default_area,
                          'extra_head':extra + getMapJS(area_name),
                          'welcome':welcome(request, display_welcome),
-                         'areas':Area.getAvailable(),
-                         'map_layer':settings.MAP_LAYER,
+                         'areas':areas, 'map_layer':settings.MAP_LAYER,
                          'dynamic_categories':settings.DYNAMIC_CATEGORIES,
                         })
     # manage permalink
diff --git a/chimere/settings.py b/chimere/settings.py
index f1a2e87..503d681 100644
--- a/chimere/settings.py
+++ b/chimere/settings.py
@@ -17,10 +17,14 @@ TINYMCE_URL = SERVER_URL + 'tinymce/'
 DEFAULT_CENTER = (-1.679444, 48.114722)
 EPSG_PROJECTION = 900913
 EPSG_DISPLAY_PROJECTION = 4326
-# if you want to restrict the map to a defined bounding box set it here
+# to restrict the map to a defined bounding box set it here
 RESTRICTED_EXTENT = None
-# if you want a dynamic load of categories on the main map
+# dynamic load of categories on the main map
 DYNAMIC_CATEGORIES = False
+# display of shortcuts for areas
+DISPLAY_AREAS = True
+# specific css for areas
+CSS_AREAS = True
 
 # default id category to check on the map
 DEFAULT_CATEGORIES = [1]
diff --git a/chimere/templates/base.html b/chimere/templates/base.html
index ce5160b..0d40c4c 100644
--- a/chimere/templates/base.html
+++ b/chimere/templates/base.html
@@ -10,6 +10,7 @@
     // --></script>
     {% block extra_head %}{{extra_head|safe}}{% endblock %}
     <link rel="stylesheet" href="{{media_path}}styles.css" />
+    {%if css_area%}<link rel="stylesheet" href="{{media_path}}{{css_area}}" />{%endif%}
     {% block head %}{% endblock %}
 </head>
 
diff --git a/chimere/urls.py b/chimere/urls.py
index 11bae0a..d725d0b 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -45,14 +45,14 @@ urlpatterns = patterns('',
 urlpatterns += patterns('chimere.main.views',
 )
 
-url_areas = Area.objects.filter(url__isnull=False)
+url_areas = Area.objects.filter(urn__isnull=False)
 urlpatterns += patterns('chimere.main.views', (base + r'$', 'index'),)
 
 for area in url_areas:
     urlpatterns += patterns('chimere.main.views',
-              (base + '(' + area.url + ')/?$', 'index', {'default_area':area}),)
+              (base + '(' + area.urn + ')/?$', 'index', {'default_area':area}),)
 
-extra = "|".join([area.url for area in url_areas])
+extra = "|".join([area.urn for area in url_areas])
 if extra:
     extra = "(%s)?/?" % extra
 urlpatterns += patterns('chimere.main.views',