From 3bec25bcd932a15e10b14bd20612ed83dc9ffd55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Thu, 19 Oct 2017 20:30:50 +0200
Subject: [PATCH] talk confirmation by staff

---
 cfp/templates/cfp/staff/talk_details.html | 17 ++++++++++-------
 cfp/urls.py                               |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/cfp/templates/cfp/staff/talk_details.html b/cfp/templates/cfp/staff/talk_details.html
index 216caf3..4d18d65 100644
--- a/cfp/templates/cfp/staff/talk_details.html
+++ b/cfp/templates/cfp/staff/talk_details.html
@@ -78,12 +78,10 @@
 
 <p>{% if talk.notes %}{{ talk.notes|linebreaksbr }}{% else %}<i>{% trans "No notes." %}</i>{% endif %}</p>
 
-<h2>{% trans "Moderation" %}</h2>
-
-<h3>{% trans "Status" %}</h3>
-
 {% if talk.accepted == None %}
 <h3>{% trans "Vote" %}</h3>
+
+<p>
 <div class="btn-group" role="group" aria-label="vote">
   <a class="btn {% if vote == -2 %} active {% endif %}btn-danger"  href="{% url 'talk-vote' talk.token '-2' %}">-2</a>
   <a class="btn {% if vote == -1 %} active {% endif %}btn-warning" href="{% url 'talk-vote' talk.token '-1' %}">-1</a>
@@ -91,11 +89,16 @@
   <a class="btn {% if vote == 1 %}  active {% endif %}btn-info"    href="{% url 'talk-vote' talk.token '+1'  %}">+1</a>
   <a class="btn {% if vote == 2 %}  active {% endif %}btn-success" href="{% url 'talk-vote' talk.token '+2'  %}">+2</a>
 </div>
-<br /><br />
+</p>
 <p>{{ talk.vote_set.count }} {% trans "vote" %}{{ talk.vote_set.count|pluralize }}, {% trans "average:" %} {{ talk.score|floatformat:1 }}</p>
 
-<a href="{% url 'talk-accept' talk.token %}" class="btn btn-success">Accept</a>
-<a href="{% url 'talk-decline' talk.token %}" class="btn btn-danger">Decline</a>
+<a href="{% url 'talk-accept' talk.token %}" class="btn btn-success">{% trans "Accept" %}</a>
+<a href="{% url 'talk-decline' talk.token %}" class="btn btn-danger">{% trans "Decline" %}</a>
+{% elif talk.accepted == True and talk.confirmed == None %}
+<h3>{% trans "Speaker confirmation" %}</h3>
+
+<a href="{% url 'talk-confirm-by-staff' talk.token %}" class="btn btn-success">{% trans "The speaker confirmed" %}</a>
+<a href="{% url 'talk-desist-by-staff' talk.token %}" class="btn btn-danger">{% trans "The speaker cancelled" %}</a>
 {% endif %}
 
 {% comment %}
diff --git a/cfp/urls.py b/cfp/urls.py
index 71c354f..c1799aa 100644
--- a/cfp/urls.py
+++ b/cfp/urls.py
@@ -21,7 +21,7 @@ urlpatterns = [
     url(r'^staff/talks/(?P<talk_id>[\w\-]+)/accept/$', views.talk_decide, {'accept': True}, name='talk-accept'),
     url(r'^staff/talks/(?P<talk_id>[\w\-]+)/decline/$', views.talk_decide, {'accept': False}, name='talk-decline'),
     url(r'^staff/talks/(?P<talk_id>[\w\-]+)/confirm/$', views.talk_acknowledgment, {'confirm': True}, name='talk-confirm-by-staff'),
-    url(r'^staff/talks/(?P<talk_id>[\w\-]+)/desist/$', views.talk_acknowledgment, {'confirm': False}, name='talk-cancel-by-staff'),
+    url(r'^staff/talks/(?P<talk_id>[\w\-]+)/desist/$', views.talk_acknowledgment, {'confirm': False}, name='talk-desist-by-staff'),
     url(r'^staff/talks/(?P<talk_id>[\w\-]+)/edit/$', views.TalkUpdate.as_view(), name='talk-edit'),
     url(r'^staff/speakers/$', views.participant_list, name='participant-list'),
     url(r'^staff/speakers/(?P<participant_id>[\w\-]+)/$', views.participant_details, name='participant-details'),