Skip to content

Commit 2b5a7c0

Browse files
authored
ui: Improve the display of information on /meeting/requests (ietf-tools#4493)
1 parent 3ab7e67 commit 2b5a7c0

1 file changed

Lines changed: 25 additions & 19 deletions

File tree

ietf/templates/meeting/requests.html

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "base.html" %}
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
4-
{% load ietf_filters static person_filters %}
4+
{% load ietf_filters static person_filters textfilters %}
55
{% block pagehead %}
66
<link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
77
{% endblock %}
@@ -34,10 +34,10 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
3434
<thead>
3535
<tr>
3636
<th scope="col" data-sort="group">Group</th>
37-
<th scope="col" data-sort="count">Length</th>
38-
<th scope="col" data-sort="num">Size</th>
39-
<th scope="col" class="d-none d-sm-table-cell" data-sort="requester">Requester</th>
40-
<th scope="col" class="d-none d-sm-table-cell" data-sort="ad">AD</th>
37+
<th scope="col" class="d-none d-lg-table-cell" data-sort="count">Length</th>
38+
<th scope="col" class="d-none d-lg-table-cell" data-sort="num">Size</th>
39+
<th scope="col" class="d-none d-lg-table-cell" data-sort="requester">Requester</th>
40+
<th scope="col" class="d-none d-lg-table-cell" data-sort="ad">AD</th>
4141
<th scope="col" data-sort="constraints">Constraints</th>
4242
<th scope="col" data-sort="special">Special requests</th>
4343
</tr>
@@ -58,34 +58,39 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
5858
{{ session.group.acronym }}
5959
</a>
6060
{% if session.joint_with_groups.count %}joint with {{ session.joint_with_groups_acronyms|join:' ' }}{% endif %}
61+
{% if session.requested_duration %}
62+
<div class="d-lg-none">
63+
<i class="bi bi-stopwatch-fill"></i> {{ session.requested_duration|stringformat:"s"|slice:"0:4" }}
64+
</div>
65+
{% endif %}
66+
{% if session.attendees %}
67+
<div class="d-lg-none">
68+
<i class="bi bi-people-fill"></i> {{ session.attendees }}
69+
</div>
70+
{% endif %}
6171
</td>
62-
<td>
72+
<td class="d-none d-lg-table-cell">
6373
{% if session.requested_duration %}{{ session.requested_duration|stringformat:"s"|slice:"0:4" }}{% endif %}
6474
</td>
65-
<td>{{ session.attendees|default:"" }}</td>
66-
<td class="d-none d-sm-table-cell">{% person_link session.requested_by_person %}</td>
67-
<td class="d-none d-sm-table-cell">
75+
<td class="d-none d-lg-table-cell">{{ session.attendees|default:"" }}</td>
76+
<td class="d-none d-lg-table-cell">{% person_link session.requested_by_person with_email=False %}</td>
77+
<td class="d-none d-lg-table-cell">
6878
{% if session.group.ad_role %}
69-
{% person_link session.group.ad_role.person %}
79+
{% person_link session.group.ad_role.person with_email=False %}
7080
{% endif %}
7181
</td>
7282
<td>
7383
{% if session.requested_duration %}
7484
{% regroup session.constraints by name as prioritized_constraints %}
7585
{% for grouped_constraint in prioritized_constraints %}
76-
{% if not forloop.first %}
77-
{% ifchanged grouped_constraint.grouper %}
78-
<br>
79-
{% endifchanged %}
80-
{% endif %}
86+
<div{% if not forloop.last %} class="mb-2"{% endif %}>
8187
<b>{{ grouped_constraint.grouper.name }}:</b>
8288
{% for constraint in grouped_constraint.list %}
8389
{% with constraint.target.parent.id as constraint_target_parent_id %}
8490
{% with constraint.source.parent.id as constraint_source_parent_id %}
8591
{% with constraint.person as constraint_person %}
8692
{% if constraint_target_parent_id == constraint_source_parent_id and not constraint_person %}<b>{% endif %}
87-
{% if constraint.name.slug == "bethere" %}{% person_link constraint_person %}
88-
{% else %}
93+
{% if constraint.name.slug == "bethere" %}{% person_link constraint_person with_email=False %}{% else %}
8994
{% with constraint.name.slug as constraint_name_slug %}
9095
<span class="{% if constraint_name_slug == 'chair_conflict' %}text-danger{% elif constraint_name_slug == 'tech_overlap' %}text-info{% elif constraint_name_slug == 'key_participant' %}text-success{% else %}{{ constraint_name_slug }}{% endif %}">
9196
{% endwith %}
@@ -94,11 +99,12 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
9499
{% endwith %}
95100
{% endwith %}
96101
{% endfor %}
102+
</div>
97103
{% endfor %}
98104
{% endif %}
99105
</td>
100106
<td>
101-
{% if session.comments %}{{ session.comments|linebreaksbr }}{% endif %}
107+
{% if session.comments %}{{ session.comments|urlize_ietf_docs|linkify|linebreaksbr }}{% endif %}
102108
</td>
103109
</tr>
104110
{% if forloop.last %}</tbody>{% endif %}
@@ -108,4 +114,4 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
108114
{% endblock %}
109115
{% block js %}
110116
<script src="{% static "ietf/js/list.js" %}"></script>
111-
{% endblock %}
117+
{% endblock %}

0 commit comments

Comments
 (0)