Skip to content

Commit 75b5fc1

Browse files
larseggertlarseggert
committed
More agenda template fixes.
 - Legacy-Id: 19656
1 parent be3a8f7 commit 75b5fc1

5 files changed

Lines changed: 154 additions & 207 deletions

File tree

‎.eslintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = {
22
extends: ["eslint:recommended"],
33
rules: {
44
indent: ["error", 4],
5-
quotes: ["error", "double", { avoidEscape: true, allowTemplateLiterals: true }],
5+
quotes: "off",
66
"no-multiple-empty-lines": ["error", { max: 2, maxEOF: 0 }],
77
"quote-props": ["error", "as-needed"],
88
"brace-style": ["error", "1tbs", { allowSingleLine: true }],

‎ietf/templates/base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</ul>
7474
</div>
7575
{% endif %}
76-
<div class="col" id="content">
76+
<div class="col mx-3" id="content">
7777
{% comment %} {% bootstrap_messages %} {% endcomment %}
7878
{% for message in messages %}
7979
<div class="alert{% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %}{% endif %}{% if message.extra_tags %} {{ message.extra_tags }}{% endif %} alert-dismissable fade show">

‎ietf/templates/meeting/agenda.html‎

Lines changed: 39 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,14 @@
77
{% load htmlfilters agenda_custom_tags%}
88

99
{% block title %}
10-
IETF {{ schedule.meeting.number }} meeting agenda
10+
IETF {{ schedule.meeting.number }} Meeting Agenda
1111
{% if "-utc" in request.path %}
1212
(UTC)
1313
{% endif %}
1414
{% endblock %}
1515

1616
{% block morecss %}
17-
iframe#weekview { height: 600px; width: 100%; }
18-
tr:not(:first-child) th.gap {
19-
height: 3em !important;
20-
background-color: inherit !important;
21-
border: none !important;
22-
}
23-
tr:first-child th.gap {
24-
height: 0 !important;
25-
background-color: inherit !important;
26-
border: none !important;
27-
}
28-
.session-materials .agenda-frame,.minutes-frame {
29-
white-space: normal;
30-
}
31-
div.tz-display {
32-
margin-bottom: 0.5em;
33-
margin-top: 1em;
34-
text-align: right;
35-
}
36-
.tz-display a {
37-
cursor: pointer;
38-
}
39-
.tz-display label {
40-
font-weight: normal;
41-
}
42-
.tz-display select {
43-
min-width: 15em;
44-
}
45-
#affix .nav li.tz-display {
46-
padding: 4px 20px;
47-
}
48-
#affix .nav li.tz-display a {
49-
display: inline;
50-
padding: 0;
51-
}
17+
iframe#weekview { height: 25em; }
5218
{% endblock %}
5319

5420
{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
@@ -57,37 +23,38 @@
5723
{% origin %}
5824

5925
<div class="row">
60-
<div class="col-md-12">
61-
{% if "-utc" in request.path %}
62-
{% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated selected="agenda-utc" title_extra="(UTC)" %}
63-
{% else %}
64-
{% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated selected="agenda" title_extra="" %}
65-
{% endif %}
26+
{% if "-utc" in request.path %}
27+
{% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated selected="agenda-utc" title_extra="(UTC)" %}
28+
{% else %}
29+
{% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated selected="agenda" title_extra="" %}
30+
{% endif %}
6631

67-
</div>
6832
</div>
6933
<div class="row">
7034
<div class="col-md-10">
7135
{# cache this part -- it takes 3-6 seconds to generate #}
7236
{% load cache %}
7337
{% cache cache_time ietf_meeting_agenda_utc schedule.meeting.number request.path %}
7438
<div class="row">
75-
<div class="col-xs-6"><h1>Agenda</h1></div>
76-
<div class="col-xs-6">
77-
<div class="tz-display">
78-
<div><small>
79-
<label for="timezone-select">Time zone:</label>
80-
<a id="meeting-timezone" onclick="ietf_timezone.use('{{ timezone }}')">Meeting</a> |
81-
<a id="local-timezone" onclick="ietf_timezone.use('local')">Local</a> |
82-
<a id="utc-timezone" onclick="ietf_timezone.use('UTC')">UTC</a>
83-
</small></div>
84-
<select id="timezone-select" class="tz-select">
39+
<div class="col-5">
40+
<h2>Agenda</h2>
41+
</div>
42+
<div class="col float-end">
43+
<div class="input-group input-group-sm">
44+
<label class="input-group-text border-secondary">Time zone:</label>
45+
<button class="btn btn-outline-secondary" type="button" id="meeting-timezone" onclick="ietf_timezone.use('{{ timezone }}')">Meeting</button>
46+
<button class="btn btn-outline-secondary" type="button" id="local-timezone" onclick="ietf_timezone.use('local')">Local</button>
47+
<button class="btn btn-outline-secondary" type="button" id="utc-timezone" onclick="ietf_timezone.use('UTC')">UTC</button>
48+
<select id="timezone-select" class="tz-select form-select border-secondary">
8549
{# Avoid blank while loading. JavaScript replaces the option list after init. #}
8650
<option selected>{{ timezone }}</option>
8751
</select>
8852
</div>
53+
54+
8955
</div>
9056
</div>
57+
9158
{% if is_current_meeting %}
9259
<p class="alert alert-info">
9360
<b>Note:</b> IETF agendas are subject to change, up to and during a meeting.
@@ -100,23 +67,22 @@
10067
</p>
10168
{% endif %}
10269

103-
{% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Customize the agenda view..." %}
104-
70+
<p>
71+
{% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Customize the agenda view..." %}
72+
</p>
10573
<h2>Download as .ics</h2>
106-
<p class="buttonlist">
74+
<p>
10775
{% for fc in filter_categories %}
10876
{% if not forloop.last %} {# skip the last group, it's the office hours/misc #}
109-
<div style="display:inline-block;margin-right:1em">
110-
{% for p in fc|dictsort:"label" %}
111-
<a class="btn btn-default" href="{% url "ietf.meeting.views.agenda_ical" num=schedule.meeting.number %}?show={{p.keyword}}">{{p.label}}</a>
112-
{% endfor %}
113-
</div>
77+
{% for p in fc|dictsort:"label" %}
78+
<a class="btn btn-primary btn-sm mb-3" href="{% url "ietf.meeting.views.agenda_ical" num=schedule.meeting.number %}?show={{p.keyword}}">{{p.label}}</a>
79+
{% endfor %}
11480
{% endif %}
11581
{% endfor %}
116-
<div style="display:inline-block">
117-
<a class="btn btn-default" href="{% url "ietf.meeting.views.agenda_ical" num=schedule.meeting.number %}?show={{ non_area_keywords|join:',' }}">Non-area events</a>
118-
<a id="ical-link" class="hidden btn btn-primary agenda-link filterable" href="{% url "ietf.meeting.views.agenda_ical" num=schedule.meeting.number %}">Customized schedule</a>
119-
</div>
82+
83+
<a class="btn btn-primary btn-sm mb-3" href="{% url "ietf.meeting.views.agenda_ical" num=schedule.meeting.number %}?show={{ non_area_keywords|join:',' }}">Non-area events</a>
84+
85+
<a id="ical-link" class="hidden btn btn-primary btn-sm mb-3 agenda-link filterable" href="{% url "ietf.meeting.views.agenda_ical" num=schedule.meeting.number %}">Customized schedule</a>
12086
</p>
12187

12288
<h2>
@@ -127,18 +93,19 @@ <h2>
12793
{% endif %}
12894
</h2>
12995

130-
<iframe class="hidden" id="weekview"></iframe>
96+
<iframe class="hidden w-100" scrolling="no" id="weekview"></iframe>
97+
98+
<h2>Detailed Agenda</h2>
13199

132100
<table class="table table-sm table-striped">
133101
{% for item in filtered_assignments %}
134102

135103
{% ifchanged item.timeslot.time|date:"Y-m-d" %}
136-
<tr><th class="gap" colspan="7"></th></tr>
137104
<tr class="table-warning">
138105
<th colspan="7">
139106
{# The anchor here needs to be in a div, not in the th, in order for the anchor-target margin hack to work #}
140107
<div class="anchor-target" id="{{item.timeslot.time|slugify}}"></div>
141-
{{ item.timeslot.time|date:"l, F j, Y" }}
108+
<h6 class="mt-2">{{ item.timeslot.time|date:"l, F j, Y" }}</h6>
142109
</th>
143110
</tr>
144111
{% endifchanged %}
@@ -165,7 +132,7 @@ <h2>
165132
{% if item.timeslot.location.floorplan %}
166133
<div class="hidden-xs">
167134
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
168-
class="float-end" title="{{floor.name}}"><span class="badge bg-blank label-wide">{{floor.short}}</span></a>
135+
class="float-end" title="{{floor.name}}"><span class="badge bg-secondary label-wide">{{floor.short}}</span></a>
169136
</div>
170137
{% endif %}
171138
{% endwith %}
@@ -179,7 +146,7 @@ <h2>
179146
{% if item.session.current_status == 'canceled' %}
180147
<span class="badge bg-danger float-end">CANCELLED</span>
181148
{% else %}
182-
<div class="float-end padded-left">
149+
<div class="float-end ps-3">
183150
{% if item.slot_type.slug == 'other' %}
184151
{% if item.session.agenda or item.session.remote_instructions or item.session.agenda_note %}
185152
{% include "meeting/session_buttons_include.html" with show_agenda=True item=item schedule=schedule %}
@@ -249,7 +216,7 @@ <h2>
249216
{% if item.timeslot.location.floorplan %}
250217
<div class="hidden-xs">
251218
<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}#{{floor.name|xslugify}}"
252-
class="float-end" title="{{floor.name}}"><span class="badge bg-blank">{{floor.short}}</span></a>
219+
class="float-end" title="{{floor.name}}"><span class="badge bg-secondary">{{floor.short}}</span></a>
253220
</div>
254221
{% endif %}
255222
{% endwith %}
@@ -285,7 +252,7 @@ <h2>
285252
{% endif %}
286253

287254
{% if item.session.historic_group.state_id == "bof" %}
288-
<span class="badge bg-success float-end">BOF</span>
255+
<span class="badge bg-success float-end me-2">BOF</span>
289256
{% endif %}
290257

291258
{% if item.session.current_status == 'resched' %}

0 commit comments

Comments
 (0)