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 @@ -
- {% ifchanged s.meeting %} - {% if s.meeting.type.slug == 'ietf' %} - IETF {{s.meeting.number}} - {% else %} - {{s.meeting.number}} - {% endif %} - {% endifchanged %} - | -
- {% if s.name %}{{ s.name }} {% endif %} - {% if s.current_status == "sched" %} - {{s.time|date:"D"}} {{s.time|date:"Y-m-d"}} - {% else %} - {{s.current_status_name}} - {% endif %} - {% if show_request and s.meeting.type_id == 'ietf' %} - {% if can_edit %} - - Edit Session Request - {% endif %} - {% endif %} - |
- - {% if show_ical %} - {% if s.meeting.type_id == 'ietf' %} - {{s.time|date:"H:i"}} - - {% else %} - - {% endif %} - {% endif %} - | -{% if s.agenda %}Agenda{% endif %} | -{% if s.minutes %}Minutes{% endif %} | -
-
- {% if can_always_edit or can_edit_materials %}Edit {% endif %}Materials
+{# bs5ok #}
+{% for s in sessions %}
+
+ {% if s.meeting.type.slug == 'ietf' %}
+ IETF {{ s.meeting.number }}
+ {% else %}
+ {{ s.meeting.number }}
+ {% endif %}
+ |
+
+ {% if s.name %}{{ s.name }}{% endif %}
+ {% if s.current_status == "sched" %}
+ {{ s.time|date:"Y-m-d" }}
+ {% else %}
+ {{ s.current_status_name }}
+ {% endif %}
+ {% if show_request and s.meeting.type_id == 'ietf' %}
+ {% if can_edit %}
+
+ Edit Session Request
- |
- {% endfor %}
- |
Meeting | +Date | ++ | Materials | +
---|
Meeting | +Date | ++ | Materials | +
---|
Meeting | +Date | ++ | Materials | +
---|
This page shows meetings within the last four years. For earlier meetings, please see the proceedings.
- -{% endblock %} \ No newline at end of file ++ This page shows meetings within the last four years. For earlier meetings, please see the proceedings. +
+ {% endblock %} \ No newline at end of file