Improve the list of nominees on the feedback page. Fixes #1786 and #1809.

- Legacy-Id: 10524

ietf/nomcom/models.py

@@ -126,6 +126,12 @@ class Nominee(models.Model):
         else:
             return self.email.address
 
+    def name(self):
+        if self.email.person and self.email.person.name:
+            return u'%s' % (self.email.person.plain_name(),)
+        else:
+            return self.email.address
+
 
 class NomineePosition(models.Model):
 

ietf/nomcom/templatetags/nomcom_tags.py

@@ -38,8 +38,10 @@ def add_num_nominations(user, position, nominee):
                                     nominees__in=[nominee],
                                     author=author,
                                     type='comment').count()
-
-    return '<span class="badge" title="%d earlier comments from you on %s as %s">%s</span>&nbsp;' % (count, nominee.email.address, position, count)
+    if count:
+        return '<span class="badge" title="%s earlier comments from you on %s as %s">%s</span>&nbsp;' % (count , nominee.email.address, position, count)
+    else:
+        return '<span class="badge" title="You have not yet provided feedback on %s as %s">no feedback</span>&nbsp;' % (nominee.email.address, position)
 
 
 @register.filter

ietf/templates/nomcom/feedback.html

@@ -5,6 +5,15 @@
 {% load bootstrap3 %}
 {% load nomcom_tags %}
 
+{% block morecss %}
+.btn-group-vertical .btn {
+    text-align: left;
+}
+.btn-group-vertical .btn .badge {
+        float:right;  margin-top: -1.3em;  
+}
+{% endblock %}
+
 {% block subtitle %} - Feedback{% endblock %}
 
 {% block nomcom_content %}
@@ -34,7 +43,7 @@
             <div class="btn-group-vertical form-group">
               {% for np in p.nomineeposition_set.accepted.not_duplicated %}
                 <a class="btn btn-default btn-xs" {% if nomcom.group.state_id != 'conclude' %}href="?nominee={{np.nominee.id}}&position={{ np.position.id}}"{% endif %}>
-	          {{ np.nominee }}
+	          {{ np.nominee.name }}
 	          {% add_num_nominations user np.position np.nominee %}
                 </a>
               {% endfor %}