altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [19469] from lars@eggert.org:

Browse source 
<span> can't have <div> in it. Fix that.
 - Legacy-Id: 19511
Note: SVN reference [19469] has been migrated to Git commit d6e60a8f8e
This commit is contained in:
Robert Sparks 2021-11-01 18:03:55 +00:00
parent bc4e421175 d6e60a8f8e
commit bfc22c2c96
5 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/meeting/tests_views.py
View file

@ -2736,7 +2736,7 @@ class SessionDetailsTests(TestCase):
self.assertNotContains(r, 'deleted') self.assertNotContains(r, 'deleted')
q = PyQuery(r.content) 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') '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)), 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') '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) pm = meeting.proceedings_materials.get(pk=pm.pk)
self.assertEqual(str(pm), 'This Is Not the Default Name') 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')

4
ietf/static/ietf/js/agenda/agenda_timezone.js
View file

@ -127,9 +127,9 @@ function format_tooltip_table(start, end) {
// Format tooltip for item // Format tooltip for item
function format_tooltip(start, end) { function format_tooltip(start, end) {
return '<span class="timetooltiptext">' + return '<div class="timetooltiptext">' +
format_tooltip_table(start, end) + format_tooltip_table(start, end) +
'</span>'; '</div>';
} }
// Add tooltips // Add tooltips

46
ietf/templates/meeting/agenda.html
View file

@ -127,7 +127,7 @@
{% endif %} {% endif %}
</h2> </h2>
<iframe seamless class="hidden" id="weekview"></iframe> <iframe class="hidden" id="weekview"></iframe>
<table class="table table-condensed table-striped"> <table class="table table-condensed table-striped">
{% for item in filtered_assignments %} {% for item in filtered_assignments %}
@ -150,14 +150,14 @@
data-slot-end-ts="{{item.end_timestamp}}"> data-slot-end-ts="{{item.end_timestamp}}">
<td class="leftmarker"></td> <td class="leftmarker"></td>
<th class="text-nowrap text-right"> <th class="text-nowrap text-right">
<span class="hidden-xs"> <div class="hidden-xs">
{% include "meeting/timeslot_start_end.html" %} {% include "meeting/timeslot_start_end.html" %}
</span> </div>
</th> </th>
<th colspan="4"> <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" %} {% include "meeting/timeslot_start_end.html" %}
</span> </div>
{{ item.timeslot.time|date:"l"}} {{ item.timeslot.time|date:"l"}}
{{item.timeslot.name|capfirst_allcaps}} {{item.timeslot.name|capfirst_allcaps}}
</th> </th>
@ -172,14 +172,14 @@
data-slot-end-ts="{{item.end_timestamp}}"> data-slot-end-ts="{{item.end_timestamp}}">
<td class="leftmarker"></td> <td class="leftmarker"></td>
<td class="text-nowrap text-right"> <td class="text-nowrap text-right">
<span class="hidden-xs"> <div class="hidden-xs">
{% include "meeting/timeslot_start_end.html" %} {% include "meeting/timeslot_start_end.html" %}
</span> </div>
</td> </td>
<td colspan="3"> <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" %} {% include "meeting/timeslot_start_end.html" %}
</span> </div>
{% if item.timeslot.show_location and item.timeslot.get_html_location %} {% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% if schedule.meeting.number|add:"0" < 96 %} {% if schedule.meeting.number|add:"0" < 96 %}
{% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %} {% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
@ -193,10 +193,10 @@
{% endif %} {% endif %}
{% with item.timeslot.location.floorplan as floor %} {% with item.timeslot.location.floorplan as floor %}
{% if item.timeslot.location.floorplan %} {% 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}}" <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> class="pull-right" title="{{floor.name}}"><span class="label label-blank label-wide">{{floor.short}}</span></a>
</span> </divn>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
{% endif %} {% endif %}
@ -241,14 +241,14 @@
<td class="leftmarker"></td> <td class="leftmarker"></td>
{% if item.timeslot.type.slug == 'plenary' %} {% if item.timeslot.type.slug == 'plenary' %}
<th class="text-nowrap text-right"> <th class="text-nowrap text-right">
<span class="hidden-xs"> <div class="hidden-xs">
{% include "meeting/timeslot_start_end.html" %} {% include "meeting/timeslot_start_end.html" %}
</span> </div>
</th> </th>
<td colspan="3"> <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" %} {% include "meeting/timeslot_start_end.html" %}
</span> </div>
{% if item.timeslot.show_location and item.timeslot.get_html_location %} {% if item.timeslot.show_location and item.timeslot.get_html_location %}
{% if schedule.meeting.number|add:"0" < 96 %} {% if schedule.meeting.number|add:"0" < 96 %}
{% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %} {% comment %}<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_html_location|xslugify }}">{% endcomment %}
@ -266,10 +266,10 @@
<td> <td>
{% with item.timeslot.location.floorplan as floor %} {% with item.timeslot.location.floorplan as floor %}
{% if item.timeslot.location.floorplan %} {% 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}}" <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> class="pull-right" title="{{floor.name}}"><span class="label label-blank">{{floor.short}}</span></a>
</span> </div>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</td> </td>
@ -287,7 +287,7 @@
{% endif %} {% endif %}
</td> </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> <td>
{% if item.session.historic_group %} {% if item.session.historic_group %}
@ -324,19 +324,19 @@
{% endif %} {% endif %}
{% if item.session.current_status == 'resched' %} {% if item.session.current_status == 'resched' %}
<span class="label label-danger pull-right"> <div class="label label-danger pull-right">
RESCHEDULED RESCHEDULED
{% if item.session.rescheduled_to %} {% if item.session.rescheduled_to %}
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 %} {% 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" }} {{ item.session.rescheduled_to.utc_start_time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.utc_end_time|date:"G:i" }}
{% else %} {% else %}
{{ item.session.rescheduled_to.time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.end_time|date:"G:i" }} {{ item.session.rescheduled_to.time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.end_time|date:"G:i" }}
{% endif %} {% endif %}
</span></span> </div></div>
{% endif %} {% endif %}
</span> </div>
{% endif %} {% endif %}
{% if item.session.agenda_note|first_url|conference_url %} {% if item.session.agenda_note|first_url|conference_url %}
@ -533,4 +533,4 @@
} }
); );
</script> </script>
{% endblock %} {% endblock %}

4
ietf/templates/meeting/session_buttons_include.html
View file

@ -5,7 +5,7 @@
{% origin %} {% origin %}
{% with slug=item.slug %}{% with session=item.session %}{% with timeslot=item.timeslot %}{% with meeting=schedule.meeting %} {% 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 %} {% with acronym=session.historic_group.acronym %}
{% if session.agenda and show_agenda %} {% 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 #} {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
@ -110,5 +110,5 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</span> </div>
{% endwith %}{% endwith %}{% endwith %}{% endwith %} {% endwith %}{% endwith %}{% endwith %}{% endwith %}

4
ietf/templates/meeting/timeslot_start_end.html
View file

@ -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 %} {% if "-utc" in request.path %}
{{item.timeslot.utc_start_time|date:"H:i"}}-{{item.timeslot.utc_end_time|date:"H:i"}} {{item.timeslot.utc_start_time|date:"H:i"}}-{{item.timeslot.utc_end_time|date:"H:i"}}
{% else %} {% else %}
{{item.timeslot.time|date:"H:i"}}-{{item.timeslot.end_time|date:"H:i"}} {{item.timeslot.time|date:"H:i"}}-{{item.timeslot.end_time|date:"H:i"}}
{% endif %} {% endif %}
</span></span> </div></div>