Skip to content

Commit 88b734b

Browse files
committed
restructure community support schedule & its example data
we shouldn't need two files for online vs onsite schedules, keep them together use the existence of an onsite or online schedule for display, not the 'online-only-conference' key in the global site data fix some broken logic from the pivot to all-online last year support speaker alt text if we have it for the onsite volunteers rename onsite vs online data properties so they're consistent
1 parent 5616ab8 commit 88b734b

File tree

3 files changed

+51
-71
lines changed

3 files changed

+51
-71
lines changed

Diff for: _data/examples/community-support-schedule.yml

+31-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,32 @@
1-
- title: Event 1
2-
volunteers:
3-
- surname
4-
- othersurname
1+
# The schedule for Community Support Volunteers, only affects
2+
# /conduct/#schedule
3+
# The volunteer(s) fields key off of objects in community-support.yml
4+
# Everything else is a string; "period" can be text or a time but we
5+
# usually use a label for the onsite schedule & time for online.
56

6-
- title: Event 2
7-
volunteers:
8-
- surname
7+
onsite:
8+
# template:
9+
# - day: Tuesday
10+
# period: Morning Preconferences
11+
# volunteers:
12+
# - surname
13+
# - othersurname
14+
- day: Tuesday
15+
period: Morning Preconferences
16+
volunteers:
17+
- surname
18+
19+
- day: Tuesday
20+
period: Afternoon Preconferences
21+
volunteers:
22+
- othersurname
23+
- surname
24+
25+
online:
26+
# template:
27+
# - day:
28+
# period:
29+
# volunteer:
30+
- day: Tuesday
31+
period: 9am - 12pm MT
32+
volunteer: drrobot

Diff for: _data/examples/online-duty-officer-schedule.yml

-47
This file was deleted.

Diff for: conduct/index.html

+20-17
Original file line numberDiff line numberDiff line change
@@ -223,18 +223,15 @@ <h4 class="speaker-name">{{ volunteer.name }}</h4>
223223
</div>
224224
</div>
225225

226-
{% if site.data.community-support-schedule %}
226+
{% if site.data.community-support-schedule != nil %}
227227
<div class="row csv-schedule">
228228
<div class="col-12">
229-
<h2 id="schedule">Community Support Volunteer Schedule
230-
{% if site.data.conf.online-only-conference == false %}
231-
- On-Site
232-
{% else %}
233-
- Online
234-
{% endif %}
235-
</h2>
236-
{% for session in site.data.community-support-schedule %}
237-
<h3>{{ session.day }} — {{ session.time }}</h3>
229+
<h2 id="schedule">Community Support Volunteer Schedule</h2>
230+
231+
{% if site.data.community-support-schedule.onsite != nil %}
232+
<h3>On-Site</h3>
233+
{% for session in site.data.community-support-schedule.onsite %}
234+
<h3>{{ session.day }} — {{ session.period }}</h3>
238235
<div class="row">
239236
<div class="col-12 keynote-sequence sequence">
240237
{% if session.all-hands %}
@@ -244,7 +241,11 @@ <h3>{{ session.day }} — {{ session.time }}</h3>
244241
{% assign volunteer = site.data.community-support[volunteerId] %}
245242
<div class="speaker-box text-center">
246243
<div class="speaker-box-inner">
247-
<img class="clip-circle-lg" src="/{{ volunteer.img }}" alt="{{ volunteer.name }}">
244+
{% if volunteer.img_alt != nil %}
245+
<img alt="{{ volunteer.img_alt }}" class="clip-circle-lg" src="{{ volunteer.img }}" alt="{{ volunteer.name }}">
246+
{% else %}
247+
<img alt="{{ volunteer.name }}" class="clip-circle-lg" src="{{ volunteer.img }}" alt="{{ volunteer.name }}">
248+
{% endif %}
248249
<h4 class="speaker-name">{{ volunteer.name }}</h4>
249250
</div>
250251
</div>
@@ -253,14 +254,16 @@ <h4 class="speaker-name">{{ volunteer.name }}</h4>
253254
</div>
254255
</div>
255256
{% endfor %}
256-
{% if site.data.conf.online-only-conference %}
257+
{% endif %}
258+
259+
{% if site.data.community-support-schedule.online != nil %}
257260
<h3>Online</h3>
258-
{% for period in site.data.online-community-support-schedule %}
259-
{% assign officer = site.data.community-support[period.officer] %}
261+
{% for session in site.data.community-support-schedule.online %}
262+
{% assign volunteer = site.data.community-support[session.volunteer] %}
260263
<div class="row">
261-
<div class="col-2">{{ period.day }}</div>
262-
<div class="col-3">{{ period.interval }}</div>
263-
<div class="col-4">{{ officer.name }} ({{ officer.slack_handle }})</div>
264+
<div class="col-2">{{ session.day }}</div>
265+
<div class="col-3">{{ session.period }}</div>
266+
<div class="col-4">{{ volunteer.name }} ({{ volunteer.slack_handle }})</div>
264267
</div>
265268
{% endfor %}
266269
{% endif %}

0 commit comments

Comments
 (0)