Fix line breaks in IESG telechat moderator package

pasieronen · pasieronen · commit ecc6cb9082e2 · 2009-12-02T07:58:52.000Z
- Legacy-Id: 1885
diff --git a/ietf/idtracker/templatetags/ietf_filters.py b/ietf/idtracker/templatetags/ietf_filters.py
@@ -304,6 +304,19 @@ def remove_empty_lines(text):
     text = re.sub("( *\n){2,}", "\n", text)
     return text
 
+@register.filter(name='linebreaks_crlf')
+def linebreaks_crlf(text):
+    """
+    Normalize all linebreaks to CRLF.
+    """
+    # First, map CRLF to LF
+    text = text.replace("\r\n", "\n")
+    # Next, map lone CRs to LFs
+    text = text.replace("\r", "\n")
+    # Finally, map LFs to CRLFs
+    text = text.replace("\n", "\r\n")
+    return text
+
 @register.filter(name='greater_than')
 def greater_than(x, y):
     return x > int(y)
diff --git a/ietf/templates/iesg/moderator_doc.html b/ietf/templates/iesg/moderator_doc.html
@@ -38,19 +38,20 @@
 {% for doc in section_docs %}
 <h3>{{ title1 }}<br>
 {{ title2 }}<br>
-{{ title3 }} ({{ forloop.counter }} of {{ section_docs|length }})</h3>
+{{ title3 }} ({{ forloop.counter }} of {{ section_docs|length }})</h3>
 
 <p><b>{{doc.obj.document.filename}}{% if not doc.obj.rfc_flag %}-{{doc.obj.document.revision}}{% endif %}</b><br>
 <i>({{ doc.obj.document.title|escape }})</i><br>
 <b>Intended Status: {{ doc.obj.document.intended_status }}<br>
 Token: {{ doc.obj.token_name|escape }}</b></p>
 
-<small><pre>{% if doc.obj.ballot.active %}
+
+<small>{% filter linebreaks_crlf %}<pre>{% if doc.obj.ballot.active %}
                       Yes  No-Objection  Discuss  Abstain
 {% if not doc.obj.ballot.an_sent %}{% for curpos in doc.obj.ballot.active_positions %}{{ curpos.ad|ljust:"20" }} {{ curpos.pos.yes|bracket }}     {{ curpos.pos.noobj|bracket }}     {{ curpos.pos.discuss|bracket }}     {{ curpos.pos.abstain_ind|bracket }}
 {% endfor %}
 {% endif %}{% for position in doc.obj.ballot.positions.all|dictsort:"ad.last_name" %}{% if doc.obj.ballot.an_sent or not position.ad.is_current_ad %}{{ position.ad|ljust:"20" }} {{ position.yes|bracket }}     {{ position.noobj|bracket }}     {{ position.discuss|bracket }}     {{ position.abstain_ind|bracket }}
-{% endif %}{% endfor %}{% else %}(Ballot not issued){% endif %}</pre></small>
+{% endif %}{% endfor %}{% else %}(Ballot not issued){% endif %}</pre><{% endfilter %}/small>
 
 {% if doc.obj.document.lc_expiration_date and doc.obj.document.lc_expiration_date|timesince_days|less_than:"1" %}<p><b>NOTE: Last Call expires on {{ doc.obj.document.lc_expiration_date }}.</b></p>{% endif %}
 
diff --git a/ietf/templates/iesg/moderator_package.html b/ietf/templates/iesg/moderator_package.html
@@ -33,6 +33,7 @@
 {% endcomment %}{% comment %}
 Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
 {% endcomment %}<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+{% load ietf_filters %}
 <html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style type="text/css">
@@ -77,9 +78,9 @@ <h3>1. Administrivia<br>1.3 Approval of the Minutes of Past Telechats</h3>
 
 <h3>1. Administrivia<br>1.4 List of Remaining Action Items from Last Telehat</h3>
 
-<pre>
+{% filter linebreaks_crlf %}<pre>
 {{ action_items }}
-</pre>
+</pre>{% endfilter %}
 
 <!-- ===================================================================== -->
 <!-- SECTIONS 2+3 -->
@@ -133,9 +134,9 @@ <h3>6. Management Items<br>
 
 <h3>7. Working Group News</h3>
 
-<pre>
+{% filter linebreaks_crlf %}<pre>
 {% for name in ad_names %}[ ] {{ name }}
 {% endfor %}
-</pre>
+</pre>{% endfilter %}
 
 </body></html>
