Merge branch 'master' into carte-ouverte

Conflicts:

	.gitignore
	chimere/main/actions.py
	chimere/urls.py

1 files changed, 24 insertions, 12 deletions

diff --git a/chimere/templates/edit.html b/chimere/templates/edit.html
index 0e1f6d7..4a02fe4 100644
--- a/chimere/templates/edit.html
+++ b/chimere/templates/edit.html
@@ -1,5 +1,12 @@
 {% extends "base_user.html" %}
 {% load i18n %}
+{% block extra_head %}
+{% if dated %}<script type="text/javascript" src="{{extra_url}}admin/jsi18n"></script>
+<script type="text/javascript" src="{{extra_url}}media/js/core.js"></script>
+<link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/base.css"/>
+<link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/widgets.css"/>
+{% endif %}{{ block.super }}
+{% endblock %}
 {% block message_map %}{% endblock %}
 {% block message_edit%}<div id='content'>{{block.super}}{% endblock %}
 
@@ -15,18 +22,9 @@
     {{ form.name }}
 </div>
 <div class="fieldWrapper">
-  <label for="id_subcategory">{% trans "Category" %} *</label>
-  {{ form.subcategory.errors }}
-  <select name='subcategory' id='subcategory'>
-    <option value="">---------</option>
-    {% for cat_subcat in sub_categories %}
-    <optgroup label="{{cat_subcat.0.name}}">
-      {% for sub_category in cat_subcat.1 %}
-      <option value='{{sub_category.id}}'{% ifequal sub_category.id current_category %} selected='selected'{% endifequal %}>
-      {% trans sub_category.name %}
-      </option>{% endfor %}
-    </optgroup>{% endfor %}
-  </select>
+  <label for="id_subcategory">{% trans "Categories" %} *</label>
+  {{ form.categories.errors }}
+  {{ form.categories }}
 </div>
 <div class="fieldWrapper">
     <label for="id_point">{% trans "Point"%} *</label>
@@ -38,6 +36,20 @@
     {{ form.picture.errors }}
     {{ form.picture }}
 </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%}
 <div class="fieldWrapper">
     <label for="id_{{field.name}}">{% trans field.label %}</label>