diff options
| -rw-r--r-- | chimere/default_settings.py | 2 | ||||
| -rw-r--r-- | chimere/migrations/0025_auto__add_field_area_dynamic_categories.py | 214 | ||||
| -rw-r--r-- | chimere/models.py | 9 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/map_params.html | 2 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 14 | ||||
| -rw-r--r-- | chimere/views.py | 12 | ||||
| -rw-r--r-- | docs/install.rst | 1 | ||||
| -rw-r--r-- | example_project/locale/fr/LC_MESSAGES/django.po | 78 | ||||
| -rw-r--r-- | example_project/settings.py | 2 |
9 files changed, 285 insertions, 49 deletions
diff --git a/chimere/default_settings.py b/chimere/default_settings.py index 95db972..049520f 100644 --- a/chimere/default_settings.py +++ b/chimere/default_settings.py @@ -20,8 +20,6 @@ CHIMERE_EPSG_PROJECTION = 900913 # projection displayed to the end user by openlayers # chimere use the same projection to save its data in the database CHIMERE_EPSG_DISPLAY_PROJECTION = 4326 -# dynamic load of categories on the main map -CHIMERE_DYNAMIC_CATEGORIES = False # display of shortcuts for areas CHIMERE_DISPLAY_AREAS = True # number of day before an event to display diff --git a/chimere/migrations/0025_auto__add_field_area_dynamic_categories.py b/chimere/migrations/0025_auto__add_field_area_dynamic_categories.py new file mode 100644 index 0000000..ac8b62e --- /dev/null +++ b/chimere/migrations/0025_auto__add_field_area_dynamic_categories.py @@ -0,0 +1,214 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Area.dynamic_categories' + db.add_column('chimere_area', 'dynamic_categories', + self.gf('django.db.models.fields.NullBooleanField')(null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Area.dynamic_categories' + db.delete_column('chimere_area', 'dynamic_categories') + + + models = { + 'chimere.area': { + 'Meta': {'ordering': "('order', 'name')", 'object_name': 'Area'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'default_subcategories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False', 'blank': 'True'}), + 'dynamic_categories': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'external_css': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'layers': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'through': "orm['chimere.AreaLayers']", 'to': "orm['chimere.Layer']"}), + 'lower_right_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'restrict_to_extent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'db_table': "'chimere_subcategory_areas'", 'to': "orm['chimere.SubCategory']"}), + 'upper_left_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}), + 'urn': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'blank': 'True'}), + 'welcome_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + 'chimere.arealayers': { + 'Meta': {'ordering': "('order',)", 'object_name': 'AreaLayers'}, + 'area': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Area']"}), + 'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'layer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Layer']"}), + 'order': ('django.db.models.fields.IntegerField', [], {}) + }, + 'chimere.category': { + 'Meta': {'ordering': "['order']", 'object_name': 'Category'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'order': ('django.db.models.fields.IntegerField', [], {}) + }, + 'chimere.color': { + 'Meta': {'ordering': "['order']", 'object_name': 'Color'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '6'}), + 'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {}) + }, + 'chimere.colortheme': { + 'Meta': {'object_name': 'ColorTheme'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + 'chimere.icon': { + 'Meta': {'object_name': 'Icon'}, + 'height': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'width': ('django.db.models.fields.IntegerField', [], {}) + }, + 'chimere.importer': { + 'Meta': {'object_name': 'Importer'}, + 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}), + 'filtr': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.CharField', [], {'max_length': '4'}), + 'source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'srid': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'zipped': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'chimere.layer': { + 'Meta': {'object_name': 'Layer'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'layer_code': ('django.db.models.fields.TextField', [], {'max_length': '300'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + 'chimere.marker': { + 'Meta': {'ordering': "('status', 'name')", 'object_name': 'Marker'}, + 'available_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'point': ('chimere.widgets.PointField', [], {}), + 'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_marker'", 'null': 'True', 'to': "orm['chimere.Marker']"}), + 'route': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'associated_marker'", 'null': 'True', 'to': "orm['chimere.Route']"}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'submiter_comment': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}) + }, + 'chimere.multimediafile': { + 'Meta': {'object_name': 'MultimediaFile'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'marker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'multimedia_files'", 'to': "orm['chimere.Marker']"}), + 'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.MultimediaType']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}) + }, + 'chimere.multimediatype': { + 'Meta': {'object_name': 'MultimediaType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'iframe': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'media_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + 'chimere.news': { + 'Meta': {'object_name': 'News'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'content': ('django.db.models.fields.TextField', [], {}), + 'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + 'chimere.picturefile': { + 'Meta': {'object_name': 'PictureFile'}, + 'height': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'marker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pictures'", 'to': "orm['chimere.Marker']"}), + 'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), + 'width': ('django.db.models.fields.IntegerField', [], {}) + }, + 'chimere.property': { + 'Meta': {'object_name': 'Property'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'marker': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Marker']"}), + 'propertymodel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.PropertyModel']"}), + 'value': ('django.db.models.fields.TextField', [], {}) + }, + 'chimere.propertymodel': { + 'Meta': {'ordering': "('order',)", 'object_name': 'PropertyModel'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '1'}) + }, + 'chimere.route': { + 'Meta': {'ordering': "('status', 'name')", 'object_name': 'Route'}, + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.RouteFile']", 'null': 'True', 'blank': 'True'}), + 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_route'", 'null': 'True', 'to': "orm['chimere.Route']"}), + 'route': ('chimere.widgets.RouteField', [], {}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'submiter_comment': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'chimere.routefile': { + 'Meta': {'ordering': "('name',)", 'object_name': 'RouteFile'}, + 'file_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'raw_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'simplified_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}) + }, + 'chimere.subcategory': { + 'Meta': {'ordering': "['category', 'order']", 'object_name': 'SubCategory'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Category']"}), + 'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']", 'null': 'True', 'blank': 'True'}), + 'icon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Icon']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'order': ('django.db.models.fields.IntegerField', [], {}) + }, + 'chimere.tinyurl': { + 'Meta': {'object_name': 'TinyUrl'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'parameters': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + } + } + + complete_apps = ['chimere']
\ No newline at end of file diff --git a/chimere/models.py b/chimere/models.py index c96fa96..8297664 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -817,11 +817,14 @@ class Area(models.Model, SimpleArea): layers = SelectMultipleField(Layer, related_name='areas', through='AreaLayers', blank=True) default_subcategories = SelectMultipleField(SubCategory, blank=True, - verbose_name=_(u"Categories checked by default")) + verbose_name=_(u"Themes checked by default")) + dynamic_categories = models.NullBooleanField(_(u"Themes dynamicaly displayed"), + help_text=_(u"If checked, themes are only displayed in the menu if they" + u" are available on the current extent.")) subcategories = SelectMultipleField(SubCategory, related_name='areas', blank=True, db_table='chimere_subcategory_areas', - verbose_name=_(u"Restricted to theses subcategories"), - help_text=_(u"If no subcategory is set all subcategories are available")) + verbose_name=_(u"Restricted to theses subthemes"), + help_text=_(u"If no subtheme is set all subthemes are available")) external_css = models.URLField(_(u"Link to an external CSS"), blank=True, null=True) restrict_to_extent = models.BooleanField(_(u"Restrict to the area extent"), diff --git a/chimere/templates/chimere/blocks/map_params.html b/chimere/templates/chimere/blocks/map_params.html index f05485d..c8f97eb 100644 --- a/chimere/templates/chimere/blocks/map_params.html +++ b/chimere/templates/chimere/blocks/map_params.html @@ -5,7 +5,7 @@ chimere_init_options["map_layers"] = [{{map_layers|safe|escape}}]; chimere_init_options['permalink_label'] = '{%trans "Permalink"%}'; chimere_init_options['permalink_element'] = document.getElementById('permalink'); - {% if dynamic_categories %}chimere_init_options['dynamic_categories'] = 1;{% endif %} + {% if dynamic_categories %}chimere_init_options['dynamic_categories'] = true;{% endif %} {% if default_area %} chimere_init_options["default_area"] = new Array({{default_area.upper_left_corner.x}}, {{default_area.upper_left_corner.y}}, {{default_area.lower_right_corner.x}}, {{default_area.lower_right_corner.y}}); {% endif %} diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index bf7d97c..e7f7248 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -88,10 +88,18 @@ def head_chimere(context): """ Create context and display head elements (js, css, etc.) for chimere. """ + area_name = context['area_name'] if 'area_name' in context else 'area_name' + area = None + if area_name: + try: + area = Area.objects.get(urn=area_name) + except ObjectDoesNotExist: + pass context_data = { "STATIC_URL": settings.STATIC_URL, "MEDIA_URL": settings.MEDIA_URL, - "DYNAMIC_CATEGORIES": settings.CHIMERE_DYNAMIC_CATEGORIES, + "DYNAMIC_CATEGORIES": 'true' if area and area.dynamic_categories \ + else 'false', "EXTRA_URL": reverse("chimere:index"), "EPSG_DISPLAY_PROJECTION": settings.CHIMERE_EPSG_DISPLAY_PROJECTION, "EPSG_PROJECTION": settings.CHIMERE_EPSG_PROJECTION, @@ -106,8 +114,6 @@ def head_chimere(context): @register.inclusion_tag('chimere/blocks/map_params.html', takes_context=True) def map_params(context): context_data = {} - context_data['dynamic_categories'] = 'true' \ - if settings.CHIMERE_DYNAMIC_CATEGORIES else 'false' context_data['icon_offset_x'] = settings.CHIMERE_ICON_OFFSET_X context_data['icon_offset_y'] = settings.CHIMERE_ICON_OFFSET_Y context_data['icon_width'] = settings.CHIMERE_ICON_WIDTH @@ -146,6 +152,8 @@ bounds.extend(new OpenLayers.LonLat(%f, %f)); bounds.extend(new OpenLayers.LonLat(%f, %f)); """ % (area.upper_left_corner.x, area.upper_left_corner.y, area.lower_right_corner.x, area.lower_right_corner.y) + context_data['dynamic_categories'] = 'true' \ + if area and area.dynamic_categories else 'false' if 'request' not in context: return context_data request = context['request'] diff --git a/chimere/views.py b/chimere/views.py index 8b824a0..824d912 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -89,9 +89,12 @@ def get_base_response(area_name=""): area_name = area.urn except ObjectDoesNotExist: pass + base_response_dct['area'] = area base_response_dct['area_name'] = area_name if area and area.external_css: base_response_dct['css_area'] = area.external_css + base_response_dct['dynamic_categories'] = True \ + if area and area.dynamic_categories else False base_response_dct['JQUERY_JS_URLS'] = settings.JQUERY_JS_URLS base_response_dct['JQUERY_CSS_URLS'] = settings.JQUERY_CSS_URLS return base_response_dct, None @@ -122,7 +125,7 @@ def index(request, area_name=None, default_area=None, simple=False): 'news_visible': news_visible, 'areas_visible': settings.CHIMERE_DISPLAY_AREAS, 'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER, - 'dynamic_categories':settings.CHIMERE_DYNAMIC_CATEGORIES, + 'dynamic_categories':response_dct['dynamic_categories'], 'zoomout':zoomout }) tpl = 'chimere/main_map.html' @@ -540,13 +543,14 @@ def get_available_categories(request, area_name=None, area=None, status='A', ''' Get categories for a designed area ''' - if settings.CHIMERE_DYNAMIC_CATEGORIES and \ + context_data, redir = get_base_response(area_name) + area = context_data["area"] + if area and area.dynamic_categories and \ not "current_extent" in request.GET: return "" - context_data, redir = get_base_response(area_name) if redir: return redir - if not settings.CHIMERE_DYNAMIC_CATEGORIES: + if not area or not area.dynamic_categories: # Categories are not updated dynamicaly when the user move the map # so we return ALL the categories subcategories = SubCategory.getAvailable( diff --git a/docs/install.rst b/docs/install.rst index dfa3514..d00a1bc 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -149,7 +149,6 @@ settings are initialized in settings.py. :: for a Debian installation with gpsbabel installed) * CHIMERE_DEFAULT_ZOOM: default zoom on map * CHIMERE_DEFAULT_CENTER: center of the map - * CHIMERE_DYNAMIC_CATEGORIES: dynamic load of categories on the main map * CHIMERE_DISPLAY_AREAS: display area's shortcuts * TIME_ZONE: local time zone for this installation * LANGUAGE_CODE: language code for this installation diff --git a/example_project/locale/fr/LC_MESSAGES/django.po b/example_project/locale/fr/LC_MESSAGES/django.po index 929fd4a..4e41334 100644 --- a/example_project/locale/fr/LC_MESSAGES/django.po +++ b/example_project/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-24 17:45+0200\n" +"POT-Creation-Date: 2012-07-25 21:54+0200\n" "PO-Revision-Date: 2010-03-20 20:00+0100\n" "Last-Translator: Étienne Loks <etienne.loks@peacefrogs.net>\n" "MIME-Version: 1.0\n" @@ -126,20 +126,20 @@ msgstr "Mauvais format de fichier : KML et GPX sont supportés" #: extra-locales/chimere/models.py:232 extra-locales/chimere/models.py:437 #: extra-locales/chimere/models.py:480 extra-locales/chimere/models.py:524 #: extra-locales/chimere/models.py:555 extra-locales/chimere/models.py:792 -#: extra-locales/chimere/models.py:804 extra-locales/chimere/models.py:884 +#: extra-locales/chimere/models.py:804 extra-locales/chimere/models.py:887 #: extra-locales/chimere/templates/chimere/edit.html:39 #: extra-locales/chimere/templates/chimere/edit_route.html:36 msgid "Name" msgstr "Nom" -#: extra-locales/chimere/forms.py:378 extra-locales/chimere/models.py:836 +#: extra-locales/chimere/forms.py:378 extra-locales/chimere/models.py:839 msgid "Area" msgstr "Zone" #: extra-locales/chimere/models.py:49 extra-locales/chimere/models.py:123 #: extra-locales/chimere/models.py:150 extra-locales/chimere/models.py:241 #: extra-locales/chimere/models.py:441 extra-locales/chimere/models.py:810 -#: extra-locales/chimere/models.py:886 +#: extra-locales/chimere/models.py:889 msgid "Available" msgstr "Disponible" @@ -172,7 +172,7 @@ msgstr "Code" #: extra-locales/chimere/models.py:111 extra-locales/chimere/models.py:124 #: extra-locales/chimere/models.py:154 extra-locales/chimere/models.py:482 #: extra-locales/chimere/models.py:531 extra-locales/chimere/models.py:809 -#: extra-locales/chimere/models.py:873 extra-locales/chimere/models.py:885 +#: extra-locales/chimere/models.py:876 extra-locales/chimere/models.py:888 msgid "Order" msgstr "Ordre" @@ -349,7 +349,7 @@ msgstr "Date de mise en disponibilité" msgid "Description" msgstr "Description" -#: extra-locales/chimere/models.py:337 extra-locales/chimere/models.py:908 +#: extra-locales/chimere/models.py:337 extra-locales/chimere/models.py:911 msgid "Point of interest" msgstr "Point d'intérêt" @@ -467,60 +467,72 @@ msgid "Only one area is set by default" msgstr "Seule une zone est définie par défaut" #: extra-locales/chimere/models.py:820 -msgid "Categories checked by default" -msgstr "Catégories cochées par défaut" +msgid "Themes checked by default" +msgstr "Thèmes cochés par défaut" + +#: extra-locales/chimere/models.py:821 +msgid "Themes dynamicaly displayed" +msgstr "Thèmes affichés dynamiquement" + +#: extra-locales/chimere/models.py:822 +msgid "" +"If checked, themes are only displayed in the menu if they are available on " +"the current extent." +msgstr "" +"Si coché, les thèmes sont disponibles sur le menu seulement si ils " +"apparaissent sur la zone affichée." -#: extra-locales/chimere/models.py:823 -msgid "Restricted to theses subcategories" -msgstr "Restreindre à ces sous-catégories" +#: extra-locales/chimere/models.py:826 +msgid "Restricted to theses subthemes" +msgstr "Restreindre à ces sous-thèmes" -#: extra-locales/chimere/models.py:824 -msgid "If no subcategory is set all subcategories are available" +#: extra-locales/chimere/models.py:827 +msgid "If no subtheme is set all subthemes are available" msgstr "" -"Si aucune sous-catégorie n'est définie toutes les sous-catégories sont " +"Si aucun sous-thème n'est défini tous les sous-thèmes sont " "disponibles" -#: extra-locales/chimere/models.py:825 +#: extra-locales/chimere/models.py:828 msgid "Link to an external CSS" msgstr "Lien vers une feuille de style externe" -#: extra-locales/chimere/models.py:827 +#: extra-locales/chimere/models.py:830 msgid "Restrict to the area extent" msgstr "Restreindre à l'étendue de la zone" -#: extra-locales/chimere/models.py:874 +#: extra-locales/chimere/models.py:877 msgid "Default layer" msgstr "Couche par défaut" -#: extra-locales/chimere/models.py:878 extra-locales/chimere/models.py:879 +#: extra-locales/chimere/models.py:881 extra-locales/chimere/models.py:882 msgid "Layers" msgstr "Couches" -#: extra-locales/chimere/models.py:887 +#: extra-locales/chimere/models.py:890 msgid "Text" msgstr "Texte" -#: extra-locales/chimere/models.py:888 +#: extra-locales/chimere/models.py:891 msgid "Long text" msgstr "Texte long" -#: extra-locales/chimere/models.py:889 +#: extra-locales/chimere/models.py:892 msgid "Password" msgstr "Mot de passe" -#: extra-locales/chimere/models.py:893 +#: extra-locales/chimere/models.py:896 msgid "Type" msgstr "Type" -#: extra-locales/chimere/models.py:898 extra-locales/chimere/models.py:910 +#: extra-locales/chimere/models.py:901 extra-locales/chimere/models.py:913 msgid "Property model" msgstr "Modèle de propriété" -#: extra-locales/chimere/models.py:911 +#: extra-locales/chimere/models.py:914 msgid "Value" msgstr "Valeur" -#: extra-locales/chimere/models.py:915 +#: extra-locales/chimere/models.py:918 msgid "Property" msgstr "Propriété" @@ -620,19 +632,19 @@ msgstr "" msgid "Bad param" msgstr "Mauvais paramètre" -#: extra-locales/chimere/views.py:220 +#: extra-locales/chimere/views.py:223 msgid "There are missing field(s) and/or errors in the submited form." msgstr "Il y a des champs manquants ou des erreurs dans ce formulaire." -#: extra-locales/chimere/views.py:299 +#: extra-locales/chimere/views.py:302 msgid "Bad file. Please check it with an external software." msgstr "Fichier incohérent. Merci de le vérifier avec un logiciel externe." -#: extra-locales/chimere/views.py:421 +#: extra-locales/chimere/views.py:424 msgid "Comments/request on the map" msgstr "Commentaires/requètes sur la carte" -#: extra-locales/chimere/views.py:424 +#: extra-locales/chimere/views.py:427 msgid "" "Thank you for your contribution. It will be taken into account. If you have " "left your email you may be contacted soon for more details." @@ -641,15 +653,15 @@ msgstr "" "laissé votre courriel vous serez peut-être contacté bientôt pour plus de " "détails." -#: extra-locales/chimere/views.py:428 +#: extra-locales/chimere/views.py:431 msgid "Temporary error. Renew your message later." msgstr "Erreur temporaire. Réenvoyez votre message plus tard." -#: extra-locales/chimere/views.py:558 +#: extra-locales/chimere/views.py:562 msgid "No category available in this area." msgstr "Pas de catégorie disponible sur cette zone." -#: extra-locales/chimere/views.py:665 +#: extra-locales/chimere/views.py:669 msgid "Incorrect choice in the list" msgstr "Choix incorrect dans la liste" @@ -921,7 +933,7 @@ msgstr "Continuer l'édition de cet élément" msgid "Return to the map" msgstr "Retourner à la carte" -#: extra-locales/chimere/templates/chimere/blocks/welcome.html:31 +#: extra-locales/chimere/templates/chimere/blocks/welcome.html:47 msgid "See it on the map" msgstr "Voir sur la carte" diff --git a/example_project/settings.py b/example_project/settings.py index 1eed91b..e0975e1 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -41,8 +41,6 @@ CHIMERE_EPSG_PROJECTION = 900913 # projection displayed to the end user by openlayers # chimere use the same projection to save its data in the database CHIMERE_EPSG_DISPLAY_PROJECTION = 4326 -# dynamic load of categories on the main map -CHIMERE_DYNAMIC_CATEGORIES = False # display of shortcuts for areas CHIMERE_DISPLAY_AREAS = True # number of day before an event to display |