Merge branch 'master' into carte-ouverte

Conflicts:

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

5 files changed, 64 insertions, 25 deletions

diff --git a/chimere/templates/404.html b/chimere/templates/404.html
new file mode 100644
index 0000000..d7d0de0
--- /dev/null
+++ b/chimere/templates/404.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% extends "base.html" %}
+{% block content %}
+<h2>{% trans "Page not found" %}</h2>
+{% endblock %}
diff --git a/chimere/templates/500.html b/chimere/templates/500.html
new file mode 100644
index 0000000..a230d92
--- /dev/null
+++ b/chimere/templates/500.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+{% extends "base.html" %}
+{% block content %}
+<h2>{% trans "Internal server error"%}</h2>
+{% endblock %}
diff --git a/chimere/templates/detail.html b/chimere/templates/detail.html
index 94f8eae..d7084db 100644
--- a/chimere/templates/detail.html
+++ b/chimere/templates/detail.html
@@ -2,7 +2,12 @@
 <h2>{{ marker.name }}</h2>
 <div id='detail_content'>
 {% if marker.picture %}<img src='{{media_path}}{{marker.picture}}' alt='{{marker.name}}'/>{%endif%}
-<div>{% for property in marker.getProperties %}
+<div>
+{% if dated %}
+<p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}}
+{% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span>
+{% endif %}
+{% for property in marker.getProperties %}
 <p id='{{property.propertymodel.getNamedId}}'>{{ property.value|safe }}</p>
 {% endfor %}</div>{% if share_networks %}
 {% if simple %}{% trans "Share on"%}{% for share_network in share_networks %}
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>
diff --git a/chimere/templates/edit_route.html b/chimere/templates/edit_route.html
index 5168001..5152ba5 100644
--- a/chimere/templates/edit_route.html
+++ b/chimere/templates/edit_route.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 %}
 {% block content %}{{ block.super }}
@@ -14,18 +21,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_route">{% trans "Route"%} *</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>