Skip to content

Commit bfc22c2

Browse files
rjsparksrjsparks
committed
Merged in [19469] from lars@eggert.org:
 <span> can't have <div> in it. Fix that. - Legacy-Id: 19511 Note: SVN reference [19469] has been migrated to Git commit d6e60a8
2 parents bc4e421 + d6e60a8 commit bfc22c2

5 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎ietf/meeting/tests_views.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2736,7 +2736,7 @@ def test_session_details(self):
27362736
self.assertNotContains(r, 'deleted')
27372737

27382738
q = PyQuery(r.content)
2739-
self.assertTrue(q('h2#session_%s span#session-buttons-%s' % (session.id, session.id)),
2739+
self.assertTrue(q('h2#session_%s div#session-buttons-%s' % (session.id, session.id)),
27402740
'Session detail page does not contain session tool buttons')
27412741
self.assertFalse(q('h2#session_%s div#session-buttons-%s span.fa-arrows-alt' % (session.id, session.id)),
27422742
'The session detail page is incorrectly showing the "Show meeting materials" button')
@@ -6205,4 +6205,4 @@ def test_rename_proceedings_material(self):
62056205
)
62066206
pm = meeting.proceedings_materials.get(pk=pm.pk)
62076207
self.assertEqual(str(pm), 'This Is Not the Default Name')
6208-
self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision')
6208+
self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision')

‎ietf/static/ietf/js/agenda/agenda_timezone.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ function format_tooltip_table(start, end) {
127127

128128
// Format tooltip for item
129129
function format_tooltip(start, end) {
130-
return '<span class="timetooltiptext">' +
130+
return '<div class="timetooltiptext">' +
131131
format_tooltip_table(start, end) +
132-
'</span>';
132+
'</div>';
133133
}
134134

135135
// Add tooltips

‎ietf/templates/meeting/agenda.html‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ <h2>
127127
{% endif %}
128128
</h2>
129129

130-
<iframe seamless class="hidden" id="weekview"></iframe>
130+
<iframe class="hidden" id="weekview"></iframe>
131131

132132
<table class="table table-condensed table-striped">
133133
{% for item in filtered_assignments %}
@@ -150,14 +150,14 @@ <h2>
150150
data-slot-end-ts="{{item.end_timestamp}}">
151151
<td class="leftmarker"></td>
152152
<th class="text-nowrap text-right">
153-
<span class="hidden-xs">
153+
<div class="hidden-xs">
154154
{% include "meeting/timeslot_start_end.html" %}
155-
</span>
155+
</div>
156156
</th>
157157
<th colspan="4">
158-
<span class="hidden-sm hidden-md hidden-lg">
158+
<div class="hidden-sm hidden-md hidden-lg">
159159
{% include "meeting/timeslot_start_end.html" %}
160-
</span>
160+
</div>
161161
{{ item.timeslot.time|date:"l"}}
162162
{{item.timeslot.name|capfirst_allcaps}}
163163
</th>
@@ -172,14 +172,14 @@ <h2>
172172
data-slot-end-ts="{{item.end_timestamp}}">
173173
<td class="leftmarker"></td>
174174
<td class="text-nowrap text-right">
175-
<span class="hidden-xs">
175+
<div class="hidden-xs">
176176
{% include "meeting/timeslot_start_end.html" %}
177-
</span>
177+
</div>
178178
</td>
179179
<td colspan="3">
180-
<span class="hidden-sm hidden-md hidden-lg">
180+
<div class="hidden-sm hidden-md hidden-lg">
181181
{% include "meeting/timeslot_start_end.html" %}
182-
</span>
182+
</div>
183183
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
184184
{% if schedule.meeting.number|add:"0" < 96 %}
185185
{% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
@@ -193,10 +193,10 @@ <h2>
193193
{% endif %}
194194
{% with item.timeslot.location.floorplan as floor %}
195195
{% if item.timeslot.location.floorplan %}
196-
<span class="hidden-xs">
196+
<div class="hidden-xs">
197197
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
198198
class="pull-right" title="{{floor.name}}"><span class="label label-blank label-wide">{{floor.short}}</span></a>
199-
</span>
199+
</divn>
200200
{% endif %}
201201
{% endwith %}
202202
{% endif %}
@@ -241,14 +241,14 @@ <h2>
241241
<td class="leftmarker"></td>
242242
{% if item.timeslot.type.slug == 'plenary' %}
243243
<th class="text-nowrap text-right">
244-
<span class="hidden-xs">
244+
<div class="hidden-xs">
245245
{% include "meeting/timeslot_start_end.html" %}
246-
</span>
246+
</div>
247247
</th>
248248
<td colspan="3">
249-
<span class="hidden-sm hidden-md hidden-lg">
249+
<div class="hidden-sm hidden-md hidden-lg">
250250
{% include "meeting/timeslot_start_end.html" %}
251-
</span>
251+
</div>
252252
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
253253
{% if schedule.meeting.number|add:"0" < 96 %}
254254
{% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
@@ -266,10 +266,10 @@ <h2>
266266
<td>
267267
{% with item.timeslot.location.floorplan as floor %}
268268
{% if item.timeslot.location.floorplan %}
269-
<span class="hidden-xs">
269+
<div class="hidden-xs">
270270
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
271271
class="pull-right" title="{{floor.name}}"><span class="label label-blank">{{floor.short}}</span></a>
272-
</span>
272+
</div>
273273
{% endif %}
274274
{% endwith %}
275275
</td>
@@ -287,7 +287,7 @@ <h2>
287287
{% endif %}
288288
</td>
289289

290-
<td><span class="hidden-xs">{{item.session.historic_group.historic_parent.acronym}}</span></td>
290+
<td><div class="hidden-xs">{{item.session.historic_group.historic_parent.acronym}}</div></td>
291291

292292
<td>
293293
{% if item.session.historic_group %}
@@ -324,19 +324,19 @@ <h2>
324324
{% endif %}
325325

326326
{% if item.session.current_status == 'resched' %}
327-
<span class="label label-danger pull-right">
327+
<div class="label label-danger pull-right">
328328
RESCHEDULED
329329
{% if item.session.rescheduled_to %}
330330
TO
331-
<span class="timetooltip reschedtimetooltip"><span class="time" data-start-time="{{item.session.rescheduled_to.utc_start_time|date:"U"}}" data-end-time="{{item.session.rescheduled_to.utc_end_time|date:"U"}}" {% if item.timeslot.time|date:"l" != item.session.rescheduled_to.time|date:"l" %} weekday="1"{% endif %}>
331+
<div class="timetooltip reschedtimetooltip"><div class="time" data-start-time="{{item.session.rescheduled_to.utc_start_time|date:"U"}}" data-end-time="{{item.session.rescheduled_to.utc_end_time|date:"U"}}" {% if item.timeslot.time|date:"l" != item.session.rescheduled_to.time|date:"l" %} weekday="1"{% endif %}>
332332
{% if "-utc" in request.path %}
333333
{{ item.session.rescheduled_to.utc_start_time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.utc_end_time|date:"G:i" }}
334334
{% else %}
335335
{{ item.session.rescheduled_to.time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.end_time|date:"G:i" }}
336336
{% endif %}
337-
</span></span>
337+
</div></div>
338338
{% endif %}
339-
</span>
339+
</div>
340340
{% endif %}
341341

342342
{% if item.session.agenda_note|first_url|conference_url %}
@@ -533,4 +533,4 @@ <h2>
533533
}
534534
);
535535
</script>
536-
{% endblock %}
536+
{% endblock %}

‎ietf/templates/meeting/session_buttons_include.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% origin %}
66

77
{% with slug=item.slug %}{% with session=item.session %}{% with timeslot=item.timeslot %}{% with meeting=schedule.meeting %}
8-
<span id="session-buttons-{{session.pk}}" class="text-nowrap">
8+
<div id="session-buttons-{{session.pk}}" class="text-nowrap">
99
{% with acronym=session.historic_group.acronym %}
1010
{% if session.agenda and show_agenda %}
1111
{# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
@@ -110,5 +110,5 @@
110110
{% endif %}
111111
{% endif %}
112112
{% endwith %}
113-
</span>
113+
</div>
114114
{% endwith %}{% endwith %}{% endwith %}{% endwith %}

‎ietf/templates/meeting/timeslot_start_end.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<span class="timetooltip"><span class="time" data-start-time="{{item.start_timestamp}}" data-end-time="{{item.end_timestamp}}">
1+
<div class="timetooltip"><div class="time" data-start-time="{{item.start_timestamp}}" data-end-time="{{item.end_timestamp}}">
22
{% if "-utc" in request.path %}
33
{{item.timeslot.utc_start_time|date:"H:i"}}-{{item.timeslot.utc_end_time|date:"H:i"}}
44
{% else %}
55
{{item.timeslot.time|date:"H:i"}}-{{item.timeslot.end_time|date:"H:i"}}
66
{% endif %}
7-
</span></span>
7+
</div></div>

0 commit comments

Comments
 (0)