fix: Long session titles were overlapping the materials buttons (#5454)

This commit is contained in:
Lars Eggert 2023-04-10 16:58:22 +03:00 committed by GitHub
parent 50e716e440
commit 34482cd100
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,30 +2,32 @@
{% origin %}
{% for session in sessions %}
{% with item=session.official_timeslotassignment %} {% with timeslot=item.timeslot %}
<h3 class="mt-4" id="session_{{ session.pk }}">
{% if sessions|length > 1 %}Session {{ forloop.counter }} :{% endif %}
{% for time in session.times %}
{% if not forloop.first %},{% endif %}
{{ time|timezone:session.meeting.time_zone|dateformat:"l Y-m-d H:i T" }}
{% if time.tzinfo.zone != "UTC" %}<span class="small">({{ time|utc|dateformat:"H:i T" }})</span>{% endif %}
{% endfor %}
{% if session.cancelled %}
<small class="badge rounded-pill bg-warning">Cancelled</small>
{% else %}
{{ session.status }}
<div class="mt-4">
{% if not session.cancelled %}
<div class="regular ms-3 float-end">
{# see note in the included templates re: show_agenda parameter and required JS import #}
{% if meeting.type.slug == 'interim' %}
{% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %}
{% else %}
{% include "meeting/session_buttons_include.html" with show_agenda=False item=session.official_timeslotassignment use_notes=session.meeting.use_notes %}
{% endif %}
</div>
{% endif %}
{% if session.name %}: {{ session.name }}{% endif %}
</h3>
{% if not session.cancelled %}
<div class="regular float-end">
{# see note in the included templates re: show_agenda parameter and required JS import #}
{% if meeting.type.slug == 'interim' %}
{% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %}
<h3 class="" id="session_{{ session.pk }}">
{% if sessions|length > 1 %}Session {{ forloop.counter }} :{% endif %}
{% for time in session.times %}
{% if not forloop.first %},{% endif %}
{{ time|timezone:session.meeting.time_zone|dateformat:"l Y-m-d H:i T" }}
{% if time.tzinfo.zone != "UTC" %}<span class="small">({{ time|utc|dateformat:"H:i T" }})</span>{% endif %}
{% endfor %}
{% if session.cancelled %}
<small class="badge rounded-pill bg-warning">Cancelled</small>
{% else %}
{% include "meeting/session_buttons_include.html" with show_agenda=False item=session.official_timeslotassignment use_notes=session.meeting.use_notes %}
{{ session.status }}
{% endif %}
</div>
{% endif %}
{% if session.name %}: {{ session.name }}{% endif %}
</h3>
</div>
{% if session.agenda_note %}<h3 class="mt-4">{{ session.agenda_note }}</h3>{% endif %}
{% if can_manage_materials %}
{% if session.current_status == 'sched' or session.current_status == 'schedw' %}