diff --git a/.gitmodules b/.gitmodules index 4603973c..52af485c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "staff-list"] path = staff-list url = https://github.com/CHTC/staff-list.git +[submodule "_events_external"] + path = _events + url = https://github.com/CHTC/events diff --git a/_config.yml b/_config.yml index 2acd24be..ea027f75 100755 --- a/_config.yml +++ b/_config.yml @@ -4,6 +4,7 @@ permalink: pretty title: 'PATh' url: "https://path-cc.io" key: path +future: true google_analytics_id: G-0CCSDQV212 homepage: @@ -38,9 +39,12 @@ collections: news: output: true permalink: /news/:path/ - events: + events_legacy: output: true permalink: /events/:path/ + events: + output: true + permalink: /events/:year/:month/:day/:title/ gil: output: true permalink: /GIL/:path/ @@ -74,9 +78,13 @@ defaults: layout: news bodyClass: page-news-single - scope: - type: events + type: events_legacy # Legacy events use the `events` layout for compatibility values: layout: events + - scope: + type: events # New events use the `events_modern` layout + values: + layout: events_modern - scope: path: 'images' values: diff --git a/_events b/_events new file mode 160000 index 00000000..62a61aa9 --- /dev/null +++ b/_events @@ -0,0 +1 @@ +Subproject commit 62a61aa97d5c5ae8759e1b39e45af39cac9e06c7 diff --git a/_events/2021-NSF-CCstar-PI-Workshop.md b/_events_legacy/2021-NSF-CCstar-PI-Workshop.md similarity index 100% rename from _events/2021-NSF-CCstar-PI-Workshop.md rename to _events_legacy/2021-NSF-CCstar-PI-Workshop.md diff --git a/_events/2021-NSF-Cybersecurity-Summit-Workshop.md b/_events_legacy/2021-NSF-Cybersecurity-Summit-Workshop.md similarity index 100% rename from _events/2021-NSF-Cybersecurity-Summit-Workshop.md rename to _events_legacy/2021-NSF-Cybersecurity-Summit-Workshop.md diff --git a/_events/2022-11-03-gpu-ml-demo.md b/_events_legacy/2022-11-03-gpu-ml-demo.md similarity index 100% rename from _events/2022-11-03-gpu-ml-demo.md rename to _events_legacy/2022-11-03-gpu-ml-demo.md diff --git a/_events/2022-All-Hands-Meeting.md b/_events_legacy/2022-All-Hands-Meeting.md similarity index 100% rename from _events/2022-All-Hands-Meeting.md rename to _events_legacy/2022-All-Hands-Meeting.md diff --git a/_events/2024-01-11-throughput-computing-2024.md b/_events_legacy/2024-01-11-throughput-computing-2024.md similarity index 100% rename from _events/2024-01-11-throughput-computing-2024.md rename to _events_legacy/2024-01-11-throughput-computing-2024.md diff --git a/_events/2024-03-29-osg-school-2024.md b/_events_legacy/2024-03-29-osg-school-2024.md similarity index 100% rename from _events/2024-03-29-osg-school-2024.md rename to _events_legacy/2024-03-29-osg-school-2024.md diff --git a/_events/2024-euro-htcondor.md b/_events_legacy/2024-euro-htcondor.md similarity index 100% rename from _events/2024-euro-htcondor.md rename to _events_legacy/2024-euro-htcondor.md diff --git a/_events/9999-01-01-Template.md b/_events_legacy/9999-01-01-Template.md similarity index 100% rename from _events/9999-01-01-Template.md rename to _events_legacy/9999-01-01-Template.md diff --git a/_events/HTCondorWeek-2022.md b/_events_legacy/HTCondorWeek-2022.md similarity index 100% rename from _events/HTCondorWeek-2022.md rename to _events_legacy/HTCondorWeek-2022.md diff --git a/_events/HTCondorWeek-Europe.md b/_events_legacy/HTCondorWeek-Europe.md similarity index 100% rename from _events/HTCondorWeek-Europe.md rename to _events_legacy/HTCondorWeek-Europe.md diff --git a/_events/OSG-User-School-2022.md b/_events_legacy/OSG-User-School-2022.md similarity index 100% rename from _events/OSG-User-School-2022.md rename to _events_legacy/OSG-User-School-2022.md diff --git a/_events/OSG-User-School-2023.md b/_events_legacy/OSG-User-School-2023.md similarity index 100% rename from _events/OSG-User-School-2023.md rename to _events_legacy/OSG-User-School-2023.md diff --git a/_events/OSG-User-Training-11-1-22.md b/_events_legacy/OSG-User-Training-11-1-22.md similarity index 100% rename from _events/OSG-User-Training-11-1-22.md rename to _events_legacy/OSG-User-Training-11-1-22.md diff --git a/_events/OSG-Virtual-School.md b/_events_legacy/OSG-Virtual-School.md similarity index 100% rename from _events/OSG-Virtual-School.md rename to _events_legacy/OSG-Virtual-School.md diff --git a/_events/Site-Admin-Workshop-2.md b/_events_legacy/Site-Admin-Workshop-2.md similarity index 100% rename from _events/Site-Admin-Workshop-2.md rename to _events_legacy/Site-Admin-Workshop-2.md diff --git a/_events/Site-Admin-Workshop.md b/_events_legacy/Site-Admin-Workshop.md similarity index 100% rename from _events/Site-Admin-Workshop.md rename to _events_legacy/Site-Admin-Workshop.md diff --git a/_events/Token-Transition-Workshop.md b/_events_legacy/Token-Transition-Workshop.md similarity index 100% rename from _events/Token-Transition-Workshop.md rename to _events_legacy/Token-Transition-Workshop.md diff --git a/_events/Trusted-CI-Webinar.md b/_events_legacy/Trusted-CI-Webinar.md similarity index 100% rename from _events/Trusted-CI-Webinar.md rename to _events_legacy/Trusted-CI-Webinar.md diff --git a/_events/throughput-computing-2023.md b/_events_legacy/throughput-computing-2023.md similarity index 100% rename from _events/throughput-computing-2023.md rename to _events_legacy/throughput-computing-2023.md diff --git a/_events/throughput-computing-week.md b/_events_legacy/throughput-computing-week.md similarity index 100% rename from _events/throughput-computing-week.md rename to _events_legacy/throughput-computing-week.md diff --git a/_events/workflows-with-pegasus.md b/_events_legacy/workflows-with-pegasus.md similarity index 100% rename from _events/workflows-with-pegasus.md rename to _events_legacy/workflows-with-pegasus.md diff --git a/_includes/event/event-card.html b/_includes/event/event-card.html index a4c28563..598ab53a 100644 --- a/_includes/event/event-card.html +++ b/_includes/event/event-card.html @@ -23,7 +23,7 @@
{% endif %} {% if event.image %} - + {{ event.image.alt }} {% endif %}

diff --git a/_includes/event/event-header.html b/_includes/event/event-header.html index 66736e7c..687a44f5 100644 --- a/_includes/event/event-header.html +++ b/_includes/event/event-header.html @@ -20,13 +20,16 @@

- + {{ page.banner.alt }}
+ + {% if page.banner.credit %}
- {{ page.header_credit }} + {{ page.banner.credit }}
+ {% endif %}
diff --git a/_includes/event/event-page.html b/_includes/event/event-page.html index 333c12b1..623cf2bd 100644 --- a/_includes/event/event-page.html +++ b/_includes/event/event-page.html @@ -29,4 +29,3 @@ - diff --git a/_includes/get/future_events.liquid b/_includes/get/future_events.liquid index 32037db0..d73fa3cb 100644 --- a/_includes/get/future_events.liquid +++ b/_includes/get/future_events.liquid @@ -1,9 +1,9 @@ {% assign current_time = 'now' | date: '%Y-%m-%d' | date: '%s' | plus: 0 %} - +{% assign all_events = site.events | where_exp: "event", "event.publish_on contains site.key" %} {% assign future_events = "" | split : "" %} -{% for event in site.events %} +{% for event in all_events %} {% assign event_end = event.end_date | append: "" | date: '%Y-%m-%d' | date: '%s' | plus: 0 %} {% if event_end >= current_time %} diff --git a/_includes/get/past_events.html b/_includes/get/past_events.html deleted file mode 100644 index 2c59000d..00000000 --- a/_includes/get/past_events.html +++ /dev/null @@ -1,14 +0,0 @@ -{% assign current_time = 'now' | date: '%Y-%m-%d' | date: '%s' | plus: 0 %} - -{% assign past_events = "" | split : "" %} - -{% for event in site.events %} - -{% assign event_end = event.end_date | append: "" | date: '%Y-%m-%d' | date: '%s' | plus: 0 %} - -{% if event_end < current_time %} -{% assign past_events = past_events | push: event %} -{% endif %} -{% endfor %} - -{% assign past_events = past_events | sort: "end_date" | reverse %} \ No newline at end of file diff --git a/_includes/get/past_events.liquid b/_includes/get/past_events.liquid new file mode 100644 index 00000000..1244d93b --- /dev/null +++ b/_includes/get/past_events.liquid @@ -0,0 +1,14 @@ +{% assign current_time = 'now' | date: '%Y-%m-%d' | date: '%s' | plus: 0 %} + +{% assign all_events = site.events | where_exp: "event", "event.publish_on contains site.key" %} +{% assign past_events = "" | split : "" %} + +{% for event in all_events %} + {% assign event_end = event.end_date | append: "" | date: '%Y-%m-%d' | date: '%s' | plus: 0 %} + + {% if event_end < current_time %} + {% assign past_events = past_events | push: event %} + {% endif %} +{% endfor %} + +{% assign past_events = past_events | sort: "end_date" | reverse %} \ No newline at end of file diff --git a/_layouts/events.html b/_layouts/events.html index 867fa435..389ae6e7 100644 --- a/_layouts/events.html +++ b/_layouts/events.html @@ -3,7 +3,44 @@ ---
- {% include event/event-header.html %} +
+
+
+

+ {% assign date = page.start_date | date: "%B %e" %} + {% if page.start_date != page.end_date %} + {% assign date = page.end_date | date: "-%e" | prepend: date %} + {% endif %} + + {% assign current_time = 'now' | date: '%Y-%m-%d' | date: '%s' | plus: 0 %} + {% assign event_end = page.end_date | append: "" | date: '%Y-%m-%d' | date: '%s' | plus: 0 %} + + {% if current_time > event_end %} + Past Event | {{ date }} + {% else %} + Upcoming Event | {{ date }} + {% endif %} +

+
+
+
+
+ +
+
+
+ {{ page.header_credit }} +
+
+
+
+
+

+ {{ page.title }} +

+
+
+
{{ content }} -
+
\ No newline at end of file diff --git a/_layouts/events_modern.html b/_layouts/events_modern.html new file mode 100644 index 00000000..e0a29372 --- /dev/null +++ b/_layouts/events_modern.html @@ -0,0 +1,25 @@ +--- +layout: container-default +--- + +
+ {% include event/event-header.html %} + +
+
+ {{ content }} +
+ + {% if page.sidebar %} +
+ {{ page.sidebar | markdownify }} +
+ {% endif %} + + {% if page.endblock %} +
+ {{ page.endblock | markdownify }} +
+ {% endif %} +
+
diff --git a/events.html b/events.html index 117e6343..bc72d5e3 100644 --- a/events.html +++ b/events.html @@ -11,9 +11,9 @@

Events

- {% if event.header_image %} - - + {% if event.banner %} + + {{ event.banner.alt }} {% endif %}

@@ -36,14 +36,14 @@

Past Events

- {% include get/past_events.html %} + {% include get/past_events.liquid %} {% for event in past_events %}
- {% if event.header_image %} + {% if event.banner %} - + {{ event.banner.alt }} {% endif %}

@@ -51,10 +51,10 @@

{% if event.start_date != event.end_date %} - {% assign date = event.start_date | date: "%B %e" %} - {% assign date = event.end_date | date: "-%e, %Y" | prepend: date %} + {% assign date = event.start_date | date: "%B %e" %} + {% assign date = event.end_date | date: "-%e, %Y" | prepend: date %} {% else %} - {% assign date = event.start_date | date: "%B %e, %Y" %} + {% assign date = event.start_date | date: "%B %e, %Y" %} {% endif %} {{ date }}