Modifications pour le site alpesvertes

15 files changed, 427 insertions, 29 deletions

diff --git a/chimere_example_static/chimere/css/alpesvertes.css b/chimere_example_static/chimere/css/alpesvertes.css
new file mode 100644
index 0000000..05734a3
--- /dev/null
+++ b/chimere_example_static/chimere/css/alpesvertes.css
@@ -0,0 +1,121 @@
+/* Custom styles for AlpesVertes.org */
+
+
+/* --- header nav bar --- */
+
+.navbar-collapse {
+    padding-right:0;
+}
+
+.nav > li > a {
+    padding-left:10px;
+    padding-right:10px;
+    border-left: 1px solid #DDD;
+}
+
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+    background-color: #E7E7E7;
+}
+
+.navbar-nav .lbl {
+    margin-left:0;
+    color: #555;
+}
+
+#categories-lnk {
+    margin-left: 0;
+}
+
+#news-lnk a {
+    margin-left: 0;
+    padding-left: 10px;
+}
+
+#news-lnk, #news-lnk .lbl {
+    padding: 0;
+}
+
+.nav > li.logo > a{
+    padding-top:2px;
+    padding-bottom:2px;
+}
+
+.nav > li.logo > a > img {
+    padding-left:10px;
+}
+
+.caret {
+    margin-left:5px;
+}
+
+/* --- categories panel --- */
+
+#panel{
+    background-color: #E7E7E7;
+    border-left:0;
+    padding:0;
+    padding-top:45px;
+    padding-right:1px;
+    padding-bottom:1px;
+    padding-left-:0;
+    width:250px;
+    background-image:none;
+}
+
+#panel #categories{
+    padding:5px;
+    width:100%;
+}
+
+#panel #categories > ul{
+    padding:0;
+    width:100%;
+}
+
+#panel #categories ul.subcategories label img{
+    height:30px;
+}
+
+#panel #categories .category_name{
+    cursor:pointer;
+    /* font-weight:normal; */
+}
+
+/* --- footer --- */
+
+#footer .map-footer a, #footer .map-footer a:link,
+#footer .map-footer a:visited {
+    color:#327E04;
+}
+
+#footer .map-footer {
+    right: 0;
+}
+
+
+/* --- chimere left-clik map menu --- */
+
+#map_menu_zoomin {
+    border-top: 0;
+}
+
+
+/* temporary hide the Open layers zoom slider because of a display bug with #chimere_map_menu */
+.olControlSimplePanZoom #zoombar, .olControlSimplePanZoom #slider {
+    display: none;
+}
+.olControlSimplePanZoom #zoomout {
+    top: 70px;
+}
+
+
+/* --- Open Layers --- */
+
+.olControlScaleLineBottom {
+    display: none;
+} /* no need for Miles in France */
+
+.olControlAttribution  a{
+    color:#327E04;
+}
+
diff --git a/chimere_example_static/chimere/img/ajax-loader.gif b/chimere_example_static/chimere/img/ajax-loader.gif
new file mode 100644
index 0000000..2212db9
--- /dev/null
+++ b/chimere_example_static/chimere/img/ajax-loader.gif
diff --git a/chimere_example_static/chimere/img/logo_alpesvertes_250px.png b/chimere_example_static/chimere/img/logo_alpesvertes_250px.png
new file mode 100644
index 0000000..d4fdd28
--- /dev/null
+++ b/chimere_example_static/chimere/img/logo_alpesvertes_250px.png
diff --git a/chimere_example_static/chimere/img/logo_alpesvertes_500px.png b/chimere_example_static/chimere/img/logo_alpesvertes_500px.png
new file mode 100644
index 0000000..83fcfa5
--- /dev/null
+++ b/chimere_example_static/chimere/img/logo_alpesvertes_500px.png
diff --git a/templates/chimere/base.html b/templates/chimere/base.html
index 70b5929..832211c 100644
--- a/templates/chimere/base.html
+++ b/templates/chimere/base.html
@@ -1,6 +1,8 @@
+{# Modified for AlpesVertes.org -> include metatags.html and alpesvertes.css #}
 {% extends "base.html" %}
 {% load chimere_tags i18n %}
 {% block extra_head %}
+{% include "chimere/blocks/metatags.html" %}
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/print.css" media='print'/>
 {% if css_area %}
@@ -12,6 +14,7 @@
 <link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.min.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/form-compat.css" />
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/extra-styles.css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/alpesvertes.css" />
 <script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js" type="text/javascript"></script>
     <script type='text/javascript'>
     var has_search = {% if has_search %}true{% else %}false{% endif %};
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html
index b658917..3dbe5d5 100644
--- a/templates/chimere/blocks/actions.html
+++ b/templates/chimere/blocks/actions.html
@@ -1,16 +1,18 @@
-{% load i18n chimere_tags %}<div class="navbar navbar-default navbar-fixed-top">
+{# Modified for AlpesVertes.org #}
+{% load i18n chimere_tags %}
+<div class="navbar navbar-default navbar-fixed-top">
   <div class="container">
-    <div class="navbar-header">
+    <!--<div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-    </div>
+    </div>-->
     <div class="navbar-collapse collapse">
 
       <div class='navbar-left'>
-      <ul class="nav nav-pills">
+      <ul class="nav navbar-nav">
     {% for action, subactions in actions %}
         {% ifequal action.id action_selected.0 %}{% if subactions %}
         {% for subaction in subactions %}
@@ -21,20 +23,18 @@
         {% endif %}{% endifequal %}
     {% endfor %}
         {% if is_map %}
-        <li id='categories-lnk'{% if not has_search %} class='active'{%endif%}><a href='#categories' data-toggle='panel'><span class='fa fa-chimere-action fa-check-circle-o'></span> {% trans "Categories "%}</a></li>
+        <!--<li id='categories-lnk'{% if not has_search %} class='active'{% endif %}><a href='#categories' data-toggle='panel'><span class='fa fa-chimere-action'></span>{% trans "Categories "%}</a></li>-->
         {% if has_search %}
-        <li id='search-lnk' class='active'><a href='#search-box' data-toggle='panel'><span class="glyphicon glyphicon-search"></span> {% trans "Search" %}</a></li>
-        {% endif %}
-        {% if areas_visible %}
-        <li id='maps-lnk'><span class='fa fa-chimere-action fa-chimere-maps'></span>{% display_areas %}</li>
-        <li id='permalink-lnk'><span class='fa fa-chimere-action fa-bookmark'></span><span id='permalink'></span></li>
+        <li id='search-lnk' class='active'><a href='#search-box' data-toggle='panel'>{% trans "Search" %}</a></li>
+        {% endif %}    
         <li>{% routing %}</li>
         <li id='news-lnk'>
-        <a data-toggle='modal' data-target="#news" href='#' id='news_button'><span class='fa fa-chimere-action fa-newspaper-o'></span><span class='lbl'>{% trans "News"%}</span></a>
+        <a data-toggle='modal' data-target="#news" href='#'>
+          <span class='lbl'>{% trans "News"%}</span>
+        </a>
         </li>
-        <!-- <li id="simple_button-lnk"><a id='simple_button' href='{% url chimere:simple_index area_name_slash %}'><span class='fa fa-chimere-action fa-simplybuilt'></span><span class='lbl'> {% trans "Simple map" %}</span></a></li> -->
+        {% if areas_visible %}{% display_areas %}
         {% endif %}
-        <li class='selection-sep'> </li>
         {% endif %}
       </ul>
       </div>
@@ -43,16 +43,38 @@
 
       <ul class="nav navbar-nav">
         <li class='selection-sep'> </li>
+
+    {# AlpesVertes.org only display 'view', 'catgories' and 'contribute', the rest is in the footer #}
     {% for action, subactions in actions %}
+        {% if action.id == "view" %}
         <li id='{{action.id}}-lnk'{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}>
           <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>
-            <span class='fa fa-chimere-action fa-chimere-{{action.id}}'></span>
-            <span class='lbl'>{{ action.label }}</span>
+            <span class='lbl'>Carte</span>
           </a>
         </li>
+        {% elif action.id == "categories" %}
+        <li id='{{action.id}}-lnk'{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}>
+          <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>
+            <span class='lbl'>Annuaire</span>
+          </a>
+        </li>
+        {% elif action.id == "contribute" %}
+        <li id='{{action.id}}-lnk'{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}>
+          <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>
+            <span class='lbl'>Proposer un lieu</span>
+          </a>
+        </li>
+{#        {% else %}#} {# uncoment to activate other actions in the top navbar #}
+{#        <li id='{{action.id}}-lnk'{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}>#}
+{#          <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>#}
+{#            <span class='fa fa-chimere-action fa-chimere-{{ action.id }}'></span>#}
+{#            <span class='lbl'>{{ action.label }}</span>#}
+{#          </a>#}
+{#       </li>#}
+        {% endif %}
     {% endfor %}
+        <li class='logo'><a href='/dyn/about/'><span class='lbl'>AlpesVertes.org</span><img src='{{ STATIC_URL }}chimere/img/logo_alpesvertes_250px.png' alt='logo' height='32'/></a></li>
       </ul>
-
       </div>
 
     </div>
diff --git a/templates/chimere/blocks/areas.html b/templates/chimere/blocks/areas.html
new file mode 100644
index 0000000..9dc8e4a
--- /dev/null
+++ b/templates/chimere/blocks/areas.html
@@ -0,0 +1,19 @@
+{# Modified for AlpesVertes.org -> use Bootsrap dropdown #}
+{% load i18n %}
+{% if areas and areas.count > 1 %}
+    <li id="maps-lnk" class="dropdown">
+      {% for area in areas %}
+      {% if area_name and area.urn == area_name %}
+      <a href="#" data-toggle="dropdown" class="dropdown-toggle"><span class="lbl">{{area.name}}</span><span class="caret"></span></a>
+      {% endif %}
+      {% endfor %}
+      <ul class="dropdown-menu">
+      {% if not has_default_area %}
+        <li><a href="/">--</a></li>
+      {% endif %}
+      {% for area in areas %}
+        <li {% if area_name and area.urn == area_name %} class="disabled"{% endif %}{% if not area_name and area.default %} class="disabled"{% endif %}><a href="{{area.urn}}">{{area.name}}</a></li>
+      {% endfor %}
+      </ul>
+    </li>
+{% endif %}
diff --git a/templates/chimere/blocks/categories.html b/templates/chimere/blocks/categories.html
index 9ef4e29..d69abca 100644
--- a/templates/chimere/blocks/categories.html
+++ b/templates/chimere/blocks/categories.html
@@ -1,11 +1,15 @@
+{# Modified for AlpesVertes.org #}
 {% load i18n %}
 <ul id='ul_categories'>
     {% for category, lst_sub_categories in sub_categories %}
     <li class='main_category'>
-        <img class="control_image toggle_category" id="maincategory_img_{{category.id}}" alt="control" src="{{ STATIC_URL }}chimere/img/{% if category.selected %}minus.png{% else %}plus.png{% endif %}" />
+<!--        <img class="control_image toggle_category" id="maincategory_img_{{category.id}}" alt="control" src="{{ STATIC_URL }}chimere/img/{% if category.selected %}minus.png{% else %}plus.png{% endif %}" />
+-->
+
+<span class="control_image toggle_category {#fa fa-chimere-action fa-angle-right#}" id="maincategory_img_{{category.id}}"></span>
+
         <input type="checkbox" id='checkall_{{category.id}}'>
         <span class='category_name'>{% trans category.name %}</span>
-        <span class="glyphicon glyphicon-zoom-in zoom_image zoom_to_category" id="zoom_to_category_{{category.id}}"></span>
         <ul class='subcategories' id='maincategory_{{category.id}}'{% if not category.selected %} style='display:None'{% endif %}>
             {% for sub_category in lst_sub_categories %}
             <li id='li_sub_{{sub_category.id}}' class='subcategory'>
@@ -14,7 +18,6 @@
                     <span class='cat_image'><img alt='{{ sub_category.name }}' src='{{ MEDIA_URL }}{{sub_category.icon.image}}'/></span>
                     {% trans sub_category.name %}
                 </label>
-                <span class="glyphicon glyphicon-zoom-in zoom_image zoom_to_subcategory" id="zoom_to_subcategory_{{sub_category.id}}"></span>
             </li>
             {% endfor %}
             {% if category.description %}
@@ -23,10 +26,5 @@
         </ul>
     </li>
     {% endfor %}
-    {% if sub_categories %}
-    <li id='display_submited'>
-        <input type='checkbox' name='display_submited' id='display_submited_check'/> {% trans "Display markers and routes waiting for validation"%}
-    </li>
-    {% endif %}
 </ul>
 
diff --git a/templates/chimere/blocks/edit_helptext.html b/templates/chimere/blocks/edit_helptext.html
new file mode 100644
index 0000000..bd1b047
--- /dev/null
+++ b/templates/chimere/blocks/edit_helptext.html
@@ -0,0 +1,20 @@
+{# Exclusive to AlpesVertes.org -> included from edit.html #}
+<div class="helptext">
+  <p class="help">C'est sur cette page que vous pouvez proposer un nouveau lieu, une nouvelle initiative en remplissant les champs vides.</p> 
+  <p class="help">Vos données seront modérés par une équipe citoyenne qui vérifiera le respect de la <a href='/dyn/about/'>charte</a> d'AlpesVertes.org.</p>
+  <h3>Mode d'emploi</h3>
+  <small>
+  <ul class="help">
+    <li><b>Nom</b> : c'est le nom de votre lieu ou de votre service, qui apparait sur l'icone de la carte à l'emplacement géographique que vous allez indiquer, ainsi que sur l'annuaire.<br/> <span style='text-decoration: underline;'>Exemple</span> : <i>AMAP du Loup.</i></li>
+    <li><b>Catégories</b> : vous pouvez sélectionner une ou plusieurs catégories/sous catégories, en fonction de votre activité.<br/> <span style='text-decoration: underline;'>Exemple</span> : <i>ALIMENTATION CITOYENNE/AMAPs</i></li>
+    <li><b>Description</b> : cette description longue permet de décrire vos activités. Vous pouvez y mettre un lien internet vers votre site.</li>
+    <li><b>Carte</b> : cliquer deux fois sur la localisation de votre lieu, un pointeur apparait</li>
+    <li><b>Mots clés</b> : ces mots clés serviront au moteur de recherche.<br/> <span style='text-decoration: underline;'>Exemple</span> : <i>AMAP légumes bio.</i></li>
+    <li><b>Dates début et fin</b> : si votre lieu est lié à un événement.</li>
+    <li><b>Description courte</b> : très important, cette description servira à l'annuaire papier, gratuit et sans publicité, qui sera produit en 2016. Tout doit y être dit en deux lignes...<br/> <span style='text-decoration: underline;'>Exemple</span> : <i>L'AMAP  du Loup dispose d'un accord avec un maraicher, un producteur de champignons et endives, producteur poulet/agneaux, fromages chèvre, huile d'olive et autres produits. Contrats 3mois, liste d'attente.</i>
+    <li><b>Adresse</b> : lignes d'adresse, code postal, ville, courriel, téléphone.</li>
+    <li><b>Fichiers multimedia</b> : documents étant déja en ligne sur internet, quelque part.</li>
+    <li><b>Fichiers Images</b> : photos pas trop lourdes.</li>
+  </ul>
+  </small>
+</div>
\ No newline at end of file
diff --git a/templates/chimere/blocks/edit_legal.html b/templates/chimere/blocks/edit_legal.html
new file mode 100644
index 0000000..e576b7f
--- /dev/null
+++ b/templates/chimere/blocks/edit_legal.html
@@ -0,0 +1,6 @@
+{# Exclusive to AlpesVertes.org -> included from edit.html #}
+<div class="helptext">
+  <hr />
+  <p class="help"><small>Les informations que vous publiez ici sont susceptible d'être modérées. Elles sont modifiables à tout instant par le lien "proposer une modification" en bas de chaque fiche (bandeau vert). Elles sont publiées sous la licence <a href="https://creativecommons.org/licenses/by-nc/4.0/deed.fr">CC&nbspBY-NC&nbsp4.0</a> qui autorise leur reproduction et leur modification pour des usages non commerciaux.</small></p> 
+  <p class="help"><small>En cliquant sur le bouton "Proposez", en bas de cette page, vous indiquez que vous acceptez que les informations soumises seront publiées sous cette licence.</small></p>
+</div>
\ No newline at end of file
diff --git a/templates/chimere/blocks/footer.html b/templates/chimere/blocks/footer.html
new file mode 100644
index 0000000..8b1b7a1
--- /dev/null
+++ b/templates/chimere/blocks/footer.html
@@ -0,0 +1,10 @@
+{# Modified for AlpesVertes.org #}
+Coordination <a href='https://nicelab.org/'>NiceLab</a> – 
+Financement <a href='#'>Pom'Ecolo</a> –&nbsp
+Moteur <a href='http://www.chymeres.net/'>Chimère</a> – 
+Carte <a href='https://openstreetmap.org/'>OpenStreetMap</a> – 
+Icones <a href='#'>Laura Maïquez</a> – 
+<a href='/feeds'>Rss</a> – 
+<a href='/contact'>Contact</a> – 
+{# pour activer : créer une page 'À propos' avec mnemonique 'about' dans l'interface d'admin #}
+<a href='/dyn/about/'>À propos</a>
\ No newline at end of file
diff --git a/templates/chimere/blocks/metatags.html b/templates/chimere/blocks/metatags.html
new file mode 100644
index 0000000..57ae4dd
--- /dev/null
+++ b/templates/chimere/blocks/metatags.html
@@ -0,0 +1,5 @@
+{# Exclusive to AlpesVertes.org -> include meta tags in <head> #}
+<meta name="description" content="Alpes Vertes est un annuaire cartographique des initiatives écologiques et solidaires dans les Alpes-Maritimes associatif et autogéré." />
+<meta name="keywords" content ="Alpes vertes, Alpes-Maritimes, annuaire, carte, écologie" />
+<meta name="copyright" content ="Copyright CC BY-NC 4.0 AlpesVertes.org" />
+<link rel="copyright" href="/dyn/about/#copyright">
\ No newline at end of file
diff --git a/templates/chimere/edit.html b/templates/chimere/edit.html
new file mode 100644
index 0000000..f0980f9
--- /dev/null
+++ b/templates/chimere/edit.html
@@ -0,0 +1,165 @@
+{# Modified for AlpesVertes.org -> include edit_helptext.html and edit_legal.html #}
+{% extends "chimere/base.html" %}
+{% load i18n chimere_tags adminmedia inline_formset%}
+{% block extra_head %}
+    {{ form.media }}
+    {{ block.super }}
+    {% head_chimere %}
+    {% if dated %}
+        <!--script type="text/javascript" src="{{extra_url}}media/js/core.js"></script-->
+        <script type="text/javascript" src="{{ STATIC_URL }}chimere/js/utils.js"></script>
+        <script type="text/javascript">
+        window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";
+        </script>
+    {% endif %}
+{% endblock %}
+
+{% block content %}
+    {{ block.super }}
+    {% if submited %}{% submited %}{% endif %}
+    {% if error_message %}<fieldset class='edit errorlist'>
+        <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>{% 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'>
+        <div class='rightform'>
+            {% include "chimere/blocks/edit_helptext.html" %}
+            <div class="fieldWrapper">
+                <label for="id_point">{% trans "Point"%} *</label>
+                {%if form.point.errors %}<ul class="errorlist"><li>{% trans "Select a location for this new site" %}</li></ul>{%endif%}
+                {{point_widget}}
+            {% include "chimere/blocks/edit_legal.html" %}
+            </div>
+        </div>
+    </div>
+    <div class='leftform'>
+        <p>* {% trans "indicates a mandatory field" %}</p>
+        <div class="fieldWrapper">
+            <label for="id_name">{% trans "Name"%} *</label>
+            {% if form.name.errors %}<div class='errors'>{{ form.name.errors }}</div>{% endif %}
+            {{ form.name }}
+        </div>
+        <div class="fieldWrapper">
+          <label for="id_subcategory">{% trans "Categories" %} *</label>
+            {% if form.categories.errors %}<div class='errors'>{{ form.categories.errors }}</div>{% endif %}
+          {{ form.categories }}
+        </div>
+        <div class="fieldWrapper">
+            <label for="id_description">{% trans "Description" %}</label>
+            {{ form.description.errors }}
+            {{ form.description }}
+            <p class="help">{{ form.description.help_text }}</p>
+        </div>
+        <div class="fieldWrapper">
+            <label for="id_keywords">{% trans "Keywords" %}</label>
+            {{ form.keywords.errors }}
+            {{ form.keywords }}
+            <p class="help">{{ form.keywords.help_text }}</p>
+        </div>
+        {% if dated %}
+        <div class="fieldWrapper">
+            <label for="id_start_date">{% trans "Start date" %}</label>
+            {{ form.start_date.errors }}
+            {{ form.start_date }}
+            <p class="help">{{ form.start_date.help_text }}</p>
+        </div>
+        <div class="fieldWrapper">
+            <label for="id_end_date">{% trans "End date" %}</label>
+            {{ form.end_date.errors }}
+            {{ form.end_date }}
+            <p class="help">{{ form.end_date.help_text }}</p>
+        </div>
+        {% endif %}
+        {% for field in form %}
+            {% for property in properties %}
+                {% ifequal field.name property.getNamedId %}
+                    <div class="fieldWrapper">
+                        <label for="id_{{field.name}}">{% trans field.label %}{% if property.mandatory %} *{% endif %}</label>
+                        {% if field.errors %}<div class='errors'>{{ field.errors }}</div>{% endif %}
+                        {{ field }}
+                    </div>
+                {%endifequal%}
+            {%endfor%}
+        {%endfor%}
+    </div>
+    <div class='bottomform'>
+        {% inline_formset "Multimedia files" formset_multi %}
+        {% inline_formset "Picture files" formset_picture %}
+
+        {% if filtered_properties %}
+        <script type='text/javascript'>
+            var cat_filters = new Array();
+            var cat_to_hide = new Array();
+            {% for property in filtered_properties %}
+            cat_to_hide.push('#id_{{property.getNamedId}}');
+            {% for subcat in property.subcategories.all %}
+            if(!cat_filters['{{subcat.id}}']) cat_filters['{{subcat.id}}'] = new Array();
+            cat_filters['{{subcat.id}}'].push('#id_{{property.getNamedId}}');
+            {% endfor %}
+            {% endfor %}
+            $('#id_categories').change(function(){
+                for (idx in cat_to_hide){
+                    $(cat_to_hide[idx]).parent().hide();
+                }
+                var vals = $(this).val();
+                for (val_id in vals){
+                    var val = vals[val_id];
+                    for (ids in cat_filters[val]){
+                        $(cat_filters[val][ids]).parent().show();
+                    }
+                }
+            });
+            $('#id_categories').change();
+        </script>
+        {% endif %}
+    </div>
+    <div class='personalform'>
+        <h3>{% trans "Personal information"%}</h3>
+        <div class='warning'>
+        {% trans "This fields are not mandatory. If you provided them they not will be made public and they will only used to join you for this project."%}
+        </div>
+        <div class="fieldWrapper">
+            <label for="id_submiter_name">{% trans "Your name or nickname"%}</label>
+            {% if form.submiter_name.errors %}<div class='errors'>{{ form.submiter_name.errors }}</div>{% endif %}
+            {{ form.submiter_name }}
+        </div>
+        <div class="fieldWrapper">
+            <label for="id_submiter_email">{% trans "Your email"%}</label>
+            {% if form.submiter_email.errors %}<div class='errors'>{{ form.submiter_email.errors }}</div>{% endif %}
+            {{ form.submiter_email }}
+        </div>
+        <div class="fieldWrapper">
+            <label for="id_submiter_comment">{% trans "Comments about your submission"%}</label>
+            {% if form.submiter_comment.errors %}<div class='errors'>{{ form.submiter_comment.errors }}</div>{% endif %}
+            {{ form.submiter_comment }}
+        </div>
+    </div>
+    <div id='upload_in_progress'>
+        <p>{% trans "Upload in progress. Please wait..." %}</p>
+        <p><img alt='Ajax loader' src='{{STATIC_URL}}chimere/img/ajax-loader.gif'/></p>
+    </div>
+    <script text='text/javascript'>
+            $( "#upload_in_progress" ).dialog({
+                 modal: true,
+                 resizable:false,
+                 height:110,
+                 autoOpen:false,
+                 dialogClass:'alert-box'
+                }
+            );
+        $(".ui-dialog-titlebar").hide();
+        function displayProgress(){
+            $("#upload_in_progress").dialog('open');
+            return true;
+        }
+    </script>
+    <p><input type='submit' onclick='saveExtent();displayProgress();' value="{% trans 'Propose'%}"/></p>
+    </form>
+    </fieldset>
+    </div>
+{% endblock %}
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 90b9587..65c037f 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -1,3 +1,4 @@
+{# Modified for AlpesVertes.org -> merge with main_map_simple #}
 {% extends "chimere/base.html" %}
 {% load i18n unlocalize_point chimere_tags %}
 {% block extra_head %}
@@ -10,13 +11,16 @@
 <script src="{{ STATIC_URL }}chimere/js/search-autocomplete.js" type="text/javascript"></script>{% endif %}
 {{ block.super }}
 {% endblock %}
+{% block body_class %}class='simple'{% endblock %}
+{% block body_id %}id='simple'{% endblock %}
+{% block menu %}{# no menu in simple mode #}{% endblock %}
 {% block message_edit %}{% endblock %}
 {% block sidebar %}
 {% display_news %}
-    <div class='show-hide-panel' id='hide-panel'><span class='fa fa-arrow-circle-left'></span></div>
-    <div class='show-hide-panel' id='show-panel'><span class='fa fa-arrow-circle-right'></span></div>
-    <div id='panel' class='navbar-default'>
-      <form id="frm_categories"><div id='categories'></div></form>
+    <div id='panel'>
+      <form id="frm_categories">
+        <div id='categories'>{# Categories are displayed in JS #}</div>
+      </form>
       <div id='search-box' class='ui-widget ui-corner-all'></div>
     </div>
     <div id='category_description'>
@@ -28,6 +32,9 @@
 {% endblock %}
 {% block search_box %} {% endblock %}
 {% block content %}
+    <script type='text/javascript'><!--
+        var simple = true;
+    // --></script>
     {{block.super}}
     <div id='main-map'></div>
 <script type="text/javascript">
@@ -35,15 +42,17 @@
 </script>
     {% map_menu %}
     {% map 'main-map' %}
+    <div id='chimere_message'></div>
     <script type='text/javascript'>
+    var has_search = {% if has_search %}true{% else %}false{% endif %};
     // array to keep trace of already displayed items
     var search_result = new Array();
     var search_url = "/search/";
     $(function(){
+        $('#chimere_message').dialog({'autoOpen':false});
         if (has_search){
             load_search_box();
         }
-        {%if news_visible %}$('#news').modal();{% endif %}
     });
     </script>
 {% endblock %}
diff --git a/templates/chimere/main_map_simple.html b/templates/chimere/main_map_simple.html
new file mode 100644
index 0000000..dca3c0f
--- /dev/null
+++ b/templates/chimere/main_map_simple.html
@@ -0,0 +1,20 @@
+{# Modified for AlpesVertes.org #}
+{% extends "chimere/main_map.html" %}
+{% load i18n %}
+{% block body_class %}class='simple'{% endblock %}
+{% block body_id %}id='simple'{% endblock %}
+{% block menu %}{# no menu in simple mode #}{% endblock %}
+{% block message_edit %}{% endblock %}
+{% block sidebar %}
+    <div id='panel'>
+        <form method='post' name='frm_categories' id='frm_categories'>
+        <div id='categories' name='categories'></div>
+        </form>
+    </div>
+{% endblock %}
+{% block content %}
+    <script type='text/javascript'><!--
+        var simple = true;
+    // --></script>
+    {{ block.super }}
+{% endblock %}