Skip to content

Commit a1dcba1

Browse files
committed
Merged in [14059] from rjsparks@nostrum.com:
Made the view-feedback table sortable. Fixes ietf-tools#2259. - Legacy-Id: 14069 Note: SVN reference [14059] has been migrated to Git commit e5f10bf
2 parents e393b83 + e5f10bf commit a1dcba1

1 file changed

Lines changed: 21 additions & 6 deletions

File tree

ietf/templates/nomcom/view_feedback.html

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
{% extends "nomcom/nomcom_private_base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
3-
{% load origin %}
3+
{% load origin static %}
44

55
{% load nomcom_tags %}
66

77
{% block subtitle %} - View feedback {% endblock %}
88

9+
{% block pagehead %}
10+
<link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
11+
{% endblock %}
12+
913
{% block nomcom_content %}
1014
{% origin %}
1115
<h2>Feedback related to nominees</h2>
@@ -23,10 +27,12 @@ <h2>Feedback related to nominees</h2>
2327
{% endif %}
2428
</div>
2529
<div class="panel-body">
26-
<table class="table table-condensed table-striped">
30+
<table class="table table-condensed table-striped tablesorter">
2731
<thead>
2832
<tr>
29-
<th class="col-sm-9">Nominee</th>
33+
<th class="col-sm-1">First Name</th>
34+
<th class="col-sm-1">Last Name</th>
35+
<th class="col-sm-2">Email</th>
3036
{% for ft in nominee_feedback_types %}
3137
<th class="col-sm-1 text-center">{{ ft.name }}</th>
3238
{% endfor %}
@@ -36,8 +42,13 @@ <h2>Feedback related to nominees</h2>
3642
{% for fb_dict in staterank.list %}
3743
<tr>
3844
<td>
39-
<a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">{{ fb_dict.nominee.name }}</a>
40-
<span class="hidden-xs">&lt;{{fb_dict.nominee.email.address}}&gt;</span>
45+
<a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">{{ fb_dict.nominee.person.first_name }}</a>
46+
</td>
47+
<td>
48+
<a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">{{ fb_dict.nominee.person.last_name }}</a>
49+
</td>
50+
<td>
51+
<span class="hidden-xs">&lt;<a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">{{ fb_dict.nominee.email.address }}</a>&gt;</span>
4152
</td>
4253
{% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
4354
<td class="text-right">
@@ -70,7 +81,7 @@ <h2>Feedback related to topics</h2>
7081
{% for fb_dict in topics_feedback %}
7182
<tr>
7283
<td>
73-
<a href="{% url 'ietf.nomcom.views.view_feedback_topic' year=year topic_id=fb_dict.topic.id %}">{{ fb_dict.topic.subject }}</a>
84+
<a href="{% url 'ietf.nomcom.views.view_feedback_topic' year=year topic_id=fb_dict.topic.id %}">{{ fb_dict.topic.subject }}</a>
7485
</td>
7586
{% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
7687
<td class="text-right">
@@ -110,3 +121,7 @@ <h2>Feedback not related to Nominees</h2>
110121
</table>
111122
{% endif %}
112123
{% endblock %}
124+
125+
{% block js %}
126+
<script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
127+
{% endblock %}

0 commit comments

Comments
 (0)