More HTML validation fixes

- Legacy-Id: 2204

ietf/idrfc/markup_txt.py

@@ -58,7 +58,8 @@ def markup(content):
 
     content = re.sub("\n(.+\[Page \d+\])\n\f\n(.+)\n", """\n<span class="m_ftr">\g<1></span>\n<span class="m_hdr">\g<2></span>\n""", content)
     content = re.sub("\n(.+\[Page \d+\])\n\s*$", """\n<span class="m_ftr">\g<1></span>\n""", content)
-    # TODO: remove remaining FFs (to be valid XHTML)
+    # remove remaining FFs (to be valid XHTML)
+    content = content.replace("\f","\n")
 
     content = re.sub("\n\n([0-9]+\\.|[A-Z]\\.[0-9]|Appendix|Status of|Abstract|Table of|Full Copyright|Copyright|Intellectual Property|Acknowled|Author|Index)(.*)(?=\n\n)", """\n\n<span class="m_h">\g<1>\g<2></span>""", content)
 

ietf/templates/ipr/details.html

@@ -213,7 +213,7 @@ Template for {{ section_list.disclosure_type }}" where the submitter provided
 		     <td colspan="2">
 			C. Does this disclosure apply to all IPR owned by
 			the submitter?:
-			<span class="iprdata">>{{ ipr.applies_to_all }}</span>
+			<span class="iprdata">{{ ipr.applies_to_all }}</span>
 		     </td>
 		  </tr>
 	       {% else %}
@@ -230,7 +230,7 @@ Template for {{ section_list.disclosure_type }}" where the submitter provided
 		  {% if ipr.document_sections %}
 		  <tr class="{% cycle row_parity %}"><td class="iprlabel"></td><td class="iprdata">{{ ipr.document_sections|escape|linebreaks }}</td></tr>
 		  {% else %}
-		  <tr class="{% cycle row_parity %}"><td class="iprlabel"></td><td></span><i>No information submitted</i></td></tr>
+		  <tr class="{% cycle row_parity %}"><td class="iprlabel"></td><td><i>No information submitted</i></td></tr>
 		  {% endif %}
 	       {% endif %}
 	    </tbody>
@@ -316,7 +316,7 @@ Template for {{ section_list.disclosure_type }}" where the submitter provided
 	       <td colspan="2">
 		  <span class="iprdata">Note: The individual submitting this template represents and warrants
 		  that he or she is authorized by the Patent Holder to agree to the
-		  above-selected licensing declaration.</span>>
+		  above-selected licensing declaration.</span>
 	       </td>
 	    </tr>
 	 </table>

ietf/templates/meeting/list.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html" %}{% load ietf_filters %}
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% block title %}IETF {{ meeting_num }} Preliminary & Interim Materials{% endblock %}
 {% block morecss %}
@@ -43,7 +43,7 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
 <tr>
 <td style="width:12em;"><a name="wg-{{ wg.acronym }}"></a><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
 {% for slide in wg.slides %}
-<a href="http://www.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name|escape }}</a><br/>
+<a href="http://www.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name|clean_whitespace }}</a><br/>
 {% endfor %}
 </td></tr></table>
 {% endfor %}  

ietf/templates/meeting/list_group.html

@@ -1,4 +1,4 @@
-<table class="ietf-materials">
+{% load ietf_filters %}<table class="ietf-materials">
 <tr>
 <td style="width:12em;"><a name="wg-{{ wg.acronym }}"></a><b>{% ifequal wg.acronym "plenaryw" %}Wednesday<br/>Plenary{%else%}{% ifequal wg.acronym "plenaryt" %}Thursday<br/>Plenary{%else%}{{ wg.acronym|upper }}{%endifequal%}{%endifequal%}
 {% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
@@ -7,7 +7,7 @@
 {% if wg.agenda_file %}<a href="http://www.ietf.org/proceedings/{{ wg.agenda_file }}">Agenda</a>{% else %}<span style="background:#ff8888;padding:0 2px;">No agenda received</span> {% endif %}<br/>
 {% if wg.minute_file %} <a href="http://www.ietf.org/proceedings/{{ wg.minute_file }}">Minutes</a>{% else %}No minutes received{% endif %}<br/>
 {% for slide in wg.slides %}
-<a href="http://www.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name|escape }}</a><br/>
+<a href="http://www.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name|clean_whitespace }}</a><br/>
 {% endfor %}
 </td></tr>
 </table>