diff --git a/.gitmodules b/.gitmodules index ffebbe89..2f78cf14 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"] + path = _events + url = https://github.com/CHTC/Events.git diff --git a/_config.yml b/_config.yml index f25f961d..1d8d007f 100644 --- a/_config.yml +++ b/_config.yml @@ -23,6 +23,9 @@ include: - "nsdf/.well-known" - "uwdf/researchdrive/.well-known" +exclude: + - _events/images + markdown_ext : "md,shtml" highlighter: none @@ -41,9 +44,13 @@ defaults: layout: news-page permalink: :title.html - scope: - type: events + type: events_legacy values: layout: events + - scope: + type: events + values: + layout: events_modern - scope: type: redirects values: @@ -54,9 +61,12 @@ collections: news: permalink: /news/:path/ output: true + events_legacy: + output: true + permalink: /events/:year/:month/:title events: output: true - permalink: /:collection/:year/:month/:title + permalink: /events/:year/:month/:day/:title redirects: output: true uw-research-computing: diff --git a/_events b/_events new file mode 160000 index 00000000..e71ba435 --- /dev/null +++ b/_events @@ -0,0 +1 @@ +Subproject commit e71ba4355b8991a8b933bbe9896053e6e8ec0a61 diff --git a/_events/2022-11-01-extended-office-hours.md b/_events_legacy/2022-11-01-extended-office-hours.md similarity index 100% rename from _events/2022-11-01-extended-office-hours.md rename to _events_legacy/2022-11-01-extended-office-hours.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/2023-01-10-data-center-tours.md b/_events_legacy/2023-01-10-data-center-tours.md similarity index 100% rename from _events/2023-01-10-data-center-tours.md rename to _events_legacy/2023-01-10-data-center-tours.md diff --git a/_events/2023-01-10-hpc-cluster-faq.md b/_events_legacy/2023-01-10-hpc-cluster-faq.md similarity index 100% rename from _events/2023-01-10-hpc-cluster-faq.md rename to _events_legacy/2023-01-10-hpc-cluster-faq.md diff --git a/_events/2023-02-08-research-bazaar.md b/_events_legacy/2023-02-08-research-bazaar.md similarity index 100% rename from _events/2023-02-08-research-bazaar.md rename to _events_legacy/2023-02-08-research-bazaar.md diff --git a/_events/2023-07-10-throughput-computing-2023.md b/_events_legacy/2023-07-10-throughput-computing-2023.md similarity index 100% rename from _events/2023-07-10-throughput-computing-2023.md rename to _events_legacy/2023-07-10-throughput-computing-2023.md diff --git a/_events/2023-10-04-information-session.md b/_events_legacy/2023-10-04-information-session.md similarity index 100% rename from _events/2023-10-04-information-session.md rename to _events_legacy/2023-10-04-information-session.md diff --git a/_events/2023-11-08-intro-workshop.md b/_events_legacy/2023-11-08-intro-workshop.md similarity index 100% rename from _events/2023-11-08-intro-workshop.md rename to _events_legacy/2023-11-08-intro-workshop.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-04-22-euro-htc.md b/_events_legacy/2024-04-22-euro-htc.md similarity index 100% rename from _events/2024-04-22-euro-htc.md rename to _events_legacy/2024-04-22-euro-htc.md diff --git a/_events/2024-09-18-information-session.md b/_events_legacy/2024-09-18-information-session.md similarity index 100% rename from _events/2024-09-18-information-session.md rename to _events_legacy/2024-09-18-information-session.md diff --git a/_events/2024-10-11-information-session.md b/_events_legacy/2024-10-11-information-session.md similarity index 100% rename from _events/2024-10-11-information-session.md rename to _events_legacy/2024-10-11-information-session.md diff --git a/_events/2024-11-05-information-session.md b/_events_legacy/2024-11-05-information-session.md similarity index 100% rename from _events/2024-11-05-information-session.md rename to _events_legacy/2024-11-05-information-session.md diff --git a/_events/2024-12-04-information-session.md b/_events_legacy/2024-12-04-information-session.md similarity index 100% rename from _events/2024-12-04-information-session.md rename to _events_legacy/2024-12-04-information-session.md diff --git a/_events/2024-12-05-movie.md b/_events_legacy/2024-12-05-movie.md similarity index 100% rename from _events/2024-12-05-movie.md rename to _events_legacy/2024-12-05-movie.md diff --git a/_events/2025-01-14-information-session.md b/_events_legacy/2025-01-14-information-session.md similarity index 100% rename from _events/2025-01-14-information-session.md rename to _events_legacy/2025-01-14-information-session.md diff --git a/_events/2025-02-01-throughput-computing-week-2025.md b/_events_legacy/2025-02-01-throughput-computing-week-2025.md similarity index 100% rename from _events/2025-02-01-throughput-computing-week-2025.md rename to _events_legacy/2025-02-01-throughput-computing-week-2025.md diff --git a/_events/2025-02-11-containers.md b/_events_legacy/2025-02-11-containers.md similarity index 100% rename from _events/2025-02-11-containers.md rename to _events_legacy/2025-02-11-containers.md diff --git a/_events/2025-02-26-researcher-forum.md b/_events_legacy/2025-02-26-researcher-forum.md similarity index 100% rename from _events/2025-02-26-researcher-forum.md rename to _events_legacy/2025-02-26-researcher-forum.md diff --git a/_events/2025-03-08-grad-student-open-house.md b/_events_legacy/2025-03-08-grad-student-open-house.md similarity index 100% rename from _events/2025-03-08-grad-student-open-house.md rename to _events_legacy/2025-03-08-grad-student-open-house.md diff --git a/_events/2025-03-11-information-session.md b/_events_legacy/2025-03-11-information-session.md similarity index 100% rename from _events/2025-03-11-information-session.md rename to _events_legacy/2025-03-11-information-session.md diff --git a/_events/2025-04-08-getting-started-htc.md b/_events_legacy/2025-04-08-getting-started-htc.md similarity index 100% rename from _events/2025-04-08-getting-started-htc.md rename to _events_legacy/2025-04-08-getting-started-htc.md diff --git a/_events/2025-06-10-chtc-at-terrace.md b/_events_legacy/2025-06-10-chtc-at-terrace.md similarity index 100% rename from _events/2025-06-10-chtc-at-terrace.md rename to _events_legacy/2025-06-10-chtc-at-terrace.md diff --git a/_events/2025-06-23-osg-school-2025.md b/_events_legacy/2025-06-23-osg-school-2025.md similarity index 100% rename from _events/2025-06-23-osg-school-2025.md rename to _events_legacy/2025-06-23-osg-school-2025.md diff --git a/_events/2025-07-08-chtc-at-terrace.md b/_events_legacy/2025-07-08-chtc-at-terrace.md similarity index 100% rename from _events/2025-07-08-chtc-at-terrace.md rename to _events_legacy/2025-07-08-chtc-at-terrace.md diff --git a/_events/2025-07-16-throughput-computing-week-2026.md b/_events_legacy/2025-07-16-throughput-computing-week-2026.md similarity index 100% rename from _events/2025-07-16-throughput-computing-week-2026.md rename to _events_legacy/2025-07-16-throughput-computing-week-2026.md diff --git a/_events/2025-08-12-chtc-at-terrace.md b/_events_legacy/2025-08-12-chtc-at-terrace.md similarity index 100% rename from _events/2025-08-12-chtc-at-terrace.md rename to _events_legacy/2025-08-12-chtc-at-terrace.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/_includes/event/event-card.html b/_includes/event/event-card.html index 0c77557f..02feebe4 100644 --- a/_includes/event/event-card.html +++ b/_includes/event/event-card.html @@ -4,7 +4,7 @@
{% if event.image %} - + {{ event.image.alt }} {% endif %}
@@ -23,8 +23,5 @@

{{ date }}

{% endif %} -

- {{ event.location }} -

diff --git a/_includes/event/event-header.html b/_includes/event/event-header.html index 44824c39..de498543 100644 --- a/_includes/event/event-header.html +++ b/_includes/event/event-header.html @@ -20,11 +20,11 @@

- + {{ page.banner.alt }}
- {{ page.header_credit }} + {{ page.banner.credit }}
diff --git a/_includes/get/future_events.html b/_includes/get/future_events.liquid similarity index 73% rename from _includes/get/future_events.html rename to _includes/get/future_events.liquid index cf8380b2..d73fa3cb 100644 --- a/_includes/get/future_events.html +++ b/_includes/get/future_events.liquid @@ -1,15 +1,12 @@ {% 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 %} {% assign future_events = future_events | push: event %} {% endif %} {% endfor %} - -{% assign future_events = future_events | sort: "end_date" %} diff --git a/_includes/get/past_events.html b/_includes/get/past_events.liquid similarity index 76% rename from _includes/get/past_events.html rename to _includes/get/past_events.liquid index 2d7b179b..1244d93b 100644 --- a/_includes/get/past_events.html +++ b/_includes/get/past_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 past_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 %} @@ -11,4 +11,4 @@ {% endif %} {% endfor %} -{% assign past_events = past_events | sort: "end_date" | reverse %} +{% 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 e01e2b5f..e352457e 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 }}
diff --git a/_layouts/events_modern.html b/_layouts/events_modern.html new file mode 100644 index 00000000..38d7e960 --- /dev/null +++ b/_layouts/events_modern.html @@ -0,0 +1,29 @@ +--- +layout: container +--- + +
+ {% 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 4b594aec..e552c8a5 100644 --- a/events.html +++ b/events.html @@ -6,14 +6,14 @@
- {% include get/future_events.html %} + {% include get/future_events.liquid %} {% for event in future_events %}
{% include event/event-card.html %}
{% endfor %}
- {% include get/past_events.html %} + {% include get/past_events.liquid %} {% if past_events.size > 0 %}

Past Events

diff --git a/index.html b/index.html index 7d979122..0d2c74a5 100644 --- a/index.html +++ b/index.html @@ -70,7 +70,7 @@

- {% include get/future_events.html %} + {% include get/future_events.liquid %} {% if future_events.size > 0 %}