diff --git a/config/_default/menus.yaml b/config/_default/menus.yaml index 98e11ad6..88ddc80d 100644 --- a/config/_default/menus.yaml +++ b/config/_default/menus.yaml @@ -131,12 +131,15 @@ main: url: news weight: 50 - name: 'Events' - url: events weight: 60 - parent: 'Events' name: 'Current Events' - url: events/events-current - weight: 61 + url: events + weight: 60 + - parent: 'Events' + name: 'Past Events' + url: past-events + weight: 61 - parent: 'Events' name: 'ReSA Community Calls' url: events/community-calls diff --git a/content/events/events-past/2021-12/index.md b/content/events/2021-12/index.md similarity index 99% rename from content/events/events-past/2021-12/index.md rename to content/events/2021-12/index.md index af0b2049..ed1a7085 100644 --- a/content/events/events-past/2021-12/index.md +++ b/content/events/2021-12/index.md @@ -2,6 +2,7 @@ title: "People Roadmap Webinar" subtitle: "Report update" date: "2021-11-01" + authors: - "" diff --git a/content/events/events-past/2021-12/surface-unsplash-videoconference.jpg b/content/events/2021-12/surface-unsplash-videoconference.jpg similarity index 100% rename from content/events/events-past/2021-12/surface-unsplash-videoconference.jpg rename to content/events/2021-12/surface-unsplash-videoconference.jpg diff --git a/content/events/events-past/2022-04/Vive-la-Difference-Poster.pdf b/content/events/2022-04/Vive-la-Difference-Poster.pdf similarity index 100% rename from content/events/events-past/2022-04/Vive-la-Difference-Poster.pdf rename to content/events/2022-04/Vive-la-Difference-Poster.pdf diff --git a/content/events/events-past/2022-04/Viveladifference_sponsors.png b/content/events/2022-04/Viveladifference_sponsors.png similarity index 100% rename from content/events/events-past/2022-04/Viveladifference_sponsors.png rename to content/events/2022-04/Viveladifference_sponsors.png diff --git a/content/events/events-past/2022-04/index.md b/content/events/2022-04/index.md similarity index 100% rename from content/events/events-past/2022-04/index.md rename to content/events/2022-04/index.md diff --git a/content/events/events-past/2022-04/myleon-unsplash-collaboration.jpg b/content/events/2022-04/myleon-unsplash-collaboration.jpg similarity index 100% rename from content/events/events-past/2022-04/myleon-unsplash-collaboration.jpg rename to content/events/2022-04/myleon-unsplash-collaboration.jpg diff --git a/content/events/events-past/2022-05/colour-circles-bg-unsplash.jpg b/content/events/2022-05/colour-circles-bg-unsplash.jpg similarity index 100% rename from content/events/events-past/2022-05/colour-circles-bg-unsplash.jpg rename to content/events/2022-05/colour-circles-bg-unsplash.jpg diff --git a/content/events/events-past/2022-05/index.md b/content/events/2022-05/index.md similarity index 100% rename from content/events/events-past/2022-05/index.md rename to content/events/2022-05/index.md diff --git a/content/events/events-past/2022-06/index.md b/content/events/2022-06/index.md similarity index 100% rename from content/events/events-past/2022-06/index.md rename to content/events/2022-06/index.md diff --git a/content/events/events-past/2022-06/sharon-mccutcheon-colourful-unsplash.jpg b/content/events/2022-06/sharon-mccutcheon-colourful-unsplash.jpg similarity index 100% rename from content/events/events-past/2022-06/sharon-mccutcheon-colourful-unsplash.jpg rename to content/events/2022-06/sharon-mccutcheon-colourful-unsplash.jpg diff --git a/content/events/events-past/2024-01/index.md b/content/events/2024-01/index.md similarity index 99% rename from content/events/events-past/2024-01/index.md rename to content/events/2024-01/index.md index e326dee4..d5ea9297 100644 --- a/content/events/events-past/2024-01/index.md +++ b/content/events/2024-01/index.md @@ -2,6 +2,7 @@ title: "2024 International Research Software Funders Workshop" subtitle: "Towards a monitoring framework to benchmark the ADORE.software recommendations and improve the sustainability of research software" date: "2024-01-23" + authors: - "" diff --git a/content/events/events-past/2024-10/chris-montgomery-smgTvepind4-unsplash.jpg b/content/events/2024-10/chris-montgomery-smgTvepind4-unsplash.jpg similarity index 100% rename from content/events/events-past/2024-10/chris-montgomery-smgTvepind4-unsplash.jpg rename to content/events/2024-10/chris-montgomery-smgTvepind4-unsplash.jpg diff --git a/content/events/events-past/2024-10/index.md b/content/events/2024-10/index.md similarity index 100% rename from content/events/events-past/2024-10/index.md rename to content/events/2024-10/index.md diff --git a/content/events/events-past/2025-02/2024-09-24-image.jpeg b/content/events/2025-02/2024-09-24-image.jpeg similarity index 100% rename from content/events/events-past/2025-02/2024-09-24-image.jpeg rename to content/events/2025-02/2024-09-24-image.jpeg diff --git a/content/events/events-past/2025-02/index.md b/content/events/2025-02/index.md similarity index 99% rename from content/events/events-past/2025-02/index.md rename to content/events/2025-02/index.md index fb137d0c..0c608b82 100644 --- a/content/events/events-past/2025-02/index.md +++ b/content/events/2025-02/index.md @@ -2,6 +2,7 @@ title: "Towards an international research software conference: Join our committees!" subtitle: "" date: "2025-02-11" + authors: - "" diff --git a/content/events/events-past/2025-03/9354.jpg b/content/events/2025-03/9354.jpg similarity index 100% rename from content/events/events-past/2025-03/9354.jpg rename to content/events/2025-03/9354.jpg diff --git a/content/events/events-past/2025-03/index.md b/content/events/2025-03/index.md similarity index 99% rename from content/events/events-past/2025-03/index.md rename to content/events/2025-03/index.md index b3028111..81204503 100644 --- a/content/events/events-past/2025-03/index.md +++ b/content/events/2025-03/index.md @@ -7,6 +7,7 @@ authors: categories: - Event + - Past summary: "Read more..." image: diff --git a/content/events/events-past/2025-04-15/index.md b/content/events/2025-04-15/index.md similarity index 100% rename from content/events/events-past/2025-04-15/index.md rename to content/events/2025-04-15/index.md diff --git a/content/events/events-past/2025-04-15/inrscon.jpg b/content/events/2025-04-15/inrscon.jpg similarity index 100% rename from content/events/events-past/2025-04-15/inrscon.jpg rename to content/events/2025-04-15/inrscon.jpg diff --git a/content/events/events-past/2025-04/Brisbane.jpg b/content/events/2025-04/Brisbane.jpg similarity index 100% rename from content/events/events-past/2025-04/Brisbane.jpg rename to content/events/2025-04/Brisbane.jpg diff --git a/content/events/events-past/2025-04/index.md b/content/events/2025-04/index.md similarity index 99% rename from content/events/events-past/2025-04/index.md rename to content/events/2025-04/index.md index 82ac700d..a9c53396 100644 --- a/content/events/events-past/2025-04/index.md +++ b/content/events/2025-04/index.md @@ -2,6 +2,7 @@ title: "Supporting Research Software in Research Policy and Funding Programs" subtitle: "" date: "2025-04-09" + authors: - "" diff --git a/content/events/events-current/2025-05/Global_meeting.jpg b/content/events/2025-05/Global_meeting.jpg similarity index 100% rename from content/events/events-current/2025-05/Global_meeting.jpg rename to content/events/2025-05/Global_meeting.jpg diff --git a/content/events/events-current/2025-05/index.md b/content/events/2025-05/index.md similarity index 99% rename from content/events/events-current/2025-05/index.md rename to content/events/2025-05/index.md index 955c726d..2d402c8d 100644 --- a/content/events/events-current/2025-05/index.md +++ b/content/events/2025-05/index.md @@ -2,6 +2,7 @@ title: "New ReSA forums advance global research software efforts" subtitle: "" date: "2025-05-16" +status: current authors: - "" diff --git a/content/events/events-current/2025-10/IRSC-Primary-Logo.png b/content/events/2025-10/IRSC-Primary-Logo.png similarity index 100% rename from content/events/events-current/2025-10/IRSC-Primary-Logo.png rename to content/events/2025-10/IRSC-Primary-Logo.png diff --git a/content/events/events-current/2025-10/index.md b/content/events/2025-10/index.md similarity index 98% rename from content/events/events-current/2025-10/index.md rename to content/events/2025-10/index.md index dad8407b..0de8a2a0 100644 --- a/content/events/events-current/2025-10/index.md +++ b/content/events/2025-10/index.md @@ -2,6 +2,7 @@ title: "International Research Software Conference" subtitle: "" date: "2025-10-15" +status: current authors: - "" diff --git a/content/events/_index.md b/content/events/_index.md index 755216be..1e36b7cb 100644 --- a/content/events/_index.md +++ b/content/events/_index.md @@ -1,6 +1,6 @@ --- -title: "Events" +title: "Current Events" date: 2025-05-22 -type: landing - ---- \ No newline at end of file +type: events +layout: list +--- diff --git a/content/events/events-current/_index.md b/content/events/events-current/_index.md deleted file mode 100644 index 25a0823a..00000000 --- a/content/events/events-current/_index.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: Research Software Alliance - Current Events -cms_exclude: true - -# View. -# 1 = List -# 2 = Compact -# 3 = Card -# 4 = Citation -view: 2 - -# Optional header image (relative to `static/media/` folder). -header: - caption: 'Please view our [past events](/events/resa-events-past).' - image: '' ---- - -
-
\ No newline at end of file diff --git a/content/events/events-past/_index.md b/content/events/events-past/_index.md deleted file mode 100644 index 0efa412a..00000000 --- a/content/events/events-past/_index.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Research Software Alliance - Past Events -cms_exclude: true - -# View. -# 1 = List -# 2 = Compact -# 3 = Card -# 4 = Citation -view: 2 - -# Optional header image (relative to `static/media/` folder). -header: - caption: '' - image: '' ---- \ No newline at end of file diff --git a/content/events/rse-ai-workshop/index.md b/content/events/rse-ai-workshop/index.md index 5d34aeb8..234f01d8 100644 --- a/content/events/rse-ai-workshop/index.md +++ b/content/events/rse-ai-workshop/index.md @@ -3,6 +3,10 @@ title: "Research Software Engineering in the Age of Generative AI: Building a Co date: 2025-12-15 type: landing +categories: + - Event + - Past + sections: - block: markdown content: diff --git a/content/past-events/_index.md b/content/past-events/_index.md new file mode 100644 index 00000000..22e5b3a8 --- /dev/null +++ b/content/past-events/_index.md @@ -0,0 +1,10 @@ +--- +title: Past Events +cms_exclude: true +type: past-events +layout: list + +header: + caption: '' + image: '' +--- \ No newline at end of file diff --git a/layouts/events/list.html b/layouts/events/list.html new file mode 100644 index 00000000..65a12527 --- /dev/null +++ b/layouts/events/list.html @@ -0,0 +1,75 @@ +{{ define "main" }} +
+
+
+ {{ with .Title }} +

{{ . }}

+ {{ end }} + + {{ with .Params.header.caption }} +

{{ . | markdownify }}

+ {{ end }} + + {{ .Content }} + + {{/* Display current/ongoing events */}} + {{/* Users set status: current for active events, status: past for completed ones */}} + + {{ $eventsSection := .Site.GetPage "/events" }} + {{ $allEventPages := $eventsSection.Pages }} + + {{/* Filter to only regular pages (exclude sections) with status: current */}} + {{ $regularPages := where $allEventPages "Kind" "page" }} + {{ $events := where $regularPages "Params.status" "current" }} + {{ $events = $events | first 100 }} + + + {{ if gt (len $events) 0 }} +
+ {{ range sort $events ".Date" "desc" }} + {{/* Skip _index pages */}} + {{ if ne .Kind "section" }} +
+
+
+ {{/* Main content on the left */}} +
+

+ {{ .Title }} +

+ {{ with .Params.subtitle }} +

{{ . }}

+ {{ end }} +
+ + {{ .Date.Format "January 2, 2006" }} + +
+ {{ with .Params.summary }} +
+ {{ . | markdownify | emojify }} +
+ {{ end }} +
+ {{/* Display event image on the right if available */}} + {{ $image := .Resources.GetMatch (.Params.image.filename | default "featured.*") }} + {{ if $image }} +
+ + {{ .Title }} + +
+ {{ end }} +
+
+
+ {{ end }} + {{ end }} +
+ {{ else }} +

No current events at this time.

+ {{ end }} +
+
+
+{{ end }} diff --git a/layouts/past-events/list.html b/layouts/past-events/list.html new file mode 100644 index 00000000..9df9431c --- /dev/null +++ b/layouts/past-events/list.html @@ -0,0 +1,74 @@ +{{ define "main" }} +
+
+
+ {{ with .Title }} +

{{ . }}

+ {{ end }} + + {{ with .Params.header.caption }} +

{{ . | markdownify }}

+ {{ end }} + + {{ .Content }} + + {{/* Display past/completed events */}} + {{/* Users set status: current for active events, status: past for completed ones */}} + + {{ $eventsSection := .Site.GetPage "/events" }} + {{ $allEventPages := $eventsSection.Pages }} + + {{/* Filter to only regular pages (exclude sections) without status: current */}} + {{ $regularPages := where $allEventPages "Kind" "page" }} + {{ $events := where $regularPages "Params.status" "ne" "current" }} + {{ $events = $events | first 100 }} + + {{ if gt (len $events) 0 }} +
+ {{ range sort $events ".Date" "desc" }} + {{/* Skip _index pages */}} + {{ if ne .Kind "section" }} +
+
+
+ {{/* Main content on the left */}} +
+

+ {{ .Title }} +

+ {{ with .Params.subtitle }} +

{{ . }}

+ {{ end }} +
+ + {{ .Date.Format "January 2, 2006" }} + +
+ {{ with .Params.summary }} +
+ {{ . | markdownify | emojify }} +
+ {{ end }} +
+ {{/* Display event image on the right if available */}} + {{ $image := .Resources.GetMatch (.Params.image.filename | default "featured.*") }} + {{ if $image }} +
+ + {{ .Title }} + +
+ {{ end }} +
+
+
+ {{ end }} + {{ end }} +
+ {{ else }} +

No past events found.

+ {{ end }} +
+
+
+{{ end }} diff --git a/readme.md b/readme.md index df3d4544..13b93f41 100644 --- a/readme.md +++ b/readme.md @@ -73,6 +73,77 @@ administrator to adopt the changes. In order to add SASS or CSS rules, add them into `assets/scss/custom.scss`. This is compiled into wowchemy.css in the `head`. +### Events + +Events are managed using a simple `status` field. Events marked as `current` appear on the main Events page, while all others appear on Past Events. + +#### Creating a New Event + +**Via GitHub Web Interface:** + +1. Go to [`content/events/`](https://github.com/researchsoft/website/tree/main/content/events) in the repository +2. Click **Add file** → **Create new file** +3. Name your file: `YYYY-MM-event-name/index.md` (e.g., `2026-09-conference/index.md`) + - The folder name should include the date and be descriptive + - Always end with `/index.md` + +4. Copy this template into the file: + ```yaml + --- + title: "Your Event Title" + subtitle: "" + date: "2026-09-15" + status: current + authors: + - "" + categories: + - Event + - Ongoing + summary: "Brief one-line description that appears on the events list." + image: + preview_only: true + filename: "event-logo.png" + draft: false + --- + + Full event description goes here. Include all details, links, and information about the event. + ``` + +5. **Customize the frontmatter** (the section between `---`): + - `title`: Your event name + - `date`: Event date in `YYYY-MM-DD` format + - `status: current` means it appears on the main Events page + - `summary`: One sentence that shows up in the list view + - `image.filename`: Optional - name of logo/image file (see below) + +6. If you have an event logo or image: + - After creating the index.md, go back to your event folder + - Click **Add file** → **Upload files** + - Upload your image (PNG, JPG recommended) + - Make sure the filename matches what you put in `image.filename` + +7. Commit your changes with a message like "Add [Event Name] event" + +#### Moving an Event from Current to Past + +When an event has concluded: + +1. Navigate to the event's `index.md` file in GitHub (e.g., `content/events/2026-09-conference/index.md`) +2. Click the pencil icon (Edit this file) +3. Find the line that says `status: current` +4. Change it to `status: past` OR delete the entire line +5. Optionally, change the category from `Ongoing` to `Past` +6. Scroll down and commit: "Move [Event Name] to past events" + +The event will now appear on the Past Events page instead of the main Events page. **No files need to be moved** - events stay in the same folder. + +#### Quick Reference + +- **Current events**: Have `status: current` in frontmatter → show on `/events/` +- **Past events**: Have `status: past` or no status field → show on `/past-events/` +- **Event images**: Optional, placed in same folder as index.md, displayed on the right side of event cards +- **All events** live in `content/events/` regardless of status + ## Extra information Due to limitations in the version of Hugo that Netlify runs,