From dd57a37c626e6a6a1e4051e2026bf1ccb5427501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Wed, 10 Aug 2016 00:02:44 +0200
Subject: [PATCH] show new fields of talk model in templates

---
 locale/fr/LC_MESSAGES/django.po               | 47 ++++++++++++++-----
 .../templates/proposals/talk_detail.html      | 25 +++++++---
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 172abf8..a70df81 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-08 22:52+0000\n"
+"POT-Creation-Date: 2016-08-09 22:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -297,7 +297,7 @@ msgid "Welcome to %(confname)s!"
 msgstr "Bienvenue à la conférence %(confname)s !"
 
 #: proposals/templates/proposals/speaker_list.html:9
-#: proposals/templates/proposals/talk_detail.html:21
+#: proposals/templates/proposals/talk_detail.html:25
 msgid "Speakers:"
 msgstr "Orateurs :"
 
@@ -308,35 +308,60 @@ msgid "talk"
 msgstr "exposé"
 
 #: proposals/templates/proposals/speaker_list.html:18
-#: proposals/templates/proposals/talk_detail.html:27
+#: proposals/templates/proposals/talk_detail.html:32
 msgid "No speakers."
 msgstr "Aucun orateur."
 
 #: proposals/templates/proposals/talk_detail.html:17
+msgid "Abstract:"
+msgstr "Résumé :"
+
+#: proposals/templates/proposals/talk_detail.html:19
+msgid "No abstract provided."
+msgstr "Aucun résumé fourni."
+
+#: proposals/templates/proposals/talk_detail.html:21
 msgid "Description:"
 msgstr "Description :"
 
-#: proposals/templates/proposals/talk_detail.html:31
+#: proposals/templates/proposals/talk_detail.html:23
+msgid "No description provided."
+msgstr "Aucune description fournie."
+
+#: proposals/templates/proposals/talk_detail.html:35
 msgid "Topics:"
 msgstr "Thèmes :"
 
-#: proposals/templates/proposals/talk_detail.html:40
+#: proposals/templates/proposals/talk_detail.html:42
+#: proposals/templates/proposals/topic_list.html:33
+msgid "No topics."
+msgstr "Aucun thèmes."
+
+#: proposals/templates/proposals/talk_detail.html:47
+msgid "Notes:"
+msgstr "Notes :"
+
+#: proposals/templates/proposals/talk_detail.html:49
+msgid "No notes."
+msgstr "Aucune note."
+
+#: proposals/templates/proposals/talk_detail.html:51
 msgid "Moderation"
 msgstr "Modération"
 
-#: proposals/templates/proposals/talk_detail.html:42
+#: proposals/templates/proposals/talk_detail.html:53
 msgid "Vote:"
 msgstr "Vote :"
 
-#: proposals/templates/proposals/talk_detail.html:51
+#: proposals/templates/proposals/talk_detail.html:62
 msgid "Sum:"
 msgstr "Somme :"
 
-#: proposals/templates/proposals/talk_detail.html:53
+#: proposals/templates/proposals/talk_detail.html:64
 msgid "Status:"
 msgstr "Status :"
 
-#: proposals/templates/proposals/talk_detail.html:56
+#: proposals/templates/proposals/talk_detail.html:67
 msgid "Messages:"
 msgstr "Messages :"
 
@@ -365,10 +390,6 @@ msgstr "Ajouter un thème"
 msgid "reviewer"
 msgstr "Responsable"
 
-#: proposals/templates/proposals/topic_list.html:33
-msgid "No topics."
-msgstr "Aucun thèmes."
-
 #: proposals/templates/proposals/user_details.html:21
 msgid "Edit"
 msgstr "Éditer"
diff --git a/proposals/templates/proposals/talk_detail.html b/proposals/templates/proposals/talk_detail.html
index e06f5c0..06ab8ab 100644
--- a/proposals/templates/proposals/talk_detail.html
+++ b/proposals/templates/proposals/talk_detail.html
@@ -14,29 +14,40 @@
 
 <p>{{ talk.get_event_display }}</p>
 
+<h3>{% trans "Abstract:" %}</h3>
+
+<p>{% if talk.abstract %}{{ talk.abstract }}{% else %}<i>{% trans "No abstract provided." %}</i>{% endif %}</p>
+
 <h3>{% trans "Description:" %}</h3>
 
-<p>{{ talk.description }}</p>
+<p>{% if talk.description %}{{ talk.description }}{% else %}<i>{% trans "No description provided." %}</i>{% endif %}</p>
 
 <h3>{% trans "Speakers:" %}</h3>
 
-<ul>
 {% for speaker in talk.speakers.all %}
+{% if forloop.first %}<ul>{% endif %}
     <li><a href="{% url 'show-speaker' speaker.username %}">{{ speaker }}</a></li>
+{% if forloop.last %}</ul>{% endif %}
 {% empty %}
-    <li><i>{% trans "No speakers." %}</i></li>
+<i>{% trans "No speakers." %}</i>
 {% endfor %}
-</ul>
 
 <h3>{% trans "Topics:" %}</h3>
 
-<ul>
 {% for topic in talk.topics.all %}
-<li><a href="{% url 'list-talks-by-topic' topic.slug %}">{{ topic }}</a></li>
+{% if forloop.first %}<ul>{% endif %}
+    <li><a href="{% url 'list-talks-by-topic' topic.slug %}">{{ topic }}</a></li>
+{% if forloop.last %}</ul>{% endif %}
+{% empty %}
+<i>{% trans "No topics." %}</i>
 {% endfor %}
-</ul>
 
 {% if moderate_perm %}
+
+<h3>{% trans "Notes:" %}</h3>
+
+<p>{% if talk.notes %}{{ talk.notes }}{% else %}<i>{% trans "No notes." %}</i>{% endif %}</p>
+
 <h2>{% trans "Moderation" %}</h2>
 
 <h3>{% trans "Vote:" %}</h3>