More fixes.

 - Legacy-Id: 19836

Author: larseggert

ietf/doc/tests.py

@@ -250,7 +250,7 @@ def test_docs_for_ad(self):
         r = self.client.get(urlreverse('ietf.doc.views_search.docs_for_ad', kwargs=dict(name=ad.full_name_as_key())))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
-        self.assertContains(r, escape(draft.action_holders.first().plain_name()))
+        self.assertContains(r, escape(draft.action_holders.first().name))
         self.assertContains(r, rfc.canonical_name())
         self.assertContains(r, conflrev.name)
         self.assertContains(r, statchg.name)
@@ -1237,19 +1237,19 @@ def test_edit_authors_edit_fields(self):
     def _pyquery_select_action_holder_string(q, s):
         """Helper to use PyQuery to find an action holder in the draft HTML"""
         # selector grabs the action holders heading and finds siblings with a div containing the search string
-        return q('th:contains("Action Holders") ~ td>div:contains("%s")' % s)
+        return q('th:contains("Action Holder") ~ td>div:contains("%s")' % s)
 
     @mock.patch.object(Document, 'action_holders_enabled', return_value=False, new_callable=mock.PropertyMock)
     def test_document_draft_hides_action_holders(self, mock_method):
         """Draft should not show action holders when appropriate"""
         draft = WgDraftFactory()
         url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))
         r = self.client.get(url)
-        self.assertNotContains(r, 'Action Holders')  # should not show action holders...
+        self.assertNotContains(r, 'Action Holder')  # should not show action holders...
 
         draft.action_holders.set([PersonFactory()])
         r = self.client.get(url)
-        self.assertNotContains(r, 'Action Holders')  # ...even if they are assigned
+        self.assertNotContains(r, 'Action Holder')  # ...even if they are assigned
 
     @mock.patch.object(Document, 'action_holders_enabled', return_value=True, new_callable=mock.PropertyMock)
     def test_document_draft_shows_action_holders(self, mock_method):
@@ -1259,7 +1259,7 @@ def test_document_draft_shows_action_holders(self, mock_method):
 
         # No action holders case should be shown properly
         r = self.client.get(url)
-        self.assertContains(r, 'Action Holders')  # should show action holders
+        self.assertContains(r, 'Action Holder')  # should show action holders
         q = PyQuery(r.content)
         self.assertEqual(len(self._pyquery_select_action_holder_string(q, '(None)')), 1)
 
@@ -1274,7 +1274,7 @@ def test_document_draft_shows_action_holders(self, mock_method):
         with self.settings(DOC_ACTION_HOLDER_AGE_LIMIT_DAYS=20):
             r = self.client.get(url)
 
-        self.assertContains(r, 'Action Holders')  # should still be shown
+        self.assertContains(r, 'Action Holder')  # should still be shown
         q = PyQuery(r.content)
         self.assertEqual(len(self._pyquery_select_action_holder_string(q, '(None)')), 0)
         for person in draft.action_holders.all():
@@ -1299,7 +1299,7 @@ def _run_test(username=None, expect_buttons=False):
             q = PyQuery(r.content)
 
             self.assertEqual(
-                len(q('th:contains("Action Holders") ~ td a[href="%s"]' % edit_ah_url)),
+                len(q('th:contains("Action Holder") ~ td a[href="%s"]' % edit_ah_url)),
                 1 if expect_buttons else 0,
                 '%s should%s see the edit action holders button but %s' % (
                     username if username else 'unauthenticated user',
@@ -1308,7 +1308,7 @@ def _run_test(username=None, expect_buttons=False):
                 )
             )
             self.assertEqual(
-                len(q('th:contains("Action Holders") ~ td a[href="%s"]' % remind_ah_url)),
+                len(q('th:contains("Action Holder") ~ td a[href="%s"]' % remind_ah_url)),
                 1 if expect_buttons else 0,
                 '%s should%s see the remind action holders button but %s' % (
                     username if username else 'unauthenticated user',

ietf/secr/templates/areas/people.html

@@ -23,7 +23,7 @@ <h2>Area Directors ({{ area.acronym }})</h2>
                 <form action="modify/" method="post">{% csrf_token %}
                     <input type="hidden" name="tag" value="{{ director.person.id }}" />
                     <tr>
-                        <td id="id-ad-name"><a href="">{{ director.person.name }}</a></td>
+                        <td id="id-ad-name"><a href="#">{{ director.person.name }}</a></td>
                         <td>{% if director.name.slug == "ad" %}
                             Voting Enabled
                         {% else %}
@@ -56,4 +56,4 @@ <h3><b>Add new Director</b></h3>
             </div> <!-- button-group -->
         </div> <!-- module -->
 
-{% endblock %}
+{% endblock %}

ietf/secr/templates/roles/main.html

@@ -34,7 +34,7 @@
     » Roles
 {% endblock %}
 {% block instructions %}
-    <a href="" target="_blank">Instructions</a>
+    <a href="#" target="_blank">Instructions</a>
 {% endblock %}
 
 {% block content %}
@@ -84,5 +84,4 @@ <h3>Add Role</h3>
 
     </div> <!-- module -->
 
-{% endblock %}
-
+{% endblock %}

ietf/static/css/ietf.scss

@@ -161,7 +161,7 @@ $timeline-even-hover-color: shift-color($timeline-even-color, $link-shade-percen
 // Styles needed for the ballot table
 
 .ballot-icon table td {
-    border: $table-border-width solid $table-border-color;
+    border: $table-border-width solid $gray-500;
     height: 1em;
     width: .8em;
 }

ietf/static/js/ietf.js

@@ -116,7 +116,7 @@ $(document)
             .shift()
             .trim();
 
-        if ($(contents)
+        if (contents
             .length > 0 && $(headings)
             .last()
             .offset()
@@ -245,9 +245,18 @@ $(document)
         $('.modal')
             .on('show.bs.modal', function (e) {
                 var button = $(e.relatedTarget);
+                if (!$(button)
+                    .attr("href")) {
+                    return;
+                }
+                var loc = $(button)
+                    .attr("href")
+                    .trim();
                 // load content from value of button href
-                $(this)
-                    .find('.modal-content')
-                    .load(button.attr("href"));
+                if (loc !== undefined && loc !== "#") {
+                    $(this)
+                        .find('.modal-content')
+                        .load(loc);
+                }
             });
     });

ietf/static/js/liaisons.js

@@ -69,8 +69,8 @@ var attachmentWidget = {
             html += '</span>';
             container.hide();
         });
-        //html += ' <a href="" class="removeAttach glyphicon glyphicon-remove text-danger"></a>';
-        html += ' <a href="" class="removeAttach btn btn-default btn-xs">Delete</a>';
+        //html += ' <a href="#" class="removeAttach glyphicon glyphicon-remove text-danger"></a>';
+        html += ' <a href="#" class="removeAttach btn btn-default btn-xs">Delete</a>';
         html += '</div>';
         attachmentWidget.config.showOnDisplay.html(html);
         attachmentWidget.count += 1;

ietf/static/js/list.js

@@ -49,7 +49,7 @@ $(document)
 
                 // get field classes from first thead row
                 var fields = $(header_row)
-                    .find("*")
+                    .find("th, td")
                     .map(function () {
                         return $(this)
                             .attr("data-sort") ? $(this)

ietf/submit/checkers.py

@@ -120,7 +120,7 @@ def check_file_txt(self, path):
 class DraftYangChecker(object):
 
     name = "yang validation"
-    symbol = '<span class="large">\u262f</span>'
+    symbol = '<i class="bi bi-yin-yang"></i>'
 
     def check_file_txt(self, path):
         name = os.path.basename(path)
@@ -293,5 +293,4 @@ def check_file_txt(self, path):
         items  = [ e for res in results for e in res["items"] ]
         info['items'] = items
         info['code']['yang'] = model_list
-        return passed, message, errors, warnings, info
-
+        return passed, message, errors, warnings, info

ietf/templates/base.html

@@ -111,7 +111,7 @@
                     <a href="https://www.rfc-editor.org/" class="p-3">RFC&nbsp;Editor</a>
                     <a href="https://www.iana.org/" class="p-3">IANA</a>
                     <a href="https://www.ietf.org/privacy-statement/" class="p-3">Privacy&nbsp;Statement</a>
-                    <p class="small text-muted p-3">
+                    <div class="small text-muted p-3">
                         {% if version_num %}
                             <a href="/release/about">About</a>
                             IETF Datatracker
@@ -134,10 +134,10 @@
                         {% if django_version %}Django {{ django_version }}{% endif %}
                         <br>
                         {% include "debug.html" %}
-                    </p>
+                    </div>
                 </footer>
             {% endblock %}
         </div>
         {% block js %}{% endblock %}
     </body>
-</html>
+</html>

ietf/templates/debug.html

@@ -2,11 +2,6 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load static %}
-{% block pagehead %}
-    {% if debug %}
-        <link rel="stylesheet" href="{% static 'ietf/css/list.css' %}"/>
-    {% endif %}
-{% endblock %}
 {% origin %}
 {% if debug %}
     {% if sql_debug %}
@@ -17,7 +12,7 @@
                onclick="$('#debug-query-table').toggleClass('visually-hidden');">Show</a>
         {% endif %}
         <div id="debug-query-table" class="visually-hidden">
-            <small class="text-start">
+            <div class="text-start">
                 <table class="table table-sm tablesorter">
                     <thead>
                         <tr>
@@ -106,16 +101,11 @@ <h4 class="modal-title" id="modal-title-{{ forloop.counter }}">QuerySet Origin f
                         {% endwith %}
                     </tbody>
                 </table>
-            </small>
+            </div>
         </div>
     {% else %}
         <small class='text-center text-muted'>
             Add <code>ietf.context_processors.sql_debug</code> to <code>settings.DEV_TEMPLATE_CONTEXT_PROCESSORS</code> to turn on the SQL statement table.
         </small>
     {% endif %}
-{% endif %}
-{% block js %}
-    {% if debug %}
-        <script src="{% static 'ietf/js/list.js' %}"></script>
-    {% endif %}
-{% endblock %}
+{% endif %}