Many more HTML fixes.

 - Legacy-Id: 19908

Author: larseggert

ietf/doc/tests_bofreq.py

@@ -8,7 +8,7 @@
 from pyquery import PyQuery
 from random import randint
 from tempfile import NamedTemporaryFile
-from html import escape
+from html import escape, unescape
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
@@ -191,7 +191,7 @@ def test_change_editors(self):
             self.client.login(username=username,password=username+'+password')
             r = self.client.get(url)
             self.assertEqual(r.status_code,200)
-            unescaped = unicontent(r).encode('utf-8').decode('unicode-escape')
+            unescaped = unescape(unicontent(r).encode('utf-8').decode('unicode-escape'))
             for editor in previous_editors:
                 self.assertIn(editor.name,unescaped)
             new_editors = set(previous_editors)
@@ -231,9 +231,9 @@ def test_change_responsible(self):
             self.client.login(username=username,password=username+'+password')
             r = self.client.get(url)
             self.assertEqual(r.status_code,200)
-            unescaped = unicontent(r).encode('utf-8').decode('unicode-escape')
+            unescaped = unescape(unicontent(r).encode('utf-8').decode('unicode-escape'))
             for responsible in previous_responsible: 
-                self.assertIn(escape(responsible.name), unescaped)
+                self.assertIn(responsible.name, unescaped)
             new_responsible = set(previous_responsible)
             new_responsible.add(RoleFactory(group__type_id='area',name_id='ad').person)
             postdict = dict(responsible=[str(p.pk) for p in new_responsible])

ietf/liaisons/admin.py

@@ -29,7 +29,7 @@ class LiaisonStatementAdmin(admin.ModelAdmin):
     inlines = [ RelatedLiaisonStatementInline, LiaisonStatementAttachmentInline ]
 
     def related_to(self, obj):
-        return '<br />'.join(['<a href="%s">%s</a>' % (reverse('admin:liaisons_liaisonstatement_change', None, (i.target.id, )), str(i.target)) for i in obj.source_of_set.select_related('target').all()])
+        return '<br>'.join(['<a href="%s">%s</a>' % (reverse('admin:liaisons_liaisonstatement_change', None, (i.target.id, )), str(i.target)) for i in obj.source_of_set.select_related('target').all()])
     related_to.allow_tags = True        # type: ignore # https://github.com/python/mypy/issues/2087
 
 class LiaisonStatementAttachmentAdmin(admin.ModelAdmin):
@@ -50,4 +50,4 @@ class LiaisonStatementEventAdmin(admin.ModelAdmin):
     raw_id_fields = ["statement", "by"]
 
 admin.site.register(LiaisonStatement, LiaisonStatementAdmin)
-admin.site.register(LiaisonStatementEvent, LiaisonStatementEventAdmin)
+admin.site.register(LiaisonStatementEvent, LiaisonStatementEventAdmin)

ietf/liaisons/forms.py

@@ -211,13 +211,13 @@ def prepare_value(self, value):
 
 class LiaisonModelForm(BetterModelForm):
     '''Specify fields which require a custom widget or that are not part of the model.
-    NOTE: from_groups and to_groups are marked as not required because select2 has
-    a problem with validating
     '''
     from_groups = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),label='Groups',required=False)
+    from_groups.widget.attrs["class"] = "select2-field"
     from_contact = forms.EmailField()   # type: Union[forms.EmailField, SearchableEmailField]
     to_contacts = forms.CharField(label="Contacts", widget=forms.Textarea(attrs={'rows':'3', }), strip=False)
     to_groups = forms.ModelMultipleChoiceField(queryset=Group.objects,label='Groups',required=False)
+    to_groups.widget.attrs["class"] = "select2-field"
     deadline = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Deadline', required=True)
     related_to = SearchableLiaisonStatementsField(label='Related Liaison Statement', required=False)
     submitted_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Submission date', required=True, initial=datetime.date.today())
@@ -247,8 +247,8 @@ def __init__(self, user, *args, **kwargs):
         self.person = get_person_for_user(user)
         self.is_new = not self.instance.pk
 
-        self.fields["from_groups"].widget.attrs["placeholder"] = "Type in name to search for group"
-        self.fields["to_groups"].widget.attrs["placeholder"] = "Type in name to search for group"
+        self.fields["from_groups"].widget.attrs["data-placeholder"] = "Type in name to search for group"
+        self.fields["to_groups"].widget.attrs["data-placeholder"] = "Type in name to search for group"
         self.fields["to_contacts"].label = 'Contacts'
         self.fields["other_identifiers"].widget.attrs["rows"] = 2
 
@@ -449,7 +449,7 @@ def set_from_fields(self):
         else:
             queryset = Group.objects.filter(type="sdo", state="active", role__person=self.person, role__name__in=("liaiman", "auth")).distinct().order_by('name')
             self.fields['from_contact'].initial = self.person.role_set.filter(group=queryset[0]).first().email.address
-            self.fields['from_contact'].widget.attrs['readonly'] = True
+            self.fields['from_contact'].widget.attrs['disabled'] = True
         self.fields['from_groups'].queryset = queryset
         self.fields['from_groups'].widget.submitter = str(self.person)
 
@@ -504,7 +504,7 @@ def set_from_fields(self):
         else:
             email = self.person.email_address()
         self.fields['from_contact'].initial = email
-        self.fields['from_contact'].widget.attrs['readonly'] = True
+        self.fields['from_contact'].widget.attrs['disabled'] = True
 
     def set_to_fields(self):
         '''Set to_groups and to_contacts options and initial value based on user
@@ -551,7 +551,7 @@ def set_from_fields(self):
                 queryset = Group.objects.filter(type="sdo").order_by('name')
             else:
                 queryset = Group.objects.filter(type="sdo", role__person=self.person, role__name__in=("liaiman", "auth")).distinct().order_by('name')
-                self.fields['from_contact'].widget.attrs['readonly'] = True
+                self.fields['from_contact'].widget.attrs['disabled'] = True
             self.fields['from_groups'].queryset = queryset
 
     def set_to_fields(self):
@@ -571,5 +571,4 @@ def set_to_fields(self):
 
 
 class EditAttachmentForm(forms.Form):
-    title = forms.CharField(max_length=255)
-
+    title = forms.CharField(max_length=255)

ietf/liaisons/widgets.py

@@ -25,7 +25,7 @@ def render(self, name, value, **kwargs):
                 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 += '<input type="button" class="addAttachmentWidget btn btn-primary btn-sm" value="%s" />' % conditional_escape(self.label)
+        html += '<input type="button" class="addAttachmentWidget btn btn-primary btn-sm" value="%s">' % conditional_escape(self.label)
         return mark_safe(html)
 
 
@@ -39,8 +39,8 @@ def render(self, name, value, **kwargs):
                 html += '<a class="initialAttach" href="%s">%s</a>&nbsp' % (conditional_escape(attachment.document.get_href()), conditional_escape(attachment.document.title))
                 html += '<a class="btn btn-primary btn-sm" href="{}">Edit</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk}))
                 html += '<a class="btn btn-primary btn-sm" href="{}">Delete</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_delete_attachment", kwargs={'object_id':attachment.statement.pk,'attach_id':attachment.pk}))
-                html += '<br />'
+                html += '<br>'
         else:
             html += 'No files attached'
         html += '</div></div>'
-        return mark_safe(html)
+        return mark_safe(html)

ietf/meeting/tests_views.py

@@ -3941,7 +3941,7 @@ def test_diff_schedules(self):
         self.assertTrue(r.status_code, 200)
 
         q = PyQuery(r.content)
-        self.assertEqual(len(q(".schedule-diffs tr")), 3)
+        self.assertEqual(len(q(".schedule-diffs tr")), 3+1)
 
     def test_delete_schedule(self):
         url = urlreverse('ietf.meeting.views.delete_schedule',
@@ -5758,14 +5758,14 @@ def test_propose_session_slides(self):
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code,200)
             q = PyQuery(r.content)
-            self.assertFalse(q('#uploadslides'))
-            self.assertFalse(q('#proposeslides'))
+            self.assertFalse(q('.uploadslides'))
+            self.assertFalse(q('.proposeslides'))
 
             self.client.login(username=newperson.user.username,password=newperson.user.username+"+password")
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code,200)
             q = PyQuery(r.content)
-            self.assertTrue(q('#proposeslides'))
+            self.assertTrue(q('.proposeslides'))
             self.client.logout()
 
             login_testing_unauthorized(self,newperson.user.username,propose_url)
@@ -5783,7 +5783,7 @@ def test_propose_session_slides(self):
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertEqual(len(q('#proposedslidelist p')), 1)
+            self.assertEqual(len(q('.proposedslidelist p')), 1)
 
             SlideSubmissionFactory(session = session)
 
@@ -5792,7 +5792,7 @@ def test_propose_session_slides(self):
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertEqual(len(q('#proposedslidelist p')), 2)
+            self.assertEqual(len(q('.proposedslidelist p')), 2)
             self.client.logout()
 
     def test_disapprove_proposed_slides(self):

ietf/person/tests.py

@@ -92,7 +92,7 @@ def test_person_profile(self):
         #debug.show('person.photo_name()')
         self.assertContains(r, person.photo_name(), status_code=200)
         q = PyQuery(r.content)
-        self.assertIn("Photo of %s"%person, q("div.bio-text img").attr("alt"))
+        self.assertIn("Photo of %s"%person.name, q("div.bio-text img").attr("alt"))
 
         bio_text  = q("div.bio-text").text()
         self.assertIsNotNone(bio_text)

ietf/secr/announcement/forms.py

@@ -73,7 +73,7 @@ def get_to_choices():
 
 class AnnounceForm(forms.ModelForm):
     nomcom = forms.ModelChoiceField(queryset=Group.objects.filter(acronym__startswith='nomcom',type='nomcom',state='active'),required=False)
-    to_custom = MultiEmailField(required=False,label='')
+    to_custom = MultiEmailField(required=False)
 
     class Meta:
         model = Message
@@ -131,4 +131,4 @@ def save(self, *args, **kwargs):
         if nomcom:
             message.related_groups.add(nomcom)
 
-        return message
+        return message

ietf/secr/templates/base_site.html

@@ -24,9 +24,7 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
 {% block footer %}
     <div id="footer">
         <div id="footer-extras">
-            <ul>
-                {% block footer-extras %}{% endblock %}
-            </ul>
+            {% block footer-extras %}{% endblock %}
         </div>
         <div id="footer-version">
             <p>IETF Secretariat Tools v. {{ secr_version_num }}</p>
@@ -36,4 +34,4 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
             <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
         </div>
     </div>
-{% endblock %}
+{% endblock %}

ietf/secr/templates/base_site_bootstrap.html

@@ -24,9 +24,7 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
 {% block footer %}
     <div id="footer">
         <div id="footer-extras">
-            <ul>
-                {% block footer-extras %}{% endblock %}
-            </ul>
+            {% block footer-extras %}{% endblock %}
         </div>
         <div id="footer-version">
             <p>IETF Secretariat Tools v. {{ secr_version_num }}</p>
@@ -36,4 +34,4 @@ <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {%
             <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
         </div>
     </div>
-{% endblock %}
+{% endblock %}

ietf/secr/templates/groups/people.html

@@ -28,16 +28,18 @@ <h2>People</h2>
                     <th>Action</th>
                 </tr>
             </thead>
-            <tbody>
-                {% for role in group.role_set.all %}
-                    <tr class="{% cycle 'row1' 'row2' %}">
-                        <td>{{ role.name }}</td>
-                        <td>{{ role.person }}</td>
-                        <td>{{ role.email }}</td>
-                        <td><a href="{% url 'ietf.secr.groups.views.delete_role' acronym=group.acronym id=role.id %}">Delete</a></td>
-                    </tr>
-                {% endfor %}
-            </tbody>
+            {% if group.role_set.all %}
+                <tbody>
+                    {% for role in group.role_set.all %}
+                        <tr class="{% cycle 'row1' 'row2' %}">
+                            <td>{{ role.name }}</td>
+                            <td>{{ role.person }}</td>
+                            <td>{{ role.email }}</td>
+                            <td><a href="{% url 'ietf.secr.groups.views.delete_role' acronym=group.acronym id=role.id %}">Delete</a></td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
 
         <div class="inline-related">
@@ -65,4 +67,4 @@ <h3>Add Role</h3>
 
     </div> <!-- module -->
 
-{% endblock %}
+{% endblock %}