From 8e11c7cb64fe2cd637b3b7b3d74189562c0d79aa Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 30 Sep 2016 18:47:56 +0000
Subject: [PATCH] Fixed some invalid html, and tweaked the html validation
 settings in the test crawler.  - Legacy-Id: 12066

---
 bin/test-crawl                        | 6 ++++--
 ietf/templates/group/group_about.html | 2 ++
 ietf/templates/release/release.html   | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/test-crawl b/bin/test-crawl
index 59c7e2746..cc993f845 100755
--- a/bin/test-crawl
+++ b/bin/test-crawl
@@ -133,7 +133,7 @@ def check_html_valid(url, response, args):
         key = re.sub("/draft-[a-z0-9-]+/",   "/draft-foo/", key)
         key = re.sub("/group/[a-z0-9-]+/",   "/group/foo/", key)
         key = re.sub("/ipr/search/.*",   "/ipr/search/", key)
-        key = re.sub("/meeting/[0-9]+/agenda/[0-9a-z]+/",   "/meeting/nn/agenda/foo/", key)
+        key = re.sub("/meeting/[-0-9a-z]+/agenda/[0-9a-z]+/",   "/meeting/nn/agenda/foo/", key)
         key = re.sub("/release/[0-9dev.]+/",   "/release/n.n.n/", key)
         key = re.sub("/rfc[0-9]+/",   "/rfcnnnn/", key)
         key = re.sub("/rg/[a-z0-9-]+/",   "/rg/foo/", key)
@@ -248,7 +248,9 @@ for url in initial_urls:
 
 parser = html5lib.HTMLParser(strict=True)
 
-validated_urls = {}
+# initialise validated_urls with some patterns we don't want to check,
+# because they aren't under our control, such as uploaded group agendas.
+validated_urls = {'/meeting/nn/agenda/foo/': True, }
 
 doc_types = [ t.slug for t in DocTypeName.objects.all() ]
 
diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html
index 3061c8e3f..907a0a6a6 100644
--- a/ietf/templates/group/group_about.html
+++ b/ietf/templates/group/group_about.html
@@ -35,6 +35,7 @@
 	{% endif %}
       </tr>
 
+      <tr>
       <td></td> 
       <th>State</th> 
       <td> 
@@ -43,6 +44,7 @@
 	<div class="label label-info">In the process of being closed</div> 
 	{% endif %} 
       </td> 
+      </tr>
 
       {% if group.features.has_chartering_process %}
 	<tr>
diff --git a/ietf/templates/release/release.html b/ietf/templates/release/release.html
index 10fe3100c..40455ecc0 100644
--- a/ietf/templates/release/release.html
+++ b/ietf/templates/release/release.html
@@ -56,14 +56,13 @@
   {% for item in releases %}
       {% ifchanged %}
       </tbody>
-      <thead>
+      <tbody>
+      <tr><td colspan="3"></td></tr>
       <tr class="year-row">
-        <th><h3>{{ item.date|slice:"7:11" }}</h3></tth>
+        <th class="h3">{{ item.date|slice:"7:11" }}</th>
         <th></th>
         <th></th>
       </tr>
-      </thead>
-      <tbody>
       {% endifchanged %}    
       <tr class="version-row">
         <td class="version"><a href="/release/{{item.version}}/">{{ item.version }}</a></td>
@@ -71,6 +70,7 @@
         <td class="release-title">{{ item.title }}</td>       
       </tr>
   {% endfor %}
+    </tbody>
   </table>
 </div>
 {% endblock %}