From 7f918b00da0a60faef3f7c70e4ec1cb7dff66211 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Wed, 15 Dec 2021 20:38:28 +0000
Subject: [PATCH] More test fixes  - Legacy-Id: 19784

---
 ietf/group/tests_info.py               |   2 -
 ietf/static/js/edit-milestones.js      |   4 +-
 ietf/static/js/list.js                 |   7 +-
 ietf/templates/group/meetings-row.html | 110 ++++++++++++++----------
 ietf/templates/group/meetings.html     | 113 +++++++++++++++----------
 5 files changed, 138 insertions(+), 98 deletions(-)

diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index 712dd305c..de073e257 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -1167,7 +1167,6 @@ class MilestoneTests(TestCase):
                                     'm-1-desc': "Test 3",
                                     'm-1-due': due.strftime("%B %Y"),
                                     'm-1-resolved': "",
-                                    'm-1-docs': "",
                                     'action': "save",
                                     })
         self.assertEqual(r.status_code, 302)
@@ -1404,7 +1403,6 @@ class DatelessMilestoneTests(TestCase):
                                     'm-1-desc': "Test 3",
                                     'm-1-order': 1,
                                     'm-1-resolved': "",
-                                    'm-1-docs': "",
                                     'action': "save",
                                     })
         self.assertEqual(r.status_code, 302)
diff --git a/ietf/static/js/edit-milestones.js b/ietf/static/js/edit-milestones.js
index 40633692d..e5e3c703e 100644
--- a/ietf/static/js/edit-milestones.js
+++ b/ietf/static/js/edit-milestones.js
@@ -142,12 +142,12 @@ $(document)
                 .closest(".edit-milestone")
                 .find("[name$=resolved]");
             if (resolved) {
-                reason.closest(".form-group")
+                reason.closest(".row")
                     .removeClass("visually-hidden");
                 if (!reason.val())
                     reason.val(reason.data("default"));
             } else {
-                reason.closest(".form-group")
+                reason.closest(".row")
                     .addClass("visually-hidden");
                 reason.val("");
             }
diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js
index dbd45988c..dde92c3df 100644
--- a/ietf/static/js/list.js
+++ b/ietf/static/js/list.js
@@ -20,7 +20,8 @@ function replace_with_internal(table, internal_table, i) {
         .replaceWith(internal_table[i]
             .children("table")
             .children("tbody")
-            .clone());}
+            .clone());
+}
 
 function field_magic(i, e, fields) {
     if (fields[i] == "date" || fields[i] == "num") {
@@ -172,10 +173,12 @@ $(document)
                             }
 
                             list_instance.push(
-                                new List(hook, {
+                                new List(hook, pagination ? {
                                     valueNames: fields,
                                     pagination: pagination,
                                     page: items_per_page
+                                } : {
+                                    valueNames: fields
                                 }));
                         });
 
diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html
index 330eaab4e..5544409e8 100644
--- a/ietf/templates/group/meetings-row.html
+++ b/ietf/templates/group/meetings-row.html
@@ -1,47 +1,65 @@
-<table class="table table-sm table-striped">
-    <tbody>
-        {% for s in sessions %}
-            <tr>
-                <td>
-                    {% ifchanged s.meeting %}
-                        {% if s.meeting.type.slug == 'ietf' %}
-                            IETF {{s.meeting.number}}
-                        {% else %}
-                            {{s.meeting.number}}
-                        {% endif %}
-                    {% endifchanged %}
-                </td>
-                <td class="text-right">
-                    {% if s.name %}{{ s.name }}<br>{% endif %}
-                    {% if s.current_status == "sched" %}
-                        {{s.time|date:"D"}} &nbsp; {{s.time|date:"Y-m-d"}}
-                    {% else %}
-                        {{s.current_status_name}}
-                    {% endif %}
-                    {% if show_request and s.meeting.type_id == 'ietf' %}
-                        {% if can_edit %}
-                            <br>
-                            <a class="btn btn-primary btn-sm" href="{% url 'ietf.secr.sreq.views.view' num=s.meeting.number acronym=s.group.acronym %}">Edit Session Request</a>
-                        {% endif %}
-                    {% endif %}
-                </td>
-                <td class="text-left padded-left ">
-                    {% if show_ical %}
-                        {% if s.meeting.type_id == 'ietf' %}
-                            {{s.time|date:"H:i"}}
-                            &nbsp;<a href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number session_id=s.id %}"><span class="bi bi-calendar"></span></a>
-                        {% else %}
-                            &nbsp;<a href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number acronym=s.group.acronym %}"><span class="bi bi-calendar"></span></a>
-                        {% endif %}
-                    {% endif %}
-                </td>
-                <td>{% if s.agenda %}<a href="{{ s.agenda.get_absolute_url }}">Agenda</a>{% endif %}</td>
-                <td>{% if s.minutes %}<a href="{{ s.minutes.get_absolute_url }}">Minutes</a>{% endif %}</td>
-                <td>
-                    <a href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">
-                        {% if can_always_edit or can_edit_materials %}Edit {% endif %}Materials
+{# bs5ok #}
+{% for s in sessions %}
+    <tr>
+        <td>
+            {% if s.meeting.type.slug == 'ietf' %}
+                IETF {{ s.meeting.number }}
+            {% else %}
+                {{ s.meeting.number }}
+            {% endif %}
+        </td>
+        <td>
+            {% if s.name %}{{ s.name }}{% endif %}
+            {% if s.current_status == "sched" %}
+                {{ s.time|date:"Y-m-d" }}
+            {% else %}
+                <i>{{ s.current_status_name }}</i>
+            {% endif %}
+            {% if show_request and s.meeting.type_id == 'ietf' %}
+                {% if can_edit %}
+                    <a class="btn btn-primary btn-sm"
+                       href="{% url 'ietf.secr.sreq.views.view' num=s.meeting.number acronym=s.group.acronym %}">
+                        Edit Session Request
                     </a>
-                </td>
-        {% endfor %}
-    </tbody>
-</table>
\ No newline at end of file
+                {% endif %}
+            {% endif %}
+        </td>
+        <td>
+            {% if s.current_status == "sched" %}{{ s.time|date:"D" }}{% endif %}
+        </td>
+        <td>
+            {% if show_ical %}
+                {% if s.meeting.type_id == 'ietf' %}
+                    {{ s.time|date:"H:i" }}
+                    <a class="btn btn-primary btn-sm"
+                       href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number session_id=s.id %}">
+                        <span class="bi bi-calendar"></span>
+                    </a>
+                {% else %}
+                    <a class="btn btn-primary btn-sm"
+                       href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number acronym=s.group.acronym %}">
+                        <span class="bi bi-calendar"></span>
+                    </a>
+                {% endif %}
+            {% endif %}
+            <a class="btn btn-sm {% if not s.agenda %}btn-secondary disabled{% else %}btn-primary{% endif %}"
+               {% if s.agenda %}bhref="{{ s.agenda.get_absolute_url }}"{% endif %}>
+                Agenda
+            </a>
+            <a class="btn btn-sm {% if not s.minutes %}btn-secondary disabled{% else %}btn-primary{% endif %}"
+               {% if s.minutes %}href="{{ s.minutes.get_absolute_url }}"{% endif %}>
+                Minutes
+            </a>
+            <a class="btn btn-primary btn-sm"
+               href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">
+                Materials
+            </a>
+            {% if can_always_edit or can_edit_materials %}
+                <a class="btn btn-info btn-sm float-end"
+                   href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">
+                    Edit Materials
+                </a>
+            {% endif %}
+        </td>
+    </tr>
+{% endfor %}
diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html
index e0793e0be..c805d7359 100644
--- a/ietf/templates/group/meetings.html
+++ b/ietf/templates/group/meetings.html
@@ -1,67 +1,88 @@
+{# bs5ok #}
 {% extends "group/group_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
-{% block title %}Meetings{% if group %} for {{group.acronym}}{% endif %}{% endblock %}
-
+{% block title %}
+    Meetings
+    {% if group %}for {{ group.acronym }}{% endif %}
+{% endblock %}
 {% block buttonlist %}
     {{ block.super }}
-    <br>
-    <a class="btn btn-primary" href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
+    <a class="btn btn-primary"
+       href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
     {% if can_edit or can_always_edit %}
         <a class="btn btn-primary" href="{% url 'ietf.secr.sreq.views.main' %}">Request a session</a>
-        <a class="btn btn-primary" href="{% url 'ietf.meeting.views.interim_request' %}?group={{group.id}}">Request an interim meeting</a>
+        <a class="btn btn-primary"
+           href="{% url 'ietf.meeting.views.interim_request' %}?group={{ group.id }}">
+            Request an interim meeting
+        </a>
     {% endif %}
 {% endblock buttonlist %}
-
 {% block group_content %}
     {% origin %}
-
     {% if in_progress %}
-        <div class="card" id="inprogressmeets">
-            <div class="card-header">
-                Meetings in progress
-            </div>
-            <div class="card-body">
-                {% with sessions=in_progress show_request=True show_ical=True can_edit_materials=can_edit %}
+        <h2 class="mt-3" id="inprogressmeets">Meetings in progress</h2>
+        {% with sessions=in_progress show_request=True show_ical=True can_edit_materials=can_edit %}
+            <table class="table table-sm table-striped tablesorter">
+                <thead>
+                    <tr>
+                        <th data-sort="meeting">Meeting</th>
+                        <th data-sort="date">Date</th>
+                        <th></th>
+                        <th>Materials</th>
+                    </tr>
+                </thead>
+                <tbody>
                     {% include "group/meetings-row.html" %}
-                {% endwith %}
-            </div>
-        </div>
+                </tbody>
+            </table>
+        {% endwith %}
     {% endif %}
-
     {% if future %}
-        <div class="card" id="futuremeets">
-            <div class="card-header">
-                Future Meetings
-                <a class="regular float-end" title="icalendar entry for all scheduled future {{group.acronym}} meetings" href="{% url 'ietf.meeting.views.upcoming_ical' %}?show={{group.acronym}}"><span class="bi bi-calendar"></span></a>
-            </div>
-            <div class="card-body">
+        <h2 class="mt-3" id="futuremeets">
+            Future Meetings
+            <a title="icalendar entry for all scheduled future {{ group.acronym }} meetings"
+               href="{% url 'ietf.meeting.views.upcoming_ical' %}?show={{ group.acronym }}">
+                <span class="bi bi-calendar"></span>
+            </a>
+            <table class="table table-sm table-striped tablesorter">
+                <thead>
+                    <tr>
+                        <th data-sort="meeting">Meeting</th>
+                        <th data-sort="date">Date</th>
+                        <th></th>
+                        <th>Materials</th>
+                    </tr>
+                </thead>
                 {% with sessions=future show_request=True show_ical=True can_edit_materials=can_edit %}
-                    {% include "group/meetings-row.html" %}
+                    <tbody>
+                        {% include "group/meetings-row.html" %}
+                    </tbody>
                 {% endwith %}
-            </div>
-        </div>
-    {% endif %}
-
-    {% if past or recent %}
-        <div class="card" id="pastmeets">
-            <div class="card-header">
-                Past Meetings
-            </div>
-            <div class="card-body">
-                {% if can_edit %}
+            </table>
+        {% endif %}
+        {% if past or recent %}
+            <h2 class="mt-3" id="pastmeets">Past Meetings</h2>
+            <table class="table table-sm table-striped tablesorter">
+                <thead>
+                    <tr>
+                        <th data-sort="meeting">Meeting</th>
+                        <th data-sort="date">Date</th>
+                        <th></th>
+                        <th>Materials</th>
+                    </tr>
+                </thead>
+                <tbody>
                     {% with sessions=recent can_edit_materials=can_edit %}
                         {% include "group/meetings-row.html" %}
                     {% endwith %}
+                    {% with sessions=past can_edit_materials=False %}
+                        {% include "group/meetings-row.html" %}
+                    {% endwith %}
+                    <tbody>
+                    </table>
                 {% endif %}
-                {% with sessions=past can_edit_materials=False %}
-                    {% include "group/meetings-row.html" %}
-                {% endwith %}
-            </div>
-        </div>
-    {% endif %}
-
-    <p>This page shows meetings within the last four years. For earlier meetings, please see the proceedings.</p>
-
-{% endblock %}
\ No newline at end of file
+                <p>
+                    This page shows meetings within the last four years. For earlier meetings, please see the proceedings.
+                </p>
+            {% endblock %}
\ No newline at end of file