Merged in [9766] from lars@netapp.com:

    More HTML fixes.
 - Legacy-Id: 9787
Note: SVN reference [9766] has been migrated to Git commit 77f555b

Author: levkowetz

ietf/submit/templatetags/submit_tags.py

@@ -30,13 +30,7 @@ def two_pages_decorated_with_errors(submission, errors):
         return mark_safe('<pre>%s</pre>' % escape(pages))
     result = '<pre>\n'
     for line in pages.split('\n'):
-        if line.find('%s-%s' % (submission.name, submission.rev)) > -1:
-            result += '<div class="bg-danger"><b>'
-            result += escape(line)
-            result += '\n'
-            result += '</b></div>\n'
-        else:
-            result += escape(line)
-            result += '\n'
+        result += escape(line)
+        result += '\n'
     result += '</pre>pre>\n'
     return mark_safe(result)

ietf/templates/admin/group/group/send_sdo_reminder.html

@@ -38,7 +38,7 @@ <h1>Send a reminder to {% if sdo %}{{ sdo }} SDO Liaison Manager{% else %}all SD
         <p>By clicking the 'Send' button you will send a request to <b>all</b> the SDO Liaison Managers. In order to send the request to one SDO Liaison Manager go to the SDO edit page.</p>
       {% endif %}
 
-      <form action="" method="post">{% csrf_token %}
+      <form method="post">{% csrf_token %}
         <input type="submit" name="send" value="Send reminder" />
       </form>
     {% endif %}

ietf/templates/bootstrap3/field_help_text_and_errors.html

@@ -1,2 +1 @@
-<div>{% for item in help_text_and_errors %} {{ item }}<br/> {% endfor %}</div>
-
+{% for item in help_text_and_errors %} {{ item }}<br> {% endfor %}

ietf/templates/doc/ballot/edit_position.html

@@ -26,9 +26,9 @@ <h1>Change position for {{ ad.plain_name }}<br><small>{{ doc }}</small></h1>
       {% if field.name == "discuss" %}<div id="div_id_discuss">{% endif %}
       {% bootstrap_field field %}
       {% if field.name == "discuss" and old_pos and old_pos.discuss_time %}
-        <span class="help-block">Last edited {{ old_pos.discuss_time }}</span>
+        <div class="help-block">Last edited {{ old_pos.discuss_time }}</div>
       {% elif field.name == "comment" and old_pos and old_pos.comment_time %}
-        <span class="help-block">Last edited {{ old_pos.comment_time }}</span>
+        <div class="help-block">Last edited {{ old_pos.comment_time }}</div>
       {% endif %}
       {% if field.name == "discuss" %}</div>{% endif %}
     {% endfor %}
@@ -60,7 +60,7 @@ <h1>Change position for {{ ad.plain_name }}<br><small>{{ doc }}</small></h1>
             $("#div_id_discuss").hide();
         }
     }
-   
+
    $("input[name=position]").click(function () {
        discussToggle($(this).val());
    });

ietf/templates/doc/ballot/lastcalltext.html

@@ -18,9 +18,9 @@ <h1>Last call text<br><small>{{ doc }}</small></h1>
     {% bootstrap_form last_call_form %}
 
     {% if can_request_last_call and need_intended_status %}
-      <span class="help-block">
+      <div class="help-block">
         You need to select intended status of {{ need_intended_status }} and regenerate last call text to request last call.
-      </span>
+      </div>
     {% endif %}
 
     {% buttons %}

ietf/templates/doc/ballot/send_ballot_comment.html

@@ -28,7 +28,7 @@ <h1>Send ballot position for {{ ad }}</h1>
     <div class="form-group">
       <label>Cc</label>
       <input class="form-control" type="email" name="cc">
-      <span class="help-block">Separate email addresses with commas.</span>
+      <div class="help-block">Separate email addresses with commas.</div>
     </div>
 
     {% if doc.notify %}

ietf/templates/doc/ballot/writeupnotes.html

@@ -17,9 +17,9 @@ <h1>Ballot writeup and notes<br><small>{{ doc }}</small></h1>
     {% csrf_token %}
     {% bootstrap_form ballot_writeup_form %}
 
-    <span class="help-block">
+    <div class="help-block">
       Technical summary, Working Group summary, document quality, personnel, RFC Editor note, IRTF note, IESG note, IANA note. This text will be appended to all announcements and messages to the IRTF or RFC Editor.
-    </span>
+    </div>
 
     {% buttons %}
       <button type="submit" class="btn btn-primary" name="save_ballot_writeup" value="Save Ballot Writeup">Save</button>

ietf/templates/doc/charter/ballot_writeupnotes.html

@@ -17,9 +17,9 @@ <h1>Ballot writeup and notes<br><small>{{ charter.chartered_group }}</small></h1
     {% csrf_token %}
     {% bootstrap_form ballot_writeup_form %}
 
-    <span class="help-block">
+    <div class="help-block">
       Working group summary, personnel, IAB note, IESG note, IANA note.
-    </span>
+    </div>
 
     {% buttons %}
       <button type="submit" class="btn btn-primary" name="save_ballot_writeup" value="Save Ballot Writeup">Save</button>

ietf/templates/doc/charter/change_state.html

@@ -50,7 +50,7 @@ <h1>{{ title }}</h1>
     <h3>Or revert to previous state</h3>
 
     <div class="prev-state">
-      <form action="" method="post">{% csrf_token %}
+      <form method="post">{% csrf_token %}
         <input type="hidden" name="charter_state" value="{{ prev_charter_state.pk }}" />
         <input type="hidden" name="state" value="{{ prev_state.slug }}" />
         <input type="submit" value="Back to {{ prev_charter_state.name }}" />

ietf/templates/doc/document_ballot_content.html

@@ -6,16 +6,7 @@
       <h4><span class="label label-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
       {% for p in positions|dictsort:"ad.last_name" %}
         <div>
-          {% if p.old_ad %}<span class="text-muted">({% endif %}
-	    {% if p.comment or p.discuss %}
-	      <a href="#{{ p.ad.plain_name|slugify }}">
-	    {% endif %}
-	    {{ p.ad.plain_name }}
-	    {% if p.comment or p.discuss %}
-	      </a>
-	    {% endif %}
-	    {% if user|has_role:"Secretariat" %}</a>{% endif %}
-            {% if p.old_ad %})</span>{% endif %}
+          {% if p.old_ad %}<span class="text-muted">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ p.ad.plain_name|slugify }}">{% endif %}{{ p.ad.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.old_ad %})</span>{% endif %}
         </div>
       {% empty %}
         (None)
@@ -77,9 +68,7 @@ <h4><span class="label label-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
     {% for n, positions in position_groups %}
       {% for p in positions|dictsort:"ad.last_name" %}
         <h4 class="anchor-target" id="{{ p.ad.plain_name|slugify }}">
-          {% if p.old_ad %}<span class="text-muted">({% endif %}
-            {{ p.ad.plain_name }}
-            {% if p.old_ad %})</span>{% endif %}
+          {% if p.old_ad %}<span class="text-muted">({% endif %}{{ p.ad.plain_name }}{% if p.old_ad %})</span>{% endif %}
             <span class="pull-right">
               {% if p.old_positions %}
                 <span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>