Skip to content

Commit f818d60

Browse files
metageekymetageeky
committed
fix online/onsite data and improves logic for the CSV schedule
1 parent 339a6ce commit f818d60

File tree

2 files changed

+60
-56
lines changed

2 files changed

+60
-56
lines changed

‎_data/community-support.yml

+30-30
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ soojeong-herring:
1919
img_alt:
2020
slack_handle: Soojeong Herring
2121
onsite: true
22-
online: true
22+
online: false
2323

2424
ann-marie-mesco:
2525
name: Ann Marie Mesco
@@ -29,7 +29,7 @@ ann-marie-mesco:
2929
img_alt:
3030
slack_handle: Ann Marie
3131
onsite: true
32-
online: true
32+
online: false
3333

3434
bobbi-fox:
3535
name: Bobbi Fox
@@ -39,7 +39,7 @@ bobbi-fox:
3939
img_alt:
4040
slack_handle: Bobbi Fox
4141
onsite: true
42-
online: true
42+
online: false
4343

4444
andromeda-yelton:
4545
name: Andromeda Yelton
@@ -49,7 +49,7 @@ andromeda-yelton:
4949
img_alt:
5050
slack_handle: thatandromeda
5151
onsite: true
52-
online: true
52+
online: false
5353

5454
bess-sadler:
5555
name: Bess Sadler
@@ -59,7 +59,7 @@ bess-sadler:
5959
img_alt: A white woman with light brown hair that is short on the sides and long on top. She is wearing rimless glasses and a black t-shirt. She is smiling. There are fairy lights behind her.
6060
slack_handle: bess
6161
onsite: true
62-
online: true
62+
online: false
6363

6464
francis-kawiya:
6565
name: Francis Kawiya
@@ -69,27 +69,7 @@ francis-kawiya:
6969
img_alt: "Black Man with a Blue and White Stripped Shirt. Background is a faded green background."
7070
slack_handle: "El Cromulente"
7171
onsite: true
72-
online: true
73-
74-
eric-phetteplace:
75-
name: Eric Phetteplace
76-
last: Phetteplace
77-
pronouns: he/him
78-
img: /assets/img/conduct/eric-phetteplace.png
79-
img_alt: "A black-and-white photo of a smiling white man with a beard wearing a collared shirt."
80-
slack_handle: Phette23
81-
onsite: false
82-
online: true
83-
84-
esme-cowles:
85-
name: Esmé Cowles
86-
last: Cowles
87-
pronouns: he/him
88-
img: /assets/img/conduct/esme-cowles.jpg
89-
img_alt: "A bald, middle-aged white man with a close-trimmed red beard which is graying at the chin, wearing tortoiseshell glasses and a dark blue hoodie."
90-
slack_handle: escowles
91-
onsite: true
92-
online: true
72+
online: false
9373

9474
carolyn-cole:
9575
name: Carolyn Cole
@@ -99,7 +79,7 @@ carolyn-cole:
9979
img_alt:
10080
slack_handle: cam156
10181
onsite: true
102-
online: true
82+
online: false
10383

10484
anne-slaughter:
10585
name: Anne Slaughter
@@ -109,7 +89,7 @@ anne-slaughter:
10989
img_alt:
11090
slack_handle: aslaughter
11191
onsite: true
112-
online: true
92+
online: false
11393

11494
sharon-clapp:
11595
name: Sharon Clapp
@@ -119,7 +99,7 @@ sharon-clapp:
11999
img_alt:
120100
slack_handle: sclapp
121101
onsite: true
122-
online: true
102+
online: false
123103

124104
kevin-reiss:
125105
name: Kevin Reiss
@@ -128,7 +108,7 @@ kevin-reiss:
128108
img:
129109
img_alt:
130110
slack_handle: kevinreiss
131-
onsite: true
111+
onsite: false
132112
online: true
133113

134114
mike-giarlo:
@@ -139,4 +119,24 @@ mike-giarlo:
139119
img_alt: A white, freckle-faced male with blue eyes, chin-length curly dark brown hair, and a beard is smiling in front of a light green wall. He is wearing a green t-shirt and a grey & green Seattle Supersonics baseball cap.
140120
slack_handle: mjgiarlo
141121
onsite: false
122+
online: true
123+
124+
esme-cowles:
125+
name: Esmé Cowles
126+
last: Cowles
127+
pronouns: he/him
128+
img: /assets/img/conduct/esme-cowles.jpg
129+
img_alt: "A bald, middle-aged white man with a close-trimmed red beard which is graying at the chin, wearing tortoiseshell glasses and a dark blue hoodie."
130+
slack_handle: escowles
131+
onsite: false
132+
online: true
133+
134+
eric-phetteplace:
135+
name: Eric Phetteplace
136+
last: Phetteplace
137+
pronouns: he/him
138+
img: /assets/img/conduct/eric-phetteplace.png
139+
img_alt: "A black-and-white photo of a smiling white man with a beard wearing a collared shirt."
140+
slack_handle: Phette23
141+
onsite: false
142142
online: true

‎conduct/index.html

+30-26
Original file line numberDiff line numberDiff line change
@@ -240,33 +240,37 @@ <h4 class="speaker-name">{{ volunteer.name }}</h4>
240240
<div class="row csv-schedule">
241241
<div class="col-12">
242242
<h2 id="schedule">Community Support Volunteer Schedule</h2>
243+
{% if site.data.community-support-schedule.onsite == nil and site.data.community-support-schedule.online == nil %}
244+
<p>Schedule will be posted shortly before the conference.</p>
245+
{% endif %}
246+
243247

244248
{% if site.data.community-support-schedule.onsite != nil %}
245249
<h3>On-Site</h3>
246250
{% for session in site.data.community-support-schedule.onsite %}
247-
<h3>{{ session.day }} — {{ session.period }}</h3>
248-
<div class="row">
249-
<div class="col-12 keynote-sequence sequence">
250-
{% if session.all-hands %}
251-
<p><strong>All community support volunteers attending the event &mdash; look for the black & white striped lanyards!</strong></p>
252-
{% else %}
253-
{% for volunteerId in session.volunteers %}
254-
{% assign volunteer = site.data.community-support[volunteerId] %}
255-
<div class="speaker-box text-center">
256-
<div class="speaker-box-inner">
257-
{% if volunteer.img_alt != nil %}
258-
<img alt="{{ volunteer.img_alt }}" class="clip-circle-lg" src="{{ volunteer.img }}" alt="{{ volunteer.name }}">
259-
{% else %}
260-
<img alt="{{ volunteer.name }}" class="clip-circle-lg" src="{{ volunteer.img }}" alt="{{ volunteer.name }}">
261-
{% endif %}
262-
<h4 class="speaker-name">{{ volunteer.name }}</h4>
263-
</div>
264-
</div>
265-
{% endfor %}
266-
{% endif %}
267-
</div>
268-
</div>
269-
{% endfor %}
251+
<h3>{{ session.day }} — {{ session.period }}</h3>
252+
<div class="row">
253+
<div class="col-12 keynote-sequence sequence">
254+
{% if session.all-hands %}
255+
<p><strong>All community support volunteers attending the event &mdash; look for the black & white striped lanyards!</strong></p>
256+
{% else %}
257+
{% for volunteerId in session.volunteers %}
258+
{% assign volunteer = site.data.community-support[volunteerId] %}
259+
<div class="speaker-box text-center">
260+
<div class="speaker-box-inner">
261+
{% if volunteer.img_alt != nil %}
262+
<img alt="{{ volunteer.img_alt }}" class="clip-circle-lg" src="{{ volunteer.img }}" alt="{{ volunteer.name }}">
263+
{% else %}
264+
<img alt="{{ volunteer.name }}" class="clip-circle-lg" src="{{ volunteer.img }}" alt="{{ volunteer.name }}">
265+
{% endif %}
266+
<h4 class="speaker-name">{{ volunteer.name }}</h4>
267+
</div>
268+
</div>
269+
{% endfor %}
270+
{% endif %}
271+
</div>
272+
</div>
273+
{% endfor %}
270274
{% endif %}
271275

272276
{% if site.data.community-support-schedule.online != nil %}
@@ -283,9 +287,9 @@ <h3>Online</h3>
283287
</div>
284288
</div>
285289
{% else %}
286-
{%- comment %} remove CSV Schedule menu link because we don't have the info yet
287-
NOTE: jQuery not available on the page yet. {% endcomment -%}
288-
<script>try { document.querySelector('ul.secondarynav a[href="#schedule"]').parentElement.remove() } catch(e) {}</script>
290+
{%- comment %} remove CSV Schedule menu link because we don't have the info yet
291+
NOTE: jQuery not available on the page yet. {% endcomment -%}
292+
<script>try { document.querySelector('ul.secondarynav a[href="#schedule"]').parentElement.remove() } catch(e) {}</script>
289293
{% endif %}
290294

291295
{% if site.data.conf.online-only-conference == false %}

0 commit comments

Comments
 (0)