From 6e62f7b8722fa0d95de273d3b3813e4c04f50597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Tue, 7 Nov 2017 13:37:18 +0100
Subject: [PATCH] improve volunteers notes tooltip

---
 cfp/templates/cfp/staff/volunteer_list.html | 9 ++++-----
 cfp/urls.py                                 | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cfp/templates/cfp/staff/volunteer_list.html b/cfp/templates/cfp/staff/volunteer_list.html
index 158a03c..d8d7ddd 100644
--- a/cfp/templates/cfp/staff/volunteer_list.html
+++ b/cfp/templates/cfp/staff/volunteer_list.html
@@ -44,7 +44,7 @@
         <tr>
             <td>
                 <a href="{% url 'volunteer-details' volunteer.pk %}">{{ volunteer.name }}</a>
-                {% if volunteer.notes %}<span class="glyphicon glyphicon-envelope pull-right" data-toggle="tooltip" data-placement="bottom" title="{% trans "The volunteer made a few remarks to the staff." %}"></span>{% endif %}
+                {% if volunteer.notes %}<span class="glyphicon glyphicon-envelope pull-right" data-toggle="tooltip" data-placement="bottom" data-html="true" title="{{ volunteer.notes|linebreaksbr }}"></span>{% endif %}
             </td>
             <td><a href="mailto:{{ volunteer.email }}">{{ volunteer.email }}</a></td>
             <td><a href="tel:{{ volunteer.phone_number }}">{{ volunteer.phone_number }}</a>{% if volunteer.sms_prefered %} (SMS){% endif %}</td>
@@ -65,14 +65,13 @@
 {% block js_end %}
 <script type="text/javascript">
 jQuery(document).ready(function($) {
-    $(".clickable-row").click(function() {
-        window.location = $(this).data("href");
-    });
-
     var anchor = window.location.hash.replace("#", "");
     if (anchor == "filter") {
         $("#filter").collapse('show');
     }
 });
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})
 </script>
 {% endblock %}
diff --git a/cfp/urls.py b/cfp/urls.py
index 2ad41ec..2501520 100644
--- a/cfp/urls.py
+++ b/cfp/urls.py
@@ -7,8 +7,8 @@ urlpatterns = [
 # v1.1
     url(r'^cfp/$', views.proposal_home, name='proposal-home'),
     url(r'^cfp/token/$', views.proposal_mail_token, name='proposal-mail-token'),
-    url(r'^cfp/(?P<speaker_token>[\w\-]+)/$', views.proposal_dashboard), # backward compatibility
     url(r'^cfp/(?:(?P<speaker_token>[\w\-]+)/)?dashboard/$', views.proposal_dashboard, name='proposal-dashboard'),
+    url(r'^cfp/(?P<speaker_token>[\w\-]+)/$', views.proposal_dashboard), # backward compatibility
     url(r'^cfp/(?:(?P<speaker_token>[\w\-]+)/)?profile/$', views.proposal_speaker_edit, name='proposal-profile-edit'),
     url(r'^cfp/(?:(?P<speaker_token>[\w\-]+)/)?talk/add/$', views.proposal_talk_edit, name='proposal-talk-add'),
     url(r'^cfp/(?:(?P<speaker_token>[\w\-]+)/)?talk/(?P<talk_id>[0-9]+)/$', views.proposal_talk_details, name='proposal-talk-details'),