diff options
| author | etienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864> | 2010-03-07 18:00:32 +0000 |
|---|---|---|
| committer | etienne <etienne@9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864> | 2010-03-07 18:00:32 +0000 |
| commit | 9d42020c24fd85296baa3423c8b70351f54c7179 (patch) | |
| tree | b390d4f69a4e6bd116ced41dbdaeefbb7b770152 /chimere/main | |
| parent | 7dbdebc6d28415e0d735fdd235909666f125ad4b (diff) | |
| download | Chimère-9d42020c24fd85296baa3423c8b70351f54c7179.tar.bz2 Chimère-9d42020c24fd85296baa3423c8b70351f54c7179.zip | |
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
Diffstat (limited to 'chimere/main')
| -rw-r--r-- | chimere/main/models.py | 3 | ||||
| -rw-r--r-- | chimere/main/views.py | 9 |
2 files changed, 8 insertions, 4 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 |