3 files changed, 26 insertions, 14 deletions
diff --git a/chimere/templates/chimere/blocks/polygon_edit.html b/chimere/templates/chimere/blocks/polygon_edit.html
index 98d5f7f..be112d2 100644
--- a/chimere/templates/chimere/blocks/polygon_edit.html
+++ b/chimere/templates/chimere/blocks/polygon_edit.html
@@ -17,8 +17,6 @@
   {% if default_area %} chimere_init_options['selected_map_layer'] = {{default_area}};{% endif %}
 </script>
 
-</div>
-
 <div id='popup'></div>
 <div id='map_edit'></div>
 <div class='help'>{% trans "To delete a vertice, hold the SHIFT key and click." %}</div>
diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html
index 0e1b849..ff4e514 100644
--- a/chimere/templates/chimere/edit.html
+++ b/chimere/templates/chimere/edit.html
@@ -22,50 +22,52 @@
     {% 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>
+    {% block legend %}<legend>{% if is_modification %}{% trans "Modify a point of interest" %}{% else %}{% trans "Add a point of interest" %}{% endif %}</legend>{% endblock %}
     <form enctype="multipart/form-data" method='post' action='.'>
     {% csrf_token %}
     <div class='rightWrapper'>
         <div class='rightform'>
-            <div class="fieldWrapper">
+            <div class="fieldWrapper full">
+                {% block geometry %}
                 <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}}
+                {% endblock %}
             </div>
         </div>
     </div>
     <div class='leftform'>
         <p>* {% trans "indicates a mandatory field" %}</p>
+        <div class="fieldWrapper full">
+          <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_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">
+        {% if form.keywords %}<div class="fieldWrapper">
             <label for="id_keywords">{% trans "Keywords" %}</label>
             {{ form.keywords.errors }}
             {{ form.keywords }}
             <p class="help">{{ form.keywords.help_text }}</p>
-        </div>
+        </div>{% endif %}
         {% if dated %}
-        <div class="fieldWrapper">
+        <div class="fieldWrapper full">
             <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">
+        <div class="fieldWrapper full">
             <label for="id_end_date">{% trans "End date" %}</label>
             {{ form.end_date.errors }}
             {{ form.end_date }}
@@ -131,7 +133,7 @@
             {% if form.submiter_email.errors %}<div class='errors'>{{ form.submiter_email.errors }}</div>{% endif %}
             {{ form.submiter_email }}
         </div>
-        <div class="fieldWrapper">
+        <div class="fieldWrapper full">
             <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 }}
diff --git a/chimere/templates/chimere/edit_polygon.html b/chimere/templates/chimere/edit_polygon.html
new file mode 100644
index 0000000..7bba0d0
--- /dev/null
+++ b/chimere/templates/chimere/edit_polygon.html
@@ -0,0 +1,12 @@
+{% extends "chimere/edit.html" %}
+{% load i18n chimere_tags adminmedia inline_formset%}
+
+{% block legend %}
+<legend>{% if is_modification %}{% trans "Modify a polygon" %}{% else %}{% trans "Add a polygon" %}{% endif %}</legend>
+{% endblock %}
+
+{% block geometry %}
+<label for="id_polygon">{% trans "Polygon"%} *</label>
+{%if form.polygon.errors %}<ul class="errorlist"><li>{% trans "Draw the associated polygon" %}</li></ul>{%endif%}
+{{polygon_widget}}
+{% endblock %}