More fixes.

 - Legacy-Id: 19855

Author: larseggert

ietf/doc/templatetags/ietf_filters.py

@@ -226,10 +226,10 @@ def urlize_ietf_docs(string, autoescape=None):
     """
     if autoescape and not isinstance(string, SafeData):
         string = escape(string)
-    string = re.sub(r"(?<!>)(RFC ?)0{0,3}(\d+)", "<a href=\"/doc/rfc\\2/\">\\1\\2</a>", string)
-    string = re.sub(r"(?<!>)(BCP ?)0{0,3}(\d+)", "<a href=\"/doc/bcp\\2/\">\\1\\2</a>", string)
-    string = re.sub(r"(?<!>)(STD ?)0{0,3}(\d+)", "<a href=\"/doc/std\\2/\">\\1\\2</a>", string)
-    string = re.sub(r"(?<!>)(FYI ?)0{0,3}(\d+)", "<a href=\"/doc/fyi\\2/\">\\1\\2</a>", string)
+    string = re.sub(r"(?<!>)(RFC\s*?)0{0,3}(\d+)", "<a href=\"/doc/rfc\\2/\">\\1\\2</a>", string)
+    string = re.sub(r"(?<!>)(BCP\s*?)0{0,3}(\d+)", "<a href=\"/doc/bcp\\2/\">\\1\\2</a>", string)
+    string = re.sub(r"(?<!>)(STD\s*?)0{0,3}(\d+)", "<a href=\"/doc/std\\2/\">\\1\\2</a>", string)
+    string = re.sub(r"(?<!>)(FYI\s*?)0{0,3}(\d+)", "<a href=\"/doc/fyi\\2/\">\\1\\2</a>", string)
     string = re.sub(r"(?<!>)(draft-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string)
     string = re.sub(r"(?<!>)(conflict-review-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string)
     string = re.sub(r"(?<!>)(status-change-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string)
@@ -424,7 +424,7 @@ def format_snippet(text, trunc_words=25):
     snippet = truncatewords_html(full, trunc_words)
     if snippet != full:
         return mark_safe('<div class="snippet">%s<button class="btn btn-sm btn-primary show-all"><i class="bi bi-caret-down"></i></button></div><div class="visually-hidden full">%s</div>' % (snippet, full))
-    return full
+    return mark_safe(full)
 
 @register.simple_tag
 def doc_edit_button(url_name, *args, **kwargs):

ietf/doc/tests_js.py

@@ -44,6 +44,7 @@ def _fill_in_author_form(form_elt, name, email, affiliation, country):
                         name
                     ))
             except:
+                # print(self.driver.execute_script("return document.documentElement.outerHTML"))
                 print(name, email, self.driver.find_element(By.CSS_SELECTOR, ".select2-results__message").text)
                 # FIXME-LARS: force the test to succeed anyway, so CI doesn't crap out
                 return

ietf/group/forms.py

@@ -283,10 +283,10 @@ class ManageReviewRequestForm(forms.Form):
 
     action = forms.ChoiceField(choices=ACTIONS, widget=forms.HiddenInput, required=False)
     close = forms.ModelChoiceField(queryset=close_review_request_states(), required=False)
-    close_comment = forms.CharField(max_length=255, required=False)
-    reviewer = PersonEmailChoiceField(empty_label="(None)", required=False, label_with="person")
-    review_type = forms.ModelChoiceField(queryset=ReviewTypeName.objects.filter(slug__in=['telechat', 'lc']), required=True)
-    add_skip = forms.BooleanField(required=False)
+    close_comment = forms.CharField(max_length=255, required=False, label="Closing comment")
+    reviewer = PersonEmailChoiceField(empty_label="(None)", required=False, label_with="person", label="Assign reviewer")
+    review_type = forms.ModelChoiceField(queryset=ReviewTypeName.objects.filter(slug__in=['telechat', 'lc']), required=True, label="Review type")
+    add_skip = forms.BooleanField(required=False, label="Skip next time")
 
     def __init__(self, review_req, *args, **kwargs):
         if not "prefix" in kwargs:
@@ -309,10 +309,7 @@ def __init__(self, review_req, *args, **kwargs):
         if close_initial:
             self.fields["close"].initial = close_initial
 
-        self.fields["close"].widget.attrs["class"] = "form-control input-sm"
-
         get_reviewer_queue_policy(review_req.team).setup_reviewer_field(self.fields["reviewer"], review_req)
-        self.fields["reviewer"].widget.attrs["class"] = "form-control input-sm"
 
         if not getattr(review_req, 'in_lc_and_telechat', False):
             del self.fields["review_type"]
@@ -390,6 +387,4 @@ class ReviewSecretarySettingsForm(forms.ModelForm):
     class Meta:
         model = ReviewSecretarySettings
         fields = ['remind_days_before_deadline', 'max_items_to_show_in_reviewer_list',
-                  'days_to_show_in_reviewer_list']
-
-
+                  'days_to_show_in_reviewer_list']

ietf/group/tests_info.py

@@ -421,7 +421,7 @@ def test_chair_photos(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         chairs = Role.objects.filter(group__type='wg', group__state='active', name_id='chair')
-        self.assertEqual(len(q('div.photo-thumbnail img')), chairs.count())
+        self.assertEqual(len(q('.photo')), chairs.count())
 
     def test_wg_photos(self):
         GroupFactory(acronym='mars')
@@ -432,15 +432,15 @@ def test_wg_photos(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         roles = Role.objects.filter(group__acronym='mars')
-        self.assertEqual(len(q('div.photo-thumbnail img')), roles.count())
+        self.assertEqual(len(q('.photo')), roles.count())
 
     def test_group_photos(self):
         url = urlreverse("ietf.group.views.group_photos", kwargs={'acronym':'iab'})
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         roles = Role.objects.filter(group__acronym='iab')
-        self.assertEqual(len(q('div.photo-thumbnail img')), roles.count())
+        self.assertEqual(len(q('.photo')), roles.count())
 
     def test_nonactive_group_badges(self):
         concluded_group = GroupFactory(state_id='conclude')

ietf/iesg/tests.py

@@ -93,7 +93,7 @@ def test_photos(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         ads = Role.objects.filter(group__type='area', group__state='active', name_id='ad')
-        self.assertEqual(len(q('div.photo-thumbnail')), ads.count())
+        self.assertEqual(len(q('.photo')), ads.count())
 
 class IESGAgendaTests(TestCase):
     def setUp(self):

ietf/person/templatetags/person_filters.py

@@ -35,11 +35,13 @@ def person_by_name(name):
 def person_link(person, **kwargs):
     title = kwargs.get('title', '')
     cls = kwargs.get('class', '')
+    with_email = kwargs.get('with_email', True)
+    nowrap = kwargs.get('nowrap', True)
     if person:
         name = person.name if person.alias_set.filter(name=person.name).exists() else ''
         plain_name = person.plain_name()
         email = person.email_address()
-        return {'name': name, 'plain_name': plain_name, 'email': email, 'title': title, 'class': cls}
+        return {'name': name, 'plain_name': plain_name, 'email': email, 'title': title, 'class': cls, 'with_email': with_email, 'nowrap': nowrap}
     else:
         return {}
 
@@ -48,7 +50,9 @@ def person_link(person, **kwargs):
 def email_person_link(email, **kwargs):
     title = kwargs.get('title', '')
     cls = kwargs.get('class', '')
+    with_email = kwargs.get('with_email', True)
+    nowrap = kwargs.get('nowrap', True)
     name = email.person.name if email.person.alias_set.filter(name=email.person.name).exists() else ''
     plain_name = email.person.plain_name()
     email = email.address
-    return {'name': name, 'plain_name': plain_name, 'email': email, 'title': title, 'class': cls}
+    return {'name': name, 'plain_name': plain_name, 'email': email, 'title': title, 'class': cls, 'with_email': with_email, 'nowrap': nowrap}

ietf/static/css/ietf.scss

@@ -6,7 +6,7 @@ $enable-negative-margins: true;
 // Don't add carets to dropdowns by default.
 // $enable-caret: false;
 
-$tooltip-max-width: 100%;
+// $tooltip-max-width: 100%;
 
 // Only import what we need:
 // https://getbootstrap.com/docs/5.1/customize/optimize/

ietf/static/js/ietf.js

@@ -108,7 +108,8 @@ $(document)
 $(document)
     .ready(function () {
         var headings = $("#content")
-            .find("h1:visible, h2:visible, h3:visible, h4:visible, h5:visible, h6:visible");
+            .find("h1:visible, h2:visible, h3:visible, h4:visible, h5:visible, h6:visible")
+            .not(".navskip");
 
         var contents = $(headings)
             .html()
@@ -132,12 +133,12 @@ $(document)
                 .attr("tabindex", 0)
                 .after($(`
                  <div class="col-xl-2 small">
-                     <nav id="righthand-nav" class="position-fixed navbar navbar-light bg-light overflow-auto" style="height: 70vh;">
-                     <!--<a class="navbar-brand" href="#">Navbar</a>-->
+                     <nav id="righthand-nav" class="position-fixed navbar navbar-light bg-light overflow-auto flex-fill" style="height: 70vh; width: inherit;">
                      </nav>
                  </div>
                  `))
                 .find("h1:visible, h2:visible, h3:visible, h4:visible, h5:visible, h6:visible")
+                .not(".navskip")
                 .each(function () {
                     // Some headings have complex HTML in them - only use first part in that case.
                     var text = $(this)
@@ -162,7 +163,7 @@ $(document)
                     if (nav === undefined) {
                         nav = $("#righthand-nav");
                         nav = $(nav)
-                            .append(`<nav class="nav nav-pills flex-column align-self-start">`)
+                            .append(`<nav class="nav nav-pills flex-column align-self-start flex-fill px-2">`)
                             .children()
                             .last();
                     }
@@ -259,4 +260,17 @@ $(document)
                         .load(loc);
                 }
             });
+    });
+
+// Handle history snippet expansion.
+$(document)
+    .ready(function () {
+        $(".snippet .show-all")
+            .on("click", function () {
+                $(this)
+                    .parents(".snippet")
+                    .addClass("visually-hidden")
+                    .siblings(".full")
+                    .removeClass("visually-hidden");
+            });
     });

ietf/static/js/list.js

@@ -24,7 +24,7 @@ function replace_with_internal(table, internal_table, i) {
 }
 
 function field_magic(i, e, fields) {
-    if (fields[i] == "date" || fields[i] == "num") {
+    if (fields[i] == "date" || fields[i] == "num" || fields[i] == "count") {
         $(e)
             .addClass("text-end");
     }
@@ -80,7 +80,7 @@ $(document)
 
                 // HTML for the search widget
                 var searcher = $.parseHTML(`
-                    <div class="input-group my-3">
+                    <div class="input-group input-group-sm my-3">
                         <input type="search" class="search form-control" placeholder="Search"/>
                         <button class="btn btn-outline-secondary search-reset" type="button">
                             <i class="bi bi-x"></i>