ui: Improve the display of information on /meeting/requests (#4493)

ietf-tools · Sep 26, 2022 · 2b5a7c0 · 2b5a7c0
1 parent 3ab7e67
commit 2b5a7c0
Showing 1 changed file with 25 additions and 19 deletions.
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load ietf_filters static person_filters %}
+{% load ietf_filters static person_filters textfilters %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
@@ -34,10 +34,10 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
             <thead>
                 <tr>
                     <th scope="col" data-sort="group">Group</th>
-                    <th scope="col" data-sort="count">Length</th>
-                    <th scope="col" data-sort="num">Size</th>
-                    <th scope="col" class="d-none d-sm-table-cell" data-sort="requester">Requester</th>
-                    <th scope="col" class="d-none d-sm-table-cell" data-sort="ad">AD</th>
+                    <th scope="col" class="d-none d-lg-table-cell" data-sort="count">Length</th>
+                    <th scope="col" class="d-none d-lg-table-cell" data-sort="num">Size</th>
+                    <th scope="col" class="d-none d-lg-table-cell" data-sort="requester">Requester</th>
+                    <th scope="col" class="d-none d-lg-table-cell" data-sort="ad">AD</th>
                     <th scope="col" data-sort="constraints">Constraints</th>
                     <th scope="col" data-sort="special">Special requests</th>
                 </tr>
@@ -58,34 +58,39 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
                                 {{ session.group.acronym }}
                             </a>
                             {% if session.joint_with_groups.count %}joint with {{ session.joint_with_groups_acronyms|join:' ' }}{% endif %}
+                            {% if session.requested_duration %}
+                                <div class="d-lg-none">
+                                <i class="bi bi-stopwatch-fill"></i> {{ session.requested_duration|stringformat:"s"|slice:"0:4" }}
+                                </div>
+                            {% endif %}
+                            {% if session.attendees %}
+                                <div class="d-lg-none">
+                                    <i class="bi bi-people-fill"></i> {{ session.attendees }}
+                                </div>
+                            {% endif %}
                         </td>
-                        <td>
+                        <td class="d-none d-lg-table-cell">
                             {% if session.requested_duration %}{{ session.requested_duration|stringformat:"s"|slice:"0:4" }}{% endif %}
                         </td>
-                        <td>{{ session.attendees|default:"" }}</td>
-                        <td class="d-none d-sm-table-cell">{% person_link session.requested_by_person %}</td>
-                        <td class="d-none d-sm-table-cell">
+                        <td class="d-none d-lg-table-cell">{{ session.attendees|default:"" }}</td>
+                        <td class="d-none d-lg-table-cell">{% person_link session.requested_by_person with_email=False %}</td>
+                        <td class="d-none d-lg-table-cell">
                             {% if session.group.ad_role %}
-                                {% person_link session.group.ad_role.person %}
+                                {% person_link session.group.ad_role.person with_email=False %}
                             {% endif %}
                         </td>
                         <td>
                             {% if session.requested_duration %}
                                 {% regroup session.constraints by name as prioritized_constraints %}
                                 {% for grouped_constraint in prioritized_constraints %}
-                                    {% if not forloop.first %}
-                                        {% ifchanged grouped_constraint.grouper %}
-                                            <br>
-                                        {% endifchanged %}
-                                    {% endif %}
+                                    <div{% if not forloop.last %} class="mb-2"{% endif %}>
                                     <b>{{ grouped_constraint.grouper.name }}:</b>
                                     {% for constraint in grouped_constraint.list %}
                                         {% with constraint.target.parent.id as constraint_target_parent_id %}
                                             {% with constraint.source.parent.id as constraint_source_parent_id %}
                                                 {% with constraint.person as constraint_person %}
                                                     {% if constraint_target_parent_id == constraint_source_parent_id and not constraint_person %}<b>{% endif %}
-                                                    {% if constraint.name.slug == "bethere" %}{% person_link constraint_person %}
-                                                    {% else %}
+                                                    {% if constraint.name.slug == "bethere" %}{% person_link constraint_person with_email=False %}{% else %}
                                                         {% with constraint.name.slug as constraint_name_slug %}
                                                             <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 %}">
                                                             {% endwith %}
@@ -94,11 +99,12 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
                                             {% endwith %}
                                         {% endwith %}
                                     {% endfor %}
+                                   </div>
                                 {% endfor %}
                             {% endif %}
                         </td>
                         <td>
-                            {% if session.comments %}{{ session.comments|linebreaksbr }}{% endif %}
+                            {% if session.comments %}{{ session.comments|urlize_ietf_docs|linkify|linebreaksbr }}{% endif %}
                         </td>
                     </tr>
                 {% if forloop.last %}</tbody>{% endif %}
@@ -108,4 +114,4 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}