<span> can't have <div> in it. Fix that.
Commit ready for merge. - Legacy-Id: 19469
This commit is contained in:
Lars Eggert
parent
0c82560120
commit
d6e60a8f8e
|
|
@ -2736,7 +2736,7 @@ class SessionDetailsTests(TestCase):
|
|||
self.assertNotContains(r, 'deleted')
|
||||
|
||||
q = PyQuery(r.content)
|
||||
self.assertTrue(q('h2#session_%s span#session-buttons-%s' % (session.id, session.id)),
|
||||
self.assertTrue(q('h2#session_%s div#session-buttons-%s' % (session.id, session.id)),
|
||||
'Session detail page does not contain session tool buttons')
|
||||
self.assertFalse(q('h2#session_%s div#session-buttons-%s span.fa-arrows-alt' % (session.id, session.id)),
|
||||
'The session detail page is incorrectly showing the "Show meeting materials" button')
|
||||
|
|
@ -6205,4 +6205,4 @@ class ProceedingsTests(BaseMeetingTestCase):
|
|||
)
|
||||
pm = meeting.proceedings_materials.get(pk=pm.pk)
|
||||
self.assertEqual(str(pm), 'This Is Not the Default Name')
|
||||
self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision')
|
||||
self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision')
|
||||
|
|
@ -127,9 +127,9 @@ function format_tooltip_table(start, end) {
|
|||
|
||||
// Format tooltip for item
|
||||
function format_tooltip(start, end) {
|
||||
return '<span class="timetooltiptext">' +
|
||||
return '<div class="timetooltiptext">' +
|
||||
format_tooltip_table(start, end) +
|
||||
'</span>';
|
||||
'</div>';
|
||||
}
|
||||
|
||||
// Add tooltips
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@
|
|||
{% endif %}
|
||||
</h2>
|
||||
|
||||
<iframe seamless class="hidden" id="weekview"></iframe>
|
||||
<iframe class="hidden" id="weekview"></iframe>
|
||||
|
||||
<table class="table table-condensed table-striped">
|
||||
{% for item in filtered_assignments %}
|
||||
|
|
@ -150,14 +150,14 @@
|
|||
data-slot-end-ts="{{item.end_timestamp}}">
|
||||
<td class="leftmarker"></td>
|
||||
<th class="text-nowrap text-right">
|
||||
<span class="hidden-xs">
|
||||
<div class="hidden-xs">
|
||||
{% include "meeting/timeslot_start_end.html" %}
|
||||
</span>
|
||||
</div>
|
||||
</th>
|
||||
<th colspan="4">
|
||||
<span class="hidden-sm hidden-md hidden-lg">
|
||||
<div class="hidden-sm hidden-md hidden-lg">
|
||||
{% include "meeting/timeslot_start_end.html" %}
|
||||
</span>
|
||||
</div>
|
||||
{{ item.timeslot.time|date:"l"}}
|
||||
{{item.timeslot.name|capfirst_allcaps}}
|
||||
</th>
|
||||
|
|
@ -172,14 +172,14 @@
|
|||
data-slot-end-ts="{{item.end_timestamp}}">
|
||||
<td class="leftmarker"></td>
|
||||
<td class="text-nowrap text-right">
|
||||
<span class="hidden-xs">
|
||||
<div class="hidden-xs">
|
||||
{% include "meeting/timeslot_start_end.html" %}
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td colspan="3">
|
||||
<span class="hidden-sm hidden-md hidden-lg">
|
||||
<div class="hidden-sm hidden-md hidden-lg">
|
||||
{% include "meeting/timeslot_start_end.html" %}
|
||||
</span>
|
||||
</div>
|
||||
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
|
||||
{% if schedule.meeting.number|add:"0" < 96 %}
|
||||
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{{item.timeslot.get_html_location}}</a>
|
||||
|
|
@ -190,10 +190,10 @@
|
|||
{% endif %}
|
||||
{% with item.timeslot.location.floorplan as floor %}
|
||||
{% if item.timeslot.location.floorplan %}
|
||||
<span class="hidden-xs">
|
||||
<div class="hidden-xs">
|
||||
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
|
||||
class="pull-right" title="{{floor.name}}"><span class="label label-blank label-wide">{{floor.short}}</span></a>
|
||||
</span>
|
||||
</divn>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
{% endif %}
|
||||
|
|
@ -238,14 +238,14 @@
|
|||
<td class="leftmarker"></td>
|
||||
{% if item.timeslot.type.slug == 'plenary' %}
|
||||
<th class="text-nowrap text-right">
|
||||
<span class="hidden-xs">
|
||||
<div class="hidden-xs">
|
||||
{% include "meeting/timeslot_start_end.html" %}
|
||||
</span>
|
||||
</div>
|
||||
</th>
|
||||
<td colspan="3">
|
||||
<span class="hidden-sm hidden-md hidden-lg">
|
||||
<div class="hidden-sm hidden-md hidden-lg">
|
||||
{% include "meeting/timeslot_start_end.html" %}
|
||||
</span>
|
||||
</div>
|
||||
{% if item.timeslot.show_location and item.timeslot.get_html_location %}
|
||||
{% if schedule.meeting.number|add:"0" < 96 %}
|
||||
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{{item.timeslot.get_html_location}}</a>
|
||||
|
|
@ -261,10 +261,10 @@
|
|||
<td>
|
||||
{% with item.timeslot.location.floorplan as floor %}
|
||||
{% if item.timeslot.location.floorplan %}
|
||||
<span class="hidden-xs">
|
||||
<div class="hidden-xs">
|
||||
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
|
||||
class="pull-right" title="{{floor.name}}"><span class="label label-blank">{{floor.short}}</span></a>
|
||||
</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
</td>
|
||||
|
|
@ -280,7 +280,7 @@
|
|||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td><span class="hidden-xs">{{item.session.historic_group.historic_parent.acronym}}</span></td>
|
||||
<td><div class="hidden-xs">{{item.session.historic_group.historic_parent.acronym}}</div></td>
|
||||
|
||||
<td>
|
||||
{% if item.session.historic_group %}
|
||||
|
|
@ -317,19 +317,19 @@
|
|||
{% endif %}
|
||||
|
||||
{% if item.session.current_status == 'resched' %}
|
||||
<span class="label label-danger pull-right">
|
||||
<div class="label label-danger pull-right">
|
||||
RESCHEDULED
|
||||
{% if item.session.rescheduled_to %}
|
||||
TO
|
||||
<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 %}>
|
||||
<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 %}>
|
||||
{% if "-utc" in request.path %}
|
||||
{{ item.session.rescheduled_to.utc_start_time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.utc_end_time|date:"G:i" }}
|
||||
{% else %}
|
||||
{{ item.session.rescheduled_to.time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.end_time|date:"G:i" }}
|
||||
{% endif %}
|
||||
</span></span>
|
||||
</div></div>
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if item.session.agenda_note|first_url|conference_url %}
|
||||
|
|
@ -526,4 +526,4 @@
|
|||
}
|
||||
);
|
||||
</script>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
{% origin %}
|
||||
|
||||
{% with slug=item.slug %}{% with session=item.session %}{% with timeslot=item.timeslot %}{% with meeting=schedule.meeting %}
|
||||
<span id="session-buttons-{{session.pk}}" class="text-nowrap">
|
||||
<div id="session-buttons-{{session.pk}}" class="text-nowrap">
|
||||
{% with acronym=session.historic_group.acronym %}
|
||||
{% if session.agenda and show_agenda %}
|
||||
{# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
|
||||
|
|
@ -116,5 +116,5 @@
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
</span>
|
||||
</div>
|
||||
{% endwith %}{% endwith %}{% endwith %}{% endwith %}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<span class="timetooltip"><span class="time" data-start-time="{{item.start_timestamp}}" data-end-time="{{item.end_timestamp}}">
|
||||
<div class="timetooltip"><div class="time" data-start-time="{{item.start_timestamp}}" data-end-time="{{item.end_timestamp}}">
|
||||
{% if "-utc" in request.path %}
|
||||
{{item.timeslot.utc_start_time|date:"H:i"}}-{{item.timeslot.utc_end_time|date:"H:i"}}
|
||||
{% else %}
|
||||
{{item.timeslot.time|date:"H:i"}}-{{item.timeslot.end_time|date:"H:i"}}
|
||||
{% endif %}
|
||||
</span></span>
|
||||
</div></div>
|
||||
Loading…
Reference in a new issue