Skip to content

Commit

Permalink
Merge branch 'ioos:gh-pages' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
MathewBiddle authored Feb 26, 2024
2 parents a1843f2 + 2a7843d commit 7c6567e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 26 deletions.
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pilot: false
# Most workshops don't use extra pages. More information about extra
# pages are included in the README:
# https://github.com/carpentries/workshop-template#creating-extra-pages
title: "Marine Biological Data Mobilization Workshop 2023"
title: "Marine Biological Data Mobilization Workshop 2024"

#------------------------------------------------------------
# Incubator workshop settings (only relevant for workshops teaching a lesson
Expand Down Expand Up @@ -84,7 +84,7 @@ repository: <USERNAME>/<PROJECT>
# Email address, no mailto:
# (Don't change this -- the contact address for your workshop will be set
# in the index.md file)
email: "[email protected]"
email: "https://obis.org/contact/"

# Sites.
amy_site: "https://amy.carpentries.org/"
Expand Down
4 changes: 2 additions & 2 deletions _includes/custom-schedule.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="row"> <!-- first two days -->
<div class="col-md-6"> <!-- left column -->
<h3>April 18<sup>th</sup></h3>
<h3>April 22<sup>nd</sup></h3>
<table class="table table-striped">
<tr> <!-- row 2 -->
<td>13:00</td> <!-- time -->
Expand Down Expand Up @@ -47,7 +47,7 @@ <h3>April 18<sup>th</sup></h3>
</table>
</div>
<div class="col-md-6"> <!-- right column -->
<h3>April 19<sup>th</sup></h3>
<h3>April 23<sup>rd</sup></h3>
<table class="table table-striped">
<tr> <!-- row 1 -->
<td>13:00</td> <!-- time -->
Expand Down
2 changes: 1 addition & 1 deletion _includes/workshop_calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

{% assign final_day = page.enddate | date: '%s' | plus:86400 | date: '%F' | replace: "-", "" %}

<a href="//calendar.google.com/calendar/render?action=TEMPLATE&text=%20Biological%20Data%20Mobilization%20Workshop&dates=20230418T1255/20230419T1655&ctz=America%2FNew_York&recur=RRULE:FREQ%3DDAILY;COUNT=2&trp=false&sprop&sprop=name:&sf=true&output=xml&location=https://ioos.github.io/bio_mobilization_workshop/&details=%20Workshop%20at%20OBIS-USA,%20IOOS,%20Hakai,%20CIOOS,%20MBON,%20OTN" target="_blank">Add to your Google Calendar.</a>
<a href="//calendar.google.com/calendar/render?action=TEMPLATE&text=%20Biological%20Data%20Mobilization%20Workshop&dates=20240422T1255/20240423T1655&ctz=America%2FNew_York&recur=RRULE:FREQ%3DDAILY;COUNT=1&trp=false&sprop&sprop=name:&sf=true&output=xml&location=https://ioos.github.io/bio_mobilization_workshop/&details=%20Workshop%20at%20OBIS-USA,%20IOOS,%20Hakai,%20CIOOS,%20MBON,%20OTN" target="_blank">Add to your Google Calendar.</a>
28 changes: 7 additions & 21 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,15 @@ country: "" # lowercase two-letter ISO country code such as "fr" (see
language: "en" # lowercase two-letter ISO language code such as "fr" (see https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for the workshop
latitude: 0 # decimal latitude of workshop venue (use https://www.latlong.net/)
longitude: 0 # decimal longitude of the workshop venue (use https://www.latlong.net)
humandate: "April 18-19, 2023" # human-readable dates for the workshop (e.g., "Feb 17-18, 2020")
humandate: "April 22-23, 2024" # human-readable dates for the workshop (e.g., "Feb 17-18, 2020")
humantime: "13:00 - 17:00 EDT" # human-readable times for the workshop e.g., "9:00 am - 4:30 pm CEST (7:00 am - 2:30 pm UTC)"
startdate: 2023-04-18 # machine-readable start date for the workshop in YYYY-MM-DD format like 2015-01-01
enddate: 2023-04-19 # machine-readable end date for the workshop in YYYY-MM-DD format like 2015-01-02
startdate: 2023-04-22 # machine-readable start date for the workshop in YYYY-MM-DD format like 2015-01-01
enddate: 2023-04-23 # machine-readable end date for the workshop in YYYY-MM-DD format like 2015-01-02
# instructor list : a boxed, comma-separated list of instructors' names as strings, like ["Abby Benson", "Mathew Biddle"]
instructor: [ "Abby Benson", "Steve Formel",
"Mathew Biddle",
"Jonathan Pye",
"Tim van der Stap",
Elizabeth Lawrence
]
instructor: []
# helper list: a boxed, comma-separated list of helper's names as strings, like ["Ben Best", "Carolina Peralta"]
helper: [
"Brett Johnson",
"Zach Monteith",
"Naomi Tress",
"YingHuan Niu",
"Angela Dini",
"Carolina Peralta",
"Dan Otis",
"Tylar Murray"
]
email: ["[email protected]"] # boxed, comma-separated list of contact email addresses for the host, lead instructor, or whoever else is handling questions, like ["[email protected]", "[email protected]", "[email protected]"]
helper: []
email: ["https://obis.org/contact/"] # boxed, comma-separated list of contact email addresses for the host, lead instructor, or whoever else is handling questions, like ["[email protected]", "[email protected]", "[email protected]"]
collaborative_notes: # optional: URL for the workshop collaborative notes, e.g. an Etherpad or Google Docs document (e.g., https://pad.carpentries.org/2015-01-01-euphoria)
eventbrite: # optional: alphanumeric key for Eventbrite registration, e.g., "1234567890AB" (if Eventbrite is being used)
---
Expand Down Expand Up @@ -273,7 +259,7 @@ Display the contact email address set in the configuration file.
,
{% endunless %}
{% endif %}
<a href='mailto:{{email}}'>{{email}}</a>
<a href='{{email}}'>{{email}}</a>
{% endfor %}
{% else %}
to-be-announced
Expand Down

0 comments on commit 7c6567e

Please sign in to comment.