From fea958d3e513c8237f509186bccb706cc655f363 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Wed, 30 Jan 2013 19:46:43 +0100
Subject: Remove outdated markers from news

---
 chimere/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'chimere/views.py')

diff --git a/chimere/views.py b/chimere/views.py
index db63809..6a51394 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2008-2012  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2008-2013  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 #
 # RSS : Copyright (C) 2010 Pierre Clarenc <pierre.crc_AT_gmailDOTcom>,
 #                          Samuel Renard <renard.samuel_AT_gmailDOTcom>,
-- 
cgit v1.2.3


From ae84c6703fa9bf1b937b23dde15df3bd7e63aef4 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Fri, 1 Feb 2013 12:50:47 +0100
Subject: Improve template when no default area is defined

---
 chimere/templates/chimere/blocks/areas.html | 1 +
 chimere/views.py                            | 1 +
 2 files changed, 2 insertions(+)

(limited to 'chimere/views.py')

diff --git a/chimere/templates/chimere/blocks/areas.html b/chimere/templates/chimere/blocks/areas.html
index 8c4b981..a1ebe76 100644
--- a/chimere/templates/chimere/blocks/areas.html
+++ b/chimere/templates/chimere/blocks/areas.html
@@ -3,6 +3,7 @@
     <div id='areas-div'>
         <label for='areas-select'>{% trans "Areas:" %}</label>
         <select id='areas-select'>
+            {% if not has_default_area %}<option value=''>--</option>{% endif %}
         {% 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 %}
diff --git a/chimere/views.py b/chimere/views.py
index 6a51394..946682e 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -130,6 +130,7 @@ def index(request, area_name=None, default_area=None, simple=False):
          'areas_visible': settings.CHIMERE_DISPLAY_AREAS,
          'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER,
          'dynamic_categories':response_dct['dynamic_categories'],
+         'has_default_area':Area.objects.filter(default=True).count(),
          'zoomout':zoomout
         })
     tpl = 'chimere/main_map.html'
-- 
cgit v1.2.3


From ec3320209e19c837705edc90d629d77bc2cdce5a Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Fri, 1 Feb 2013 13:18:45 +0100
Subject: Templates: more explicit messages on edition pages.

---
 chimere/templates/chimere/detail.html     | 10 ++++++----
 chimere/templates/chimere/edit.html       |  3 ++-
 chimere/templates/chimere/edit_route.html |  3 ++-
 chimere/views.py                          |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'chimere/views.py')

diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index 33ddfd1..eec932c 100644
--- a/chimere/templates/chimere/detail.html
+++ b/chimere/templates/chimere/detail.html
@@ -24,18 +24,19 @@
     {% endfor %}
     {% if marker.origin %}<p class='detail_source'><strong>{% trans "Source:" %}</strong> <span>{{marker.origin}}</span></p>{% endif %}
     {% if marker.license %}<p class='detail_license'><strong>{% trans "License:" %}</strong> <span>{{marker.license}}</span></p>{% endif %}
-    {% if marker.multimedia_items %}
+    {% if marker.multimedia_items %}<p class='detail_multimedia'>
     <a href='#' class='show_gallery_link'>{% trans "Show multimedia gallery" %}</a>
-    {% endif %}
+    </p>{% endif %}
     </div>
-    <a href='{% if marker.route %}{% url chimere:editroute-item area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url chimere:edit-item area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'>
+    <p class='detail_amendment'><a href='{% if marker.route %}{% url chimere:editroute-item area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url chimere:edit-item area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'>
         {% trans "Submit an amendment" %}
     </a>
     {% if moderator_emails %}
     <a href="mailto:?from={{moderator_emails}}&subject={% trans "Propose amendment" %}&body={% trans "I would like to propose an amendment for this item:"%} {{share_url}}">
         {% trans "Propose amendment" %}
-    </a>{%endif%}
+    </a>{%endif%}</p>
     {% if share_networks %}
+    <p class='detail_share'>
     {% if simple %}{% trans "Share on"%}{% for share_network in share_networks %}
     <a href='{{share_network.1}}'>{{share_network.0}}</a>
     {% endfor %}{%else%}
@@ -43,6 +44,7 @@
         <li>{% trans "Share"%}</li>{% for share_network in share_networks %}
         <li><a href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li>
     {% endfor %}</ul>{% endif %}
+    </p>
 {% endif %}
 </div>
 {% if marker.multimedia_items %}
diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html
index 66862cd..341f9b5 100644
--- a/chimere/templates/chimere/edit.html
+++ b/chimere/templates/chimere/edit.html
@@ -20,8 +20,9 @@
         <legend>{% trans "Error" %}</legend>
         <p>{{ error_message }}</p>
     {% endif %}</fieldset>
+    {% if is_modification and is_superuser %}<div class='warning'><p>{% trans "You are logged as an administrator. Your modifications will be taking into account immediately." %}</p></div>{% endif %}
     <fieldset class='edit'>
-    <legend>{% trans "Add/modify a point of interest" %}</legend>
+    <legend>{% if is_modification %}{% trans "Modify a point of interest" %}{% else %}{% trans "Add a point of interest" %}{% endif %}</legend>
     <form enctype="multipart/form-data" method='post' action='.'>
     {% csrf_token %}
     <div class='rightWrapper'>
diff --git a/chimere/templates/chimere/edit_route.html b/chimere/templates/chimere/edit_route.html
index 0221949..10f4d5e 100644
--- a/chimere/templates/chimere/edit_route.html
+++ b/chimere/templates/chimere/edit_route.html
@@ -17,8 +17,9 @@
     {{ block.super }}
     {% if submited %}{% submited %}{% endif %}
     {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+    {% if is_modification and is_superuser %}<div class='warning'><p>{% trans "You are logged as an administrator. Your modifications will be taking into account immediately." %}</p></div>{% endif %}
     <fieldset class='edit'>
-    <legend>{% trans "Add/modify a route" %}</legend>
+    <legend>{% if is_modification %}{% trans "Modify a route" %}{% else %}{% trans "Add a route" %}{% endif %}</legend>
     <form enctype="multipart/form-data" method='post' action='.'>
     {% csrf_token %}
     <div class='rightWrapper'>
diff --git a/chimere/views.py b/chimere/views.py
index 6a51394..a874c75 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -170,6 +170,7 @@ def get_edit_page(redirect_url, item_cls, item_form,
                                submiter_session_key=request.session.session_key)
             if modified_item.count():
                 init_item = modified_item.all()[0]
+            response_dct['is_modification'] = True
 
         init_multi = init_item.get_init_multi() if init_item else None
         init_picture = init_item.get_init_picture() if init_item else None
@@ -179,6 +180,7 @@ def get_edit_page(redirect_url, item_cls, item_form,
             # hide personal information
             for k in ('submiter_name', 'submiter_email', 'submiter_comment'):
                 setattr(init_item, k, '')
+        response_dct['is_superuser'] = request.user.is_superuser
         # If the form has been submited
         if request.method == 'POST':
             inst = None
-- 
cgit v1.2.3


From f600a6e722d097ad4f9ba31fd49f8e84fc8ea23c Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Sat, 2 Feb 2013 00:20:42 +0100
Subject: JS: when the marker selected is associated to a route zoom to its
 extent

---
 chimere/static/chimere/js/jquery.chimere.js | 12 ++++++++++--
 chimere/templates/chimere/blocks/map.html   |  5 +++--
 chimere/templatetags/chimere_tags.py        |  1 +
 chimere/views.py                            |  7 +++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'chimere/views.py')

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 3168c24..2c8bb97 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -61,6 +61,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             dynamic_categories: false,
             display_submited: false,
             display_feature: null,
+            display_route: null,
             area_id: null,
             checked_categories: [],
             zoom: null,
@@ -433,8 +434,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             if (settings.display_feature == feature.pk){
                 _popup(feature);
                 methods.display_feature_detail(feature.pk);
-                settings.map.setCenter(feature.lonlat, 16);
-                methods.loadCategories();
+                if (!settings.display_route){
+                    settings.map.setCenter(feature.lonlat, 16);
+                    methods.loadCategories();
+                }
             }
             return feature;
         },
@@ -461,6 +464,11 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             settings.current_feature.style = style;
             settings.current_feature.geometry = linestring;
             settings.layerVectors.addFeatures([settings.current_feature]);
+            if (settings.display_route && settings.display_route == route.properties.pk){
+                var dataExtent = settings.current_feature.geometry.getBounds();
+                map.zoomToExtent(dataExtent, closest=true);
+                methods.loadCategories();
+            }
         },
         display_feature_detail: function (pk) {
             /*
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 886c50b..9788528 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -31,8 +31,9 @@
     chimere_init_options["checked_categories"] = {{ p_checked_categories }};
     {% if area_id %}chimere_init_options['area_id'] = "{{area_id}}";{% endif %}
     {% if p_current_feature %}
-    chimere_init_options["display_feature"] = {{ p_current_feature }};
-    {% endif %}
+    chimere_init_options["display_feature"] = {{ p_current_feature }};{% endif %}
+    {% if p_current_route %}
+    chimere_init_options["display_route"] = {{ p_current_route }};{% endif %}
     {% if restricted_extent %}{{ restricted_extent }}
     chimere_init_options["restricted_extent"] = bounds;
     {% endif %}
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index 0182b66..0490c2d 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -185,6 +185,7 @@ bounds.extend(new OpenLayers.LonLat(%f, %f));
         return context_data
     request = context['request']
     # Default values
+    context_data['p_current_route'] = context.get('current_route')
     if request.GET:
         for key in ('zoom', 'lon', 'lat', 'display_submited',
                     'current_feature'):
diff --git a/chimere/views.py b/chimere/views.py
index b49da6e..22bd50a 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -123,6 +123,13 @@ def index(request, area_name=None, default_area=None, simple=False):
     if request.GET and 'lat' in request.GET \
       and 'lon' in request.GET:
         zoomout = None
+    if request.GET and 'current_feature' in request.GET:
+        try:
+            m = Marker.objects.get(pk=request.GET['current_feature'])
+            if m.route:
+                response_dct['current_route'] = m.route.pk
+        except:
+            pass
     response_dct.update({
          'actions':actions, 'action_selected':('view',),
          'error_message':'',
-- 
cgit v1.2.3