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

    Fix more HTML bugs.
 - Legacy-Id: 9777
Note: SVN reference [9738] has been migrated to Git commit cbf4cc7

Author: levkowetz

ietf/templates/doc/document_charter.html

@@ -28,11 +28,9 @@
     </thead>
 
     <tbody>
-      <tr>
-	 <th rowspan="{{table_rows.doc}}">Document</th>
-      </tr>
 
       <tr>
+	<th>Document</th>
 	<th>
 	  {% if doc.get_state_slug != "approved" %}
 	    Proposed charter
@@ -52,6 +50,7 @@
       </tr>
 
       <tr>
+        <td class="plain"></td>
 	<th>Title</th>
 	<td class="edit">
 	  {% if not snapshot and can_manage %}
@@ -62,12 +61,14 @@
       </tr>
 
       <tr>
+        <td class="plain"></td>
 	<th>Last updated</th>
 	<td class="edit"></td>
 	<td>{{ doc.time|date:"Y-m-d" }}</td>
       </tr>
 
       <tr>
+        <td class="plain"></td>
 	<th><a href="/doc/help/state/charter/">State</a></th>
 	<td class="edit">
 	  {% if not snapshot and can_manage %}
@@ -87,27 +88,33 @@
       </tr>
 
     </tbody>
-    <tbody>
-
-      <tr>
-	 <th rowspan="{{table_rows.wg}}">WG</th>
-      </tr>
 
+    <tbody>
       <tr>
+	<th>WG</th>
 	<th>State</th>
 	<td class="edit"></td>
 	<td>{{ group.state.name }}</td>
       </tr>
-
     </tbody>
-    <tbody>
 
+    <tbody>
       <tr>
-	 <th rowspan="{{table_rows.iesg}}">IESG</th>
+	<th>IESG</th>
+	<th>Responsible AD</th>
+	<td class="edit">
+	  {% if can_manage %}
+	    {% doc_edit_button "charter_edit_ad" name=doc.name %}
+	  {% endif %}
+	</td>
+	<td>
+	  {{ doc.ad|default:"(None)" }}
+	</td>
       </tr>
 
       {% if not snapshot and chartering %}
 	<tr>
+	  <td class="plain"></td>
 	  <th>Telechat date</th>
 	  <td class="edit">
 	    {% if can_manage %}
@@ -125,21 +132,11 @@
 	      <br><i>{{ ballot_summary }}</i>
 	    {% endif %}
 	  </td>
-      {% endif %}
-
-      <tr>
-	<th>Responsible AD</th>
-	<td class="edit">
-	  {% if can_manage %}
-	    {% doc_edit_button "charter_edit_ad" name=doc.name %}
-	  {% endif %}
-	</td>
-	<td>
-	  {{ doc.ad|default:"(None)" }}
-	</td>
       </tr>
+      {% endif %}
 
       <tr>
+	<td class="plain"></td>
 	<th>Send notices to</th>
 	<td class="edit">
 	  {% if can_manage %}

ietf/templates/doc/document_conflict_review.html

@@ -25,10 +25,7 @@
 
     <tbody>
       <tr>
-	 <th rowspan="{{table_rows.doc}}">Document</th>
-      </tr>
-
-      <tr>
+	<th>Document</th>
 	<th>
 	  {% if doc.get_state_slug not in approved_states %}
 	    Proposed conflict review
@@ -50,12 +47,14 @@
       </tr>
 
       <tr>
+      	<td class="plain"></td>
 	<th>Last updated</th>
 	<td class="edit"></td>
 	<td>{{ doc.time|date:"Y-m-d" }}</td>
       </tr>
 
       <tr>
+      	<td class="plain"></td>
 	<th><a href="/doc/help/state/conflict-review/">State</a></th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
@@ -70,12 +69,21 @@
     </tbody>
     <tbody>
       <tr>
-	 <th rowspan="{{table_rows.iesg}}">IESG</th>
+	<th>IESG</th>
+	<th>Shepherding AD</th>
+	<td class="edit">
+	  {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
+	    <a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a>
+	  {% endif %}
+	</td>
+	<td>
+	  {{doc.ad}}
+	</td>
       </tr>
 
-
       {% if not snapshot %}
 	<tr>
+	  <td class="plain"></td>
 	  <th>Telechat date</th>
 	  <td class="edit">
 	    {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@@ -98,18 +106,7 @@
       {% endif %}
 
       <tr>
-	<th>Shepherding AD</th>
-	<td class="edit">
-	  {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-	    <a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a>
-	  {% endif %}
-	</td>
-	<td>
-	  {{doc.ad}}
-	</td>
-      </tr>
-
-      <tr>
+	<td class="plain"></td>
 	<th>Send notices to</th>
 	<td class="edit">
 	  {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}

ietf/templates/meeting/agenda.html

@@ -184,7 +184,7 @@ <h2>
             {% endif %}
 
             {% if item.timeslot.type.slug == 'break' or item.timeslot.type.slug == 'reg' or item.timeslot.type.slug == 'other' %}
-              {% with session_id=item.timeslot.time|date:"D-Hi"|lower|add:"-"|add:item.session.group.acronym|lower %}
+              {% with session_id=item.timeslot.time|date:"D-Hi"|lower|add:"-"|add:item.session.group.acronym|lower|add:"-"|add:item.timeslot.get_location|slugify %}
                 <tr id="row-{{session_id}}">
 	          <td class="text-nowrap text-right">
 	            {% if "-utc" in request.path %}