ietf-tools · rjsparks · Mar 21, 2022 · Mar 19, 2022 · Mar 19, 2022 · Mar 19, 2022
diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile
@@ -124,6 +124,12 @@ RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
 # Colorize the bash shell
 RUN sed -i 's/#force_color_prompt=/force_color_prompt=/' /root/.bashrc
 
+# Install the Nu Html Checker (v.Nu)
+ADD https://github.com/validator/validator/releases/download/latest/vnu.linux.zip /
+RUN unzip -d / /vnu.linux.zip
+RUN cp -r /vnu-runtime-image/* /usr/local
+RUN rm -rf /vnu.linux.zip /vnu-runtime-image
+
 ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/
 RUN chmod +rx /usr/local/bin/wait-for
 

diff --git a/ietf/api/templates/api/base.html b/ietf/api/templates/api/base.html
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <style type="text/css">
+        <style>
             p.comment {
                 background-color: #cfc;
                 border: solid black 1px;

diff --git a/ietf/dbtemplate/templates/dbtemplate/template_edit.html b/ietf/dbtemplate/templates/dbtemplate/template_edit.html
@@ -32,7 +32,7 @@ <h2>Meta information</h2>
     </dl>
 
     <h2>Edit template content</h2>
-    <form id="dbtemplate-edit" role="form" method="post">
+    <form id="dbtemplate-edit" method="post">
         {% csrf_token %}
 
         {% bootstrap_form form %}

diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
@@ -197,6 +197,7 @@ def urlize_ietf_docs(string, autoescape=None):
     string = re.sub(r"(STD\s*?)0{0,3}(\d+)", "<a href=\"/doc/std\\2/\">\\1\\2</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(FYI\s*?)0{0,3}(\d+)", "<a href=\"/doc/fyi\\2/\">\\1\\2</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(draft-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
+    string = re.sub(r"(bofreq-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(conflict-review-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(status-change-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(charter-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)

diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
@@ -25,6 +25,7 @@
 from ietf.doc.factories import DocumentFactory
 from ietf.group.factories import RoleFactory, ReviewTeamFactory, GroupFactory
 from ietf.review.factories import ReviewRequestFactory, ReviewerSettingsFactory, ReviewAssignmentFactory
+from django.utils.html import escape
 
 class ReviewTests(TestCase):
     def test_review_requests(self):
@@ -375,8 +376,8 @@ def test_manage_review_requests(self):
         # get
         r = self.client.get(unassigned_url)
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, review_req1.doc.name)
-        self.assertContains(r, doc_author.name)
+        self.assertContains(r, escape(review_req1.doc.name))
+        self.assertContains(r, escape(doc_author.name))
 
         # Test that conflicts are detected
         r = self.client.post(unassigned_url, {

diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
@@ -162,8 +162,8 @@ def test_search(self):
         r = self.client.get(url + "?submit=holder&holder=%s" % ipr.holder_legal_name)
         self.assertContains(r, ipr.title)
 
-        # find by patent infoj
-        r = self.client.get(url + "?submit=patent&patent=%s" % quote(ipr.patent_info))
+        # find by patent info
+        r = self.client.get(url + "?submit=patent&patent=%s" % quote(ipr.patent_info.partition("\n")[0]))
         self.assertContains(r, ipr.title)
 
         r = self.client.get(url + "?submit=patent&patent=US12345")

diff --git a/ietf/liaisons/widgets.py b/ietf/liaisons/widgets.py
@@ -18,21 +18,21 @@ def __init__(self, *args, **kwargs):
         super(ButtonWidget, self).__init__(*args, **kwargs)
 
     def render(self, name, value, **kwargs):
-        html = '<span style="display: none" class="showAttachsOn">%s</span>' % conditional_escape(self.show_on)
-        html += '<span style="display: none" class="attachEnabledLabel">%s</span>' % conditional_escape(self.label)
+        html = '<span style="display: none;" class="showAttachsOn">%s</span>' % conditional_escape(self.show_on)
+        html += '<span style="display: none;" class="attachEnabledLabel">%s</span>' % conditional_escape(self.label)
         if self.require:
             for i in self.require:
-                html += '<span style="display: none" class="attachRequiredField">%s</span>' % conditional_escape(i)
+                html += '<span style="display: none;" class="attachRequiredField">%s</span>' % conditional_escape(i)
             required_str = 'Please fill in %s to attach a new file' % conditional_escape(self.required_label)
-            html += '<span style="display: none" class="attachDisabledLabel">%s</span>' % conditional_escape(required_str)
+            html += '<span style="display: none;" class="attachDisabledLabel">%s</span>' % conditional_escape(required_str)
         html += '<input type="button" class="addAttachmentWidget btn btn-primary btn-sm" value="%s">' % conditional_escape(self.label)
         return mark_safe(html)
 
 
 class ShowAttachmentsWidget(Widget):
     def render(self, name, value, **kwargs):
         html = '<div id="id_%s">' % name
-        html += '<span style="display: none" class="showAttachmentsEmpty form-control widget">No files attached</span>'
+        html += '<span style="display: none;" class="showAttachmentsEmpty form-control widget">No files attached</span>'
         html += '<div class="attachedFiles form-control widget">'
         if value and isinstance(value, QuerySet):
             for attachment in value:

diff --git a/ietf/release/tests.py b/ietf/release/tests.py
@@ -42,5 +42,4 @@ def test_stats(self):
 
         s = q('#frequency-data').text()
         self.assertIn("type: 'column',", s)
-        self.assertIn('"data": [[2007, 7], ', s)
-
+        self.assertIn('"data": [[2007, 7], ', s)
diff --git a/ietf/secr/templates/announcement/main.html b/ietf/secr/templates/announcement/main.html
@@ -11,7 +11,7 @@
     <div class="module">
         <h2>Announcement</h2>
 
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             <table class="new-style full-width amstable" id="announce-table">
                 {% if form.non_field_errors %}{{ form.non_field_errors }}{% endif %}
                 {% for field in form.visible_fields %}

diff --git a/ietf/secr/templates/areas/people.html b/ietf/secr/templates/areas/people.html
@@ -3,7 +3,7 @@
 {% block title %}Areas - People{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'ietf/css/jquery-ui.css' %}" />
+    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}" />
     <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
     <script src="{% static 'secr/js/utils.js' %}"></script>
 {% endblock %}

diff --git a/ietf/secr/templates/areas/view.html b/ietf/secr/templates/areas/view.html
@@ -16,7 +16,7 @@
     <div class="module">
         <h2>Area - View</h2>
         <table class="full-width">
-            <col width="150">
+
             <tr><td>Area Acronym:</td><td>{{ area.acronym }}</td></tr>
             <tr><td>Area Name:</td><td>{{ area.name }}</td></tr>
             <tr><td>Status:</td><td>{{ area.state }}</td></tr>

diff --git a/ietf/secr/templates/base_secr.html b/ietf/secr/templates/base_secr.html
@@ -6,11 +6,13 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <title>{% block title %}{% endblock %}</title>
-        <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
-        <link rel="stylesheet" type="text/css" href="{% static 'secr/css/forms.css' %}" />
-        <link rel="stylesheet" type="text/css" href="{% static 'secr/css/custom.css' %}" />
+        <link rel="stylesheet" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
+        <link rel="stylesheet" href="{% static 'secr/css/forms.css' %}" />
+        <link rel="stylesheet" href="{% static 'secr/css/custom.css' %}" />
+        <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
+
         {% if not server_mode == "production" %}
-            <link rel="stylesheet" type="text/css" href="{% static 'secr/css/test.css' %}" />
+            <link rel="stylesheet" href="{% static 'secr/css/test.css' %}" />
         {% endif %}
         {% block extrastyle %}{% endblock %}
 
@@ -38,12 +40,12 @@
 
                 <!-- Breadcrumbs -->
                 <div class="breadcrumbs">
-                    <table width="100%">
+                    <table>
                         <tr>
-                            <td align="left">
+                            <td class="text-start">
                                 {% block breadcrumbs %}<a href="/secr/">Home</a>{% endblock %}
                             </td>
-                            <td align="right">
+                            <td class="text-end">
                                 {% block instructions %}{% endblock %}
                             </td>
                         </tr>

diff --git a/ietf/secr/templates/base_secr_bootstrap.html b/ietf/secr/templates/base_secr_bootstrap.html
@@ -7,11 +7,11 @@
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <title>{% block title %}{% endblock %}</title>
         <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}"/>
-        <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
-        <link rel="stylesheet" type="text/css" href="{% static 'secr/css/forms.css' %}" />
-        <link rel="stylesheet" type="text/css" href="{% static 'secr/css/custom.css' %}" />
+        <link rel="stylesheet" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
+        <link rel="stylesheet" href="{% static 'secr/css/forms.css' %}" />
+        <link rel="stylesheet" href="{% static 'secr/css/custom.css' %}" />
         {% if not server_mode == "production" %}
-            <link rel="stylesheet" type="text/css" href="{% static 'secr/css/test.css' %}" />
+            <link rel="stylesheet" href="{% static 'secr/css/test.css' %}" />
         {% endif %}
         {% block extrastyle %}{% endblock %}
 
@@ -39,12 +39,12 @@
 
                 <!-- Breadcrumbs -->
                 <div class="breadcrumbs">
-                    <table width="100%">
+                    <table>
                         <tr>
-                            <td align="left">
+                            <td class="text-start">
                                 {% block breadcrumbs %}<a href="/secr/">Home</a>{% endblock %}
                             </td>
-                            <td align="right">
+                            <td class="text-end">
                                 {% block instructions %}{% endblock %}
                             </td>
                         </tr>

diff --git a/ietf/secr/templates/base_site.html b/ietf/secr/templates/base_site.html
@@ -6,12 +6,12 @@
 {% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} IETF Dashboard {% endif %}{% endblock %}
 
 {% block branding %}
-    <table width="100%">
+    <table>
         <tr>
-            <td align="left">
+            <td class="text-start">
                 <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} IETF Dashboard {% endif %}</h1>
             </td>
-            <td align="right">
+            <td class="text-end">
                 <br>
                 <span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a>  | <a rel="nofollow" href="/accounts/logout/">Log out</a></span>
             </td>
@@ -31,7 +31,7 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
 
         </div>
         <div id="footer-logo">
-            <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
+            <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" class="text-end p-3"  /></a>
         </div>
     </div>
 {% endblock %}
diff --git a/ietf/secr/templates/base_site_bootstrap.html b/ietf/secr/templates/base_site_bootstrap.html
@@ -6,12 +6,12 @@
 {% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}{% endblock %}
 
 {% block branding %}
-    <table width="100%">
+    <table>
         <tr>
-            <td align="left">
+            <td class="text-start">
                 <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}</h1>
             </td>
-            <td align="right">
+            <td class="text-end">
                 <br>
                 <span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a>  | <a rel="nofollow" href="/accounts/logout/">Log out</a></span>
             </td>
@@ -31,7 +31,7 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
 
         </div>
         <div id="footer-logo">
-            <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
+            <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" class="text-end p-3"  /></a>
         </div>
     </div>
 {% endblock %}
diff --git a/ietf/secr/templates/confirm_cancel.html b/ietf/secr/templates/confirm_cancel.html
@@ -12,7 +12,7 @@ <h3>Are you sure?</h3>
         <p>You are about to cancel: {{ object }}</p>
         {% if extra %}<p>{{ extra }}</p>{% endif %}
 
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             <div>
                 <p>
                     <input type="hidden" name="post" value="yes">

diff --git a/ietf/secr/templates/confirm_delete.html b/ietf/secr/templates/confirm_delete.html
@@ -12,7 +12,7 @@ <h3>Are you sure?</h3>
         <p>You are about to delete: {{ object }}</p>
         {% if extra %}<p>{{ extra }}</p>{% endif %}
 
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             <div>
                 <p>
                     <input type="hidden" name="post" value="yes">

diff --git a/ietf/secr/templates/groups/people.html b/ietf/secr/templates/groups/people.html
@@ -4,7 +4,7 @@
 {% block title %}Groups - People{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'ietf/css/jquery-ui.css' %}" />
+    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}" />
     <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
     <script src="{% static 'secr/js/utils.js' %}"></script>
 {% endblock %}
@@ -45,7 +45,7 @@ <h2>People</h2>
         <div class="inline-related">
             <!-- <hr><br> -->
             <h3>Add Role</h3>
-            <form id="groups-people" action="" method="post">{% csrf_token %}
+            <form id="groups-people" method="post">{% csrf_token %}
                 {{ form.non_field_errors }}
                 {{ form.group_acronym }}
                 <table class="full-width">

diff --git a/ietf/secr/templates/groups/search.html b/ietf/secr/templates/groups/search.html
@@ -17,7 +17,7 @@
 
     <div class="module group-container">
         <h2>Groups - Search</h2>
-        <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
+        <form enctype="multipart/form-data" method="post">{% csrf_token %}
             <table class="full-width amstable">
                 {{ form.as_table }}
             </table>

diff --git a/ietf/secr/templates/groups/view.html b/ietf/secr/templates/groups/view.html
@@ -18,7 +18,7 @@
         <div id="groups-view-col1">
             <h2>Groups - View</h2>
             <table >
-                <col width="150">
+
                 <tr><td>Group Acronym:</td><td>{{ group.acronym }}</td></tr>
                 <tr><td>Group Name:</td><td>{{ group.name }}</td></tr>
                 <tr><td>Status:</td><td>{{ group.state }}</td></tr>

diff --git a/ietf/secr/templates/includes/sessions_request_form.html b/ietf/secr/templates/includes/sessions_request_form.html
@@ -4,8 +4,8 @@
     {% if form.non_field_errors %}
         {{ form.non_field_errors }}
     {% endif %}
-    <table id="sessions-new-table" cellspacing="1" cellpadding="1" border="0">
-        <col width="150">
+    <table id="sessions-new-table">
+
         <tr class="bg1"><td>Working Group Name:</td><td>{{ group.name }} ({{ group.acronym }})</td></tr>
         <tr class="bg2"><td>Area Name:</td><td>{% if group.parent %}{{ group.parent.name }} ({{ group.parent.acronym }}){% endif %}</td></tr>
         <tr class="bg1"><td>Number of Sessions:<span class="required">*</span></td><td>{{ form.num_session.errors }}{{ form.num_session }}</td></tr>
@@ -37,25 +37,25 @@
                     </tr>
                     {% for cname, cfield, cselector  in form.wg_constraint_fields %}
                         <tr class="bg1">
-                            {% if forloop.first %}<td rowspan="{{ form.wg_constraint_count }}" valign="top" width="220">WG Sessions:<br>You may select multiple WGs within each category</td>{% endif %}
-                            <td width="320">{{ cname|title }}</td>
+                            {% if forloop.first %}<td rowspan="{{ form.wg_constraint_count }}" >WG Sessions:<br>You may select multiple WGs within each category</td>{% endif %}
+                            <td>{{ cname|title }}</td>
                             <td>{{ cselector }}
                                 <input type="button" id="wg_delete_{{ cname.slug }}" value="Delete the last entry" onClick="ietf_sessions.delete_wg_constraint_clicked('{{ cname.slug }}')"><br>
                                 {{ cfield.errors }}{{ cfield }}
                             </td>
                         </tr>
                     {% empty %}{# shown if there are no constraint fields #}
-                        <tr class="bg1"><td width="220"></td><td colspan="2">No constraints are enabled for this meeting.</td></tr>
+                        <tr class="bg1"><td ></td><td colspan="2">No constraints are enabled for this meeting.</td></tr>
                     {% endfor %}
                     {% if form.inactive_wg_constraints %}
                         {% for cname, value, field in form.inactive_wg_constraints %}
                             <tr class="bg1">
                                 {% if forloop.first %}
-                                    <td rowspan="{{ form.inactive_wg_constraint_count }}" valign="top" width="220">
+                                    <td rowspan="{{ form.inactive_wg_constraint_count }}" >
                                         Disabled for this meeting
                                     </td>
                                 {% endif %}
-                                <td width="320">{{ cname|title }}</td>
+                                <td>{{ cname|title }}</td>
                                 <td><input type="text" value="{{ value }}" maxlength="255" class="wg_constraint" disabled><br>{{ field }} {{ field.label }}</td>
                         </tr>
                         {% endfor %}
@@ -76,11 +76,11 @@
                 </td>
             </tr>
             <tr class="bg1">
-                <td valign="top">Times during which this WG can <strong>not</strong> meet:</td>
+                <td>Times during which this WG can <strong>not</strong> meet:</td>
                 <td>{{ form.timeranges.errors }}{{ form.timeranges }}</td>
             </tr>
             <tr class="bg2">
-                <td valign="top">
+                <td>
                     Plan session adjacent with another WG:<br />
                     (Immediately before or after another WG, no break in between, in the same room.)
                 </td>
@@ -106,7 +106,7 @@
         {% endif %}
 
         <tr class="bg2">
-            <td valign="top">Special Requests:<br />&nbsp;<br />i.e. restrictions on meeting times / days, etc.<br />  (limit 200 characters)</td>
+            <td>Special Requests:<br />&nbsp;<br />i.e. restrictions on meeting times / days, etc.<br />  (limit 200 characters)</td>
             <td>{{ form.comments.errors }}{{ form.comments }}</td>
         </tr>
     </table>

diff --git a/ietf/secr/templates/includes/sessions_request_view.html b/ietf/secr/templates/includes/sessions_request_view.html
@@ -1,6 +1,6 @@
 {% load ams_filters %}
 <table class="full-width">
-    <col width="200">
+
     <tr class="row1"><td>Working Group Name:</td><td>{{ group.name }} ({{ group.acronym }})</td></tr>
     <tr class="row2"><td>Area Name:</td><td>{{ group.parent }}</td></tr>
     <tr class="row1"><td>Number of Sessions Requested:</td><td>{% if session.third_session %}3{% else %}{{ session.num_session }}{% endif %}</td></tr>