Skip to content

Commit 629bff0

Browse files
larseggertlarseggert
authored
fix: Better agenda display on phone screens (ietf-tools#4156)
* fix: Better agenda display on phone screens * Remove comment * Conditional <br> * Retain existing columns on non-small screens
1 parent 091144d commit 629bff0

4 files changed

Lines changed: 31 additions & 18 deletions

File tree

‎ietf/templates/meeting/agenda.html‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -278,28 +278,42 @@ <h2 class="mt-3">
278278
{% endif %}
279279
</td>
280280
<td>
281+
<div class="d-none d-sm-block">
281282
{% if item.session.historic_group %}
282283
<a href="{% url 'ietf.group.views.group_about' acronym=item.session.historic_group.acronym %}">
283284
{{ item.session.historic_group.acronym }}
284285
</a>
285286
{% else %}
286287
{{ item.session.historic_group.acronym }}
287288
{% endif %}
289+
</div>
288290
</td>
289291
{% endif %}
290292
<td>
293+
{% if item.session.current_status == 'canceled' %}
294+
<span class="badge rounded-pill bg-danger float-end">Cancelled</span>
295+
{% else %}
296+
<div class="float-end ps-2">
297+
{% include "meeting/session_buttons_include.html" with show_agenda=True session=item.session meeting=schedule.meeting %}
298+
</div>
299+
{% endif %}
300+
<div class="d-sm-none">
301+
{% if item.session.historic_group %}
302+
<a href="{% url 'ietf.group.views.group_about' acronym=item.session.historic_group.acronym %}">
303+
{{ item.session.historic_group.acronym }}</a>
304+
{% else %}
305+
{{ item.session.historic_group.acronym }}
306+
{% endif %}
307+
{% if item.session.historic_group.historic_parent.acronym %}
308+
<span class="text-muted">{{ item.session.historic_group.historic_parent.acronym }}</span>
309+
{% endif %}
310+
</div>
311+
291312
{% agenda_anchor item.session %}
292313
{% assignment_display_name item %}
293314
{% end_agenda_anchor %}
294-
{% if item.session.current_status == 'canceled' %}
295-
<span class="badge rounded-pill bg-danger float-end">Cancelled</span>
296-
{% else %}
297-
<div class="float-end ps-2">
298-
{% include "meeting/session_buttons_include.html" with show_agenda=True session=item.session meeting=schedule.meeting %}
299-
</div>
300-
{% endif %}
301315
{% if item.session.historic_group.state_id == "bof" %}
302-
<span class="badge rounded-pill bg-success float-end me-2">BOF</span>
316+
<span class="badge rounded-pill bg-success float-end">BOF</span>
303317
{% endif %}
304318
{% if item.session.current_status == 'resched' %}
305319
<div class="badge rounded-pill bg-danger float-end">
@@ -326,7 +340,7 @@ <h2 class="mt-3">
326340
</a>
327341
{% elif item.session.agenda_note %}
328342
<br>
329-
<span class="text-danger">{{ item.session.agenda_note }}</span>
343+
<span class="text-danger small">{{ item.session.agenda_note }}</span>
330344
{% endif %}
331345
</td>
332346
</tr>
@@ -510,4 +524,4 @@ <h2 class="mt-3">
510524
}
511525
);
512526
</script>
513-
{% endblock %}
527+
{% endblock %}

‎ietf/templates/meeting/agenda_filter.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h2 class="accordion-header" id="heading">
4343
<div class="col-1 ms-1">
4444
<div class="row">
4545
<button type="button"
46-
class="agenda-filter-areaselectbtn btn btn-sm btn-outline-primary {% if area.label or area.keyword %}pickview {{ area.keyword }}{% endif %}"
46+
class="agenda-filter-areaselectbtn overflow-hidden btn btn-sm btn-outline-primary {% if area.label or area.keyword %}pickview {{ area.keyword }}{% endif %}"
4747
data-filter-item="{{ area.keyword }}"
4848
{% if not area.label and not area.keyword %}disabled{% endif %}>
4949
{% if area.label or area.keyword %}

‎ietf/templates/meeting/meeting_heading.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ <h1>
2020
</h1>
2121
<div class="lead row">
2222
<div class="{% if updated %}col-6{% else %}col-12{% endif %}">
23-
{{ meeting.city|default:"Location TBD" }}, {{ meeting.date|date:"F j" }} -
24-
{% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}
25-
{{ meeting.end_date|date:"j, Y" }}
23+
{{ meeting.city|default:"Location TBD" }}, {{ meeting.date|date:"F j" }}{% if meeting.date.month != meeting.end_date.month %} - {{ meeting.end_date|date:"F " }}{% else %}-{% endif %}{{ meeting.end_date|date:"j, Y" }}
2624
</div>
2725
{% if updated %}
2826
<div class="col-6 text-end">
29-
Updated: {{ updated|date:"Y-m-d \a\t G:i:s (T)" }}
27+
Updated {{ updated|date:"Y-m-d \a\t G:i (T)" }}
3028
</div>
3129
{% endif %}
3230
</div>
@@ -96,4 +94,4 @@ <h1>
9694
<a class="nav-link"
9795
href="{% url 'ietf.meeting.views.agenda' num=meeting.number ext='.txt' %}">Plaintext</a>
9896
</li>
99-
</ul>
97+
</ul>

‎ietf/templates/meeting/tz-display.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
value="UTC">
3636
<label class="btn btn-outline-primary" for="utc-timezone{{ suffix }}">UTC</label>
3737
{% if not minimal %}
38-
<label aria-label="Select timezone" class="d-none" for="timezone-select{{ id_suffix }}"></label>
38+
<!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
3939
<select id="timezone-select{{ suffix }}"
40+
aria-label="Select timezone"
4041
class="tz-select select2-field form-select border-primary"
4142
data-max-entries="1" data-minimum-input-length="0">
4243
{# Avoid blank while loading. JavaScript replaces the option list after init. #}
@@ -45,4 +46,4 @@
4546
</option>
4647
</select>
4748
{% endif %}
48-
</div>
49+
</div>

0 commit comments

Comments
 (0)