summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chimere/migrations/0019_auto__chg_field_layer_layer_code__add_field_area_welcome_message.py214
-rw-r--r--chimere/models.py2
-rw-r--r--chimere/static/chimere/css/styles.css62
-rw-r--r--chimere/templates/chimere/blocks/areas.html14
-rw-r--r--chimere/templates/chimere/blocks/map_params.html1
-rw-r--r--chimere/templates/chimere/blocks/welcome.html13
-rw-r--r--chimere/templates/chimere/main_map.html7
-rw-r--r--chimere/templatetags/chimere_tags.py6
-rw-r--r--chimere/views.py4
9 files changed, 278 insertions, 45 deletions
diff --git a/chimere/migrations/0019_auto__chg_field_layer_layer_code__add_field_area_welcome_message.py b/chimere/migrations/0019_auto__chg_field_layer_layer_code__add_field_area_welcome_message.py
new file mode 100644
index 0000000..d6475c1
--- /dev/null
+++ b/chimere/migrations/0019_auto__chg_field_layer_layer_code__add_field_area_welcome_message.py
@@ -0,0 +1,214 @@
+# encoding: 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):
+
+ # Changing field 'Layer.layer_code'
+ db.alter_column('chimere_layer', 'layer_code', self.gf('django.db.models.fields.TextField')(max_length=300))
+
+ # Adding field 'Area.welcome_message'
+ db.add_column('chimere_area', 'welcome_message', self.gf('django.db.models.fields.TextField')(null=True, blank=True), keep_default=False)
+
+
+ def backwards(self, orm):
+
+ # Changing field 'Layer.layer_code'
+ db.alter_column('chimere_layer', 'layer_code', self.gf('django.db.models.fields.CharField')(max_length=300))
+
+ # Deleting field 'Area.welcome_message'
+ db.delete_column('chimere_area', 'welcome_message')
+
+
+ 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'}),
+ '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', [], {}),
+ 'upper_left_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
+ 'urn': ('django.db.models.fields.SlugField', [], {'db_index': 'True', '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'},
+ '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'},
+ 'areas': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'subcategories'", 'blank': 'True', 'to': "orm['chimere.Area']"}),
+ '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']
diff --git a/chimere/models.py b/chimere/models.py
index 1c7db0d..5fe213b 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -780,6 +780,8 @@ class Area(models.Model, SimpleArea):
name = models.CharField(_(u"Name"), max_length=150)
urn = models.SlugField(_(u"Area urn"), max_length=50, blank=True,
unique=True)
+ welcome_message = models.TextField(_(u"Welcome message"), blank=True,
+ null=True)
order = models.IntegerField(_(u"Order"))
available = models.BooleanField(_(u"Available"))
upper_left_corner = models.PointField(_(u"Upper left corner"),
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 1906536..1c5d923 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -15,9 +15,7 @@ a, a:link, a:visited, legend,
h2, h3, th, .action li, .action li a,
.action li li a,
-#footer a, #footer a:link, #footer a:visited, .ui-widget-header,
-a#welcome_button, a:visited#welcome_button, a:link#welcome_button,
-.olControlPermalink a{
+#footer a, #footer a:link, #footer a:visited, .ui-widget-header{
color:#fff;
}
@@ -31,10 +29,8 @@ a#welcome_button, a:visited#welcome_button, a:link#welcome_button,
body, h2, h3, th,
.ui-widget-header,
.action li.selected,
-#welcome_button,
#content .olControlLayerSwitcher .layersDiv,
-#content .olControlLayerSwitcher span,
-.olControlPermalink{
+#content .olControlLayerSwitcher span{
background-color:#4ea30d;
}
@@ -57,9 +53,7 @@ div.warning, .errorlist{
background-color:transparent;
}
-.action li.selected,
-#welcome_button,
-.olControlPermalink{
+.action li.selected{
border:1px solid #54c200;
}
@@ -253,18 +247,30 @@ ul#action-2 {
top:5px;
}
-#areas, #areas-select-div{
+#utils-div{
position:absolute;
z-index:5;
}
-#areas-select-div{
+#utils-div{
left:28px;
- bottom:65px;
+ bottom:20px;
+ padding:0.3em;
+ padding-right:1.4em;
+ width:auto;
+}
+
+#areas-div,
+#areas-div label{
padding:0.3em;
}
#areas{
+ position:absolute;
+ z-index:5;
+}
+
+#areas{
bottom:105px;
left:18px;
padding:0;
@@ -286,17 +292,6 @@ ul#action-2 {
text-align:center;
}
-/*
-#welcome{
- padding:6px 10px;
- position:absolute;
- z-index:5;
- top:50px;
- bottom:102px;
- left:80px;
- margin-right:360px;
-}*/
-
#detail{
display:none;
padding:0;
@@ -501,23 +496,26 @@ div.errors ul{
p.warning{
}
-#welcome_button {
+#welcome_button,
+#permalink{
display: block;
- position: absolute;
- bottom:40px;
- left:29px;
- width:180px;
- font-size:small;
text-align:center;
- z-index:4;
+ margin:0.3em;
+ padding:0.2em;
}
-a#welcome_button{
+a#welcome_button,
+#permalink{
font-size:14px;
text-align:center;
text-decoration:none;
}
+#welcome_button,
+#permalink{
+ width:100%;
+}
+
/* forms */
table.inline-table{
@@ -550,7 +548,7 @@ table.inline-table td input[type=file]{
position: absolute;
bottom:14px;
left:28px;
- width:180px;
+ width:160px;
font-size:small;
font-size:80%;
text-align:center;
diff --git a/chimere/templates/chimere/blocks/areas.html b/chimere/templates/chimere/blocks/areas.html
index 4133ac1..807b4b2 100644
--- a/chimere/templates/chimere/blocks/areas.html
+++ b/chimere/templates/chimere/blocks/areas.html
@@ -1,12 +1,12 @@
{% load i18n %}
{% if areas %}
- <div id='areas-select-div' class='ui-widget ui-button ui-state-default ui-corner-all'>
- <label for='areas-select'>{% trans "Areas" %}</label>
- <select id='areas-select'>
- {% for area in areas %}
- <option value='{{area.urn}}'{% if area_name and area.urn == area_name %} selected='selected'{% endif %}{% if not area_name and area.default %} selected='selected'{% endif %}>{{area.name}}</option>
- {% endfor %}
- </select>
+ <div id='areas-div'>
+ <label for='areas-select'>{% trans "Areas:" %}</label>
+ <select id='areas-select'>
+ {% for area in areas %}
+ <option value='{{area.urn}}'{% if area_name and area.urn == area_name %} selected='selected'{% endif %}{% if not area_name and area.default %} selected='selected'{% endif %}>{{area.name}}</option>
+ {% endfor %}
+ </select>
</div>
<script language='javascript' type='text/javascript'>
jQuery('#areas-select').change(
diff --git a/chimere/templates/chimere/blocks/map_params.html b/chimere/templates/chimere/blocks/map_params.html
index c4c279c..794798b 100644
--- a/chimere/templates/chimere/blocks/map_params.html
+++ b/chimere/templates/chimere/blocks/map_params.html
@@ -3,6 +3,7 @@
var chimere_init_options = {};
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 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}});
diff --git a/chimere/templates/chimere/blocks/welcome.html b/chimere/templates/chimere/blocks/welcome.html
index 6751f14..7495564 100644
--- a/chimere/templates/chimere/blocks/welcome.html
+++ b/chimere/templates/chimere/blocks/welcome.html
@@ -1,6 +1,6 @@
-{% load i18n %}
-{% load sanitize %}
-<a href='#' id='welcome_button'>{% trans "Welcome message"%}</a>
+{% load i18n sanitize %}
+{% if news_lst or welcome_message %}
+<a href='#' id='welcome_button' class='ui-widget ui-button ui-state-default ui-corner-all'>{% trans "Welcome message"%}</a>
<script type='text/javascript'>
function display_welcome(){$("#welcome").dialog({title:"{% trans "News"%}"});}
$("#welcome_button").bind('click', display_welcome);
@@ -8,7 +8,11 @@
</script>
<div id='welcome' style='display:none'>
<div id='detail_content'>
- {% include "chimere/blocks/welcome_message.html" %}
+ {% if welcome_message %}
+ <div id='welcome_message'>
+ {{welcome_message|safe}}
+ </div>
+ {% endif %}
<div class='news'>
{% if news_lst %}
{% for news in news_lst %}
@@ -31,3 +35,4 @@
</div>
</div>
</div>
+{% endif %}
diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html
index 10635bd..3d1e016 100644
--- a/chimere/templates/chimere/main_map.html
+++ b/chimere/templates/chimere/main_map.html
@@ -13,17 +13,20 @@
<h2 class='ui-widget ui-state-default ui-corner-all ui-widget-header'>{% trans "Topics"%}</h2>
<form method='post' name='frm_categories' id='frm_categories'>
<div id='categories'>
- <!-- Categories are displayed in JS -->
+ {# Categories are displayed in JS #}
</div>
</form>
</div>
+ <div id='utils-div' class='ui-widget ui-state-default ui-corner-all'>
{% if areas_visible %}
{% display_areas %}
{% endif %}
+ {% display_news news_visible %}
+ <div id='permalink' class='ui-widget ui-button ui-state-default ui-corner-all'></div>
+ </div>
<div id='detail' class='ui-widget ui-corner-all'></div>
<div id='category_detail'></div>
- {% display_news news_visible %}
{% endblock %}
{% block content %}
<div id='map'>
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index a75d9d6..11ef3bc 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -48,6 +48,12 @@ def display_news(context, display=False):
news += list(Marker.objects.available().active())
news.sort(key=lambda x:x.date, reverse=True)
context_data['news_lst'] = news
+ if "area_name" in context:
+ try:
+ area = Area.objects.get(urn=context["area_name"])
+ context_data['welcome_message'] = area.welcome_message
+ except ObjectDoesNotExist:
+ pass
return context_data
@register.inclusion_tag('chimere/blocks/head_jquery.html', takes_context=True)
diff --git a/chimere/views.py b/chimere/views.py
index 8c1250d..a9c0480 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -87,6 +87,10 @@ def index(request, area_name=None, default_area=None, simple=False,
default_area = Area.objects.get(urn=area_name)
except Area.DoesNotExist:
return redirect(reverse('chimere:index'))
+ # don't mess with permalink
+ if zoomout and request.GET and 'lat' in request.GET \
+ and 'lon' in request.GET:
+ zoomout = None
response_dct.update({
'actions':actions, 'action_selected':('view',),
'error_message':'', 'default_area':default_area,
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 03:08:54 +0000