More fixes.

 - Legacy-Id: 19856

Author: larseggert

ietf/doc/templatetags/ietf_filters.py

@@ -409,17 +409,14 @@ def ad_area(user):
 def format_history_text(text, trunc_words=25):
     """Run history text through some cleaning and add ellipsis if it's too long."""
     full = mark_safe(text)
-
-    if text.startswith("This was part of a ballot set with:"):
-        full = urlize_ietf_docs(full)
+    full = urlize_ietf_docs(full)
 
     return format_snippet(full, trunc_words)
 
 @register.filter
 def format_snippet(text, trunc_words=25): 
     # urlize if there aren't already links present
-    if not 'href=' in text:
-        text = bleach.linkify(text, parse_email=True)
+    text = bleach.linkify(text, parse_email=True)
     full = keep_spacing(collapsebr(linebreaksbr(mark_safe(sanitize_fragment(text)))))
     snippet = truncatewords_html(full, trunc_words)
     if snippet != full:

ietf/doc/tests_review.py

@@ -407,7 +407,7 @@ def test_reject_reviewer_assignment(self):
         login_testing_unauthorized(self, "reviewsecretary", reject_url)
         r = self.client.get(reject_url)
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, assignment.reviewer.person.plain_name())
+        self.assertContains(r, assignment.reviewer.person.name)
         self.assertNotContains(r, 'can not be rejected')
         self.assertContains(r, '<button type="submit"')
 

ietf/ietfauth/tests.py

@@ -570,7 +570,7 @@ def test_apikey_management(self):
 
         # Check api key list content
         r = self.client.get(url)
-        self.assertContains(r, 'Personal API keys')
+        self.assertContains(r, 'API keys')
         self.assertContains(r, 'Get a new personal API key')
 
         # Check the add key form content
@@ -591,7 +591,7 @@ def test_apikey_management(self):
         for endpoint, display in endpoints:
             self.assertContains(r, endpoint)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('td code')), len(endpoints)) # hash
+        self.assertEqual(len(q('td code')), len(endpoints) * 2) # hash and endpoint
         self.assertEqual(len(q('td a:contains("Disable")')), len(endpoints))
 
         # Get one of the keys
@@ -612,7 +612,7 @@ def test_apikey_management(self):
         url = urlreverse('ietf.ietfauth.views.apikey_index')
         r = self.client.get(url)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('td code')), len(endpoints)) # key hash
+        self.assertEqual(len(q('td code')), len(endpoints) * 2) # key hash and endpoint
         self.assertEqual(len(q('td a:contains("Disable")')), len(endpoints)-1)
 
     def test_apikey_errors(self):

ietf/meeting/tests_js.py

@@ -1492,7 +1492,7 @@ def assert_agenda_view_filter_matches_ics_filter(self, filter_string):
                                       expected_event_count=len(sessions))
 
     def test_session_materials_modal(self):
-        """Test opening and re-opening a session materals modal
+        """Test opening and re-opening a session materials modal
 
         This currently only tests the slides to ensure that changes to these are picked up
         without reloading the main agenda page. This should also test that the agenda and
@@ -1517,8 +1517,10 @@ def test_session_materials_modal(self):
             ),
             'Modal open button not found or not clickable',
         )
-        self.scroll_to_element(open_modal_button)
-        open_modal_button.click()
+        # FIXME-LARS: no idea why we need js instead of the following:
+        # self.scroll_to_element(open_modal_button)
+        # open_modal_button.click()
+        self.driver.execute_script("arguments[0].click();", open_modal_button)
         WebDriverWait(self.driver, 2).until(
             expected_conditions.visibility_of(modal_div),
             'Modal did not become visible after clicking open button',

ietf/settings.py

@@ -498,6 +498,7 @@ def skip_unreadable_post(record):
     # Set placeholder attributes to label if no placeholder is provided
     'set_placeholder': False,
 
+    'required_css_class': 'required',
     'error_css_class': 'is-invalid',
     'success_css_class': 'is-valid',
 

ietf/static/css/ietf.scss

@@ -87,6 +87,20 @@ pre {
     font-size: inherit;
 }
 
+// Highlight required form field labels with bi-asterisk
+.required>label:after {
+    display: inline-block;
+    width: .75rem;
+    height: .75rem;
+    margin-left: .1rem;
+    content: "";
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='text-danger' viewBox='0 0 16 16'%3E%3Cpath d='M8 0a1 1 0 0 1 1 1v5.268l4.562-2.634a1 1 0 1 1 1 1.732L10 8l4.562 2.634a1 1 0 1 1-1 1.732L9 9.732V15a1 1 0 1 1-2 0V9.732l-4.562 2.634a1 1 0 1 1-1-1.732L6 8 1.438 5.366a1 1 0 0 1 1-1.732L7 6.268V1a1 1 0 0 1 1-1z'/%3E%3C/svg%3E");
+    background-repeat: no-repeat;
+    // Recolor black to $red, see https://codepen.io/sosuke/pen/Pjoqqp
+    filter: invert(35%) sepia(9%) saturate(5669%) hue-rotate(312deg) brightness(102%) contrast(117%);
+    font-weight: bold;
+}
+
 // Make the long dropdowns in the group menu scrollable.
 .group-menu .dropdown-menu {
     height: auto;

ietf/static/js/ipr-search.js

@@ -1,27 +1,37 @@
-$(document).ready(function() {
-    // hack the "All States" check box
-    $("#id_state").addClass("list-inline");
+$(document)
+    .ready(function () {
+        // hack the "All States" check box
+        $("#id_state")
+            .addClass("list-inline");
 
-    $("#id_state input[value!=all]").change(function(e) {
-        if (this.checked) {
-            $("#id_state input[value=all]").prop('checked',false);
-        }
-    });
+        $("#id_state input[value!=all]")
+            .on("change", function (e) {
+                if (this.checked) {
+                    $("#id_state input[value=all]")
+                        .prop('checked', false);
+                }
+            });
 
-    $("#id_state_0").change(function(e) {
-        if (this.checked) {
-            $("#id_state input[value!=all]").prop('checked',false);
-        }
-    });
+        $("#id_state_0")
+            .on("change", function (e) {
+                if (this.checked) {
+                    $("#id_state input[value!=all]")
+                        .prop('checked', false);
+                }
+            });
 
-    // make enter presses submit through the nearby button
-    $("form.ipr-search input,select").keyup(function (e) {
-        var submitButton = $(this).closest(".mb-3").find('button[type=submit]');
-        if (e.which == 13 && submitButton.length > 0) {
-            submitButton.click();
-            return false;
-        } else {
-            return true;
-        }
-    });
-});
+        // make enter presses submit through the nearby button
+        // FIXME: this seems to be broken
+        $("form.ipr-search input,select")
+            .on("keyup", function (e) {
+                var submitButton = $(this)
+                    .closest(".mb-3")
+                    .find('button[type=submit]');
+                if (e.which == 13 && submitButton.length > 0) {
+                    submitButton.trigger("click");
+                    return false;
+                } else {
+                    return true;
+                }
+            });
+    });

ietf/static/js/list.js

@@ -24,7 +24,8 @@ function replace_with_internal(table, internal_table, i) {
 }
 
 function field_magic(i, e, fields) {
-    if (fields[i] == "date" || fields[i] == "num" || fields[i] == "count") {
+    if ($(e)
+        .attr("colspan") === undefined && (fields[i] == "date" || fields[i] == "num" || fields[i] == "count" || fields[i] == "due" || fields[i] == "id")) {
         $(e)
             .addClass("text-end");
     }

ietf/templates/doc/document_charter.html

@@ -245,7 +245,7 @@ <h2 class="my-3">
             </p>
         {% endif %}
         {% if milestones %}
-            {% include "group/milestones.html" %}
+            {% include "group/milestones.html" with heading=True %}
         {% else %}
             <p>
                 No milestones for charter found.

ietf/templates/group/group_about.html

@@ -325,7 +325,7 @@ <h2 class="mt-3">
         {{ group.description|default:"No description yet."| apply_markup:"restructuredtext" }}
     {% endif %}
     {% if group.features.has_milestones %}
-        {% include "group/milestones.html" with milestones=group.milestones %}
+        {% include "group/milestones.html" with milestones=group.milestones heading=True %}
         {% if milestones_in_review %}
             <p>
                 {{ milestones_in_review|length }} new milestone{{ milestones_in_review|pluralize }}