More fixes.

 - Legacy-Id: 19829

Author: larseggert

ietf/doc/tests.py

@@ -278,7 +278,7 @@ def test_drafts_in_last_call(self):
         r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_last_call'))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.title)
-        self.assertContains(r, escape(draft.action_holders.first().plain_name()))
+        self.assertContains(r, escape(draft.action_holders.first().name))
 
     def test_in_iesg_process(self):
         doc_in_process = IndividualDraftFactory()
@@ -350,7 +350,7 @@ def test_recent_drafts(self):
         self.assertEqual(q('td.status span.badge.bg-warning').text(),"for 15 days")
         self.assertEqual(q('td.status span.badge.bg-danger').text(),"for 29 days")
         for ah in [draft.action_holders.first() for draft in drafts]:
-            self.assertContains(r, escape(ah.plain_name()))
+            self.assertContains(r, escape(ah.name))
 
 class DocDraftTestCase(TestCase):
     draft_text = """
@@ -1278,7 +1278,7 @@ def test_document_draft_shows_action_holders(self, mock_method):
         q = PyQuery(r.content)
         self.assertEqual(len(self._pyquery_select_action_holder_string(q, '(None)')), 0)
         for person in draft.action_holders.all():
-            self.assertEqual(len(self._pyquery_select_action_holder_string(q, person.plain_name())), 1)
+            self.assertEqual(len(self._pyquery_select_action_holder_string(q, person.name)), 1)
         # check that one action holder was marked as old
         self.assertEqual(len(self._pyquery_select_action_holder_string(q, 'for 30 days')), 1)
 
@@ -2431,7 +2431,7 @@ def test_markdown_and_text(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertTrue(q('#materials-content > pre'))
+        self.assertTrue(q('#materials-content pre'))
 
         url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=self.doc.name,rev='01'))
         r = self.client.get(url)

ietf/group/tests_info.py

@@ -65,7 +65,7 @@ def test_active_groups(self):
         self.assertContains(r, group.parent.name)
         self.assertContains(r, group.acronym)
         self.assertContains(r, group.name)
-        self.assertContains(r, escape(group.ad_role().person.plain_name()))
+        self.assertContains(r, escape(group.ad_role().person.name))
 
         for t in ('rg','area','ag', 'rag', 'dir','review','team','program','iabasg','adm'):
             g = GroupFactory.create(type_id=t,state_id='active') 
@@ -348,7 +348,7 @@ def test_group_about_personnel(self):
             self.assertEqual(r.status_code, 200)
 
             for role in group.role_set.all():
-                self.assertContains(r, escape(role.person.plain_name()))
+                self.assertContains(r, escape(role.person.name))
 
     def test_materials(self):
         group = GroupFactory(type_id="team", acronym="testteam", name="Test Team", state_id="active")

ietf/static/css/ietf.scss

@@ -170,14 +170,6 @@ $timeline-even-hover-color: shift-color($timeline-even-color, $link-shade-percen
     border: 2 * $table-border-width solid #000;
 }
 
-.is-blocking {
-    box-shadow: 0 0 8px 8px #dc0d12;
-    padding: 3px 0px 3px 3px;
-    margin: 5px 1px 3px 0px;
-    border: 1px solid #dc0d12;
-}
-
-
 // See https://getbootstrap.com/docs/5.0/customize/color/#all-colors
 $color-discuss: $red-500;
 $color-yes: $green-500;
@@ -186,6 +178,11 @@ $color-abstain: $orange-400;
 $color-recuse: $purple-400;
 $color-norecord: $gray-300;
 
+.is-blocking {
+    box-shadow: 0 0 map.get($spacers, 2) map.get($spacers, 2) $color-discuss;
+    margin: map.get($spacers, 2);
+}
+
 .color-discuss {
     color: $color-discuss;
 }
@@ -805,7 +802,7 @@ td.position-empty {
     align-items: baseline;
 }
 
-.edit-meeting-timeslots-and-misc-sessions .scheduling-panel .flowing-form .form-group {
+.edit-meeting-timeslots-and-misc-sessions .scheduling-panel .flowing-form .mb-3 {
     margin-right: 1em;
     margin-bottom: 0.5em;
 }

ietf/static/js/complete-review.js

@@ -2,7 +2,7 @@ $(document).ready(function () {
     var form = $("form.complete-review");
 
     var reviewedRev = form.find("[name=reviewed_rev]");
-    reviewedRev.closest(".form-group").find("a.rev").on("click", function (e) {
+    reviewedRev.closest(".mb-3").find("a.rev").on("click", function (e) {
         e.preventDefault();
         reviewedRev.val($(this).text());
     });
@@ -11,7 +11,7 @@ $(document).ready(function () {
     var mailArchiveSearchTemplate = form.find(".template .mail-archive-search").parent().html();
     var mailArchiveSearchResultTemplate = form.find(".template .mail-archive-search-result").parent().html();
 
-    form.find("[name=review_url]").closest(".form-group").before(mailArchiveSearchTemplate);
+    form.find("[name=review_url]").closest(".mb-3").before(mailArchiveSearchTemplate);
 
     var mailArchiveSearch = form.find(".mail-archive-search");
 
@@ -130,8 +130,8 @@ $(document).ready(function () {
             for (var i in shouldBeVisible[v]) {
                 var selector = shouldBeVisible[v][i];
                 var row = form.find(selector);
-                if (!row.is(".form-group"))
-                    row = row.closest(".form-group");
+                if (!row.is(".mb-3"))
+                    row = row.closest(".mb-3");
 
                 if ($.inArray(selector, shouldBeVisible[val]) != -1)
                     row.show();

ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js

@@ -112,26 +112,26 @@ jQuery(document).ready(function () {
 
         let hide = {};
 
-        form.find("[name=group],[name=short],[name=\"agenda_note\"]").prop('disabled', false).closest(".form-group").show();
+        form.find("[name=group],[name=short],[name=\"agenda_note\"]").prop('disabled', false).closest(".mb-3").show();
 
         if (this.value == "break") {
-            form.find("[name=short]").closest(".form-group").hide();
+            form.find("[name=short]").closest(".mb-3").hide();
         }
         else if (this.value == "plenary") {
             let group = form.find("[name=group]");
             group.val(group.data('ietf'));
         }
         else if (this.value == "regular") {
-            form.find("[name=short]").closest(".form-group").hide();
+            form.find("[name=short]").closest(".mb-3").hide();
         }
 
         if (this.value != "regular")
-            form.find("[name=\"agenda_note\"]").closest(".form-group").hide();
+            form.find("[name=\"agenda_note\"]").closest(".mb-3").hide();
 
         if (['break', 'reg', 'reserved', 'unavail', 'regular'].indexOf(this.value) != -1) {
             let group = form.find("[name=group]");
             group.prop('disabled', true);
-            group.closest(".form-group").hide();
+            group.closest(".mb-3").hide();
         }
     });
 

ietf/static/js/ietf.js

@@ -137,9 +137,10 @@ $(document)
                     var text = $(this)
                         .html()
                         .split("<")
-                        .shift();
+                        .shift()
+                        .trim();
 
-                    if (text === "") {
+                    if (text === undefined || text === "") {
                         // Nothing to do for empty headings.
                         return;
                     }

ietf/static/js/ipr-search.js

@@ -16,7 +16,7 @@ $(document).ready(function() {
 
     // make enter presses submit through the nearby button
     $("form.ipr-search input,select").keyup(function (e) {
-        var submitButton = $(this).closest(".form-group").find('button[type=submit]');
+        var submitButton = $(this).closest(".mb-3").find('button[type=submit]');
         if (e.which == 13 && submitButton.length > 0) {
             submitButton.click();
             return false;

ietf/static/js/liaisons.js

@@ -4,7 +4,7 @@ var attachmentWidget = {
     count: 0,
 
     readConfig: function () {
-        var buttonFormGroup = attachmentWidget.button.parents('.form-group');
+        var buttonFormGroup = attachmentWidget.button.parents('.mb-3');
         var disabledLabel = buttonFormGroup.find('.attachDisabledLabel');
 
         if (disabledLabel.length) {
@@ -57,7 +57,7 @@ var attachmentWidget = {
         attachmentWidget.config.fields.each(function () {
             var field = $(this);
             var container = $(this)
-                .parents('.form-group');
+                .parents('.mb-3');
             if (container.find(':file')
                 .length) {
                 html += ' (' + field.val() + ')';
@@ -109,7 +109,7 @@ var attachmentWidget = {
         attachmentWidget.config.basefields.each(function () {
             var field = $(this);
             var oldcontainer = $(this)
-                .parents('.form-group');
+                .parents('.mb-3');
             var newcontainer = oldcontainer.clone();
             var newfield = newcontainer.find('#' + field.attr('id'));
             newfield.attr('name', newfield.attr('name') + '_' + attachmentWidget.count);
@@ -248,7 +248,7 @@ var liaisonForm = {
     },
 
     updatePurpose: function () {
-        var deadlinecontainer = liaisonForm.deadline.closest('.form-group');
+        var deadlinecontainer = liaisonForm.deadline.closest('.mb-3');
         var value = liaisonForm.purpose.val();
 
         if (value == 'action' || value == 'comment') {

ietf/static/js/list.js

@@ -66,7 +66,9 @@ $(document)
                     .wrap(`<div id='tablewrapper-${n}'></div`);
                 $(header_row)
                     .children("[data-sort]")
-                    .addClass("sort")
+                    .addClass("sort");
+                $(header_row)
+                    .children("th, td")
                     .each((i, e) => field_magic(i, e, fields));
 
                 if ($(header_row)

ietf/static/js/upload-material.js

@@ -4,7 +4,7 @@
         'use strict';
 
         /**
-         * Hide the inactive input form-group
+         * Hide the inactive input mb-3
          * @param form form to process
          */
         function showUrlOrFile(form) {