Initial reorganization to merge upcoming and past events into a singl…

…e page
ideas-productivity · Nov 1, 2023 · b90992f · b90992f
1 parent ed1489c
commit b90992f
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 76 deletions.
diff --git a/_data/nav-config.yml b/_data/nav-config.yml
@@ -31,8 +31,8 @@ toc:
     subfolderitems:
       - page: Events
         url: /resources/events.html
-      - page: Past Events
-        url: /resources/past-events.html
+      - page: Events by Series
+        url: /resources/series.html
       - page: Tools and Practices
         url: /resources/tools-and-practices.html
   - title: join the community!

diff --git a/_includes/_events/events-list.html b/_includes/_events/events-list.html
@@ -34,7 +34,7 @@
 
 		{% if include.title %}
 			<div class="list-title">
-				<h1 class="list-title">{{ include.title }}</h1>
+				<h1 id="{{ include.title | slugify }}" class="list-title">{{ include.title }}</h1>
 				<hr>
 			</div>
 		{% endif %}

diff --git a/events.md b/events.md
diff --git a/resources.md b/resources.md
@@ -12,9 +12,9 @@ title: "Resources"
 The IDEAS Productivity project organizes many events for the communities in which they participate.  Events are organized into several series, some of which are ongoing, others of which may have concluded.
 
 
-[Upcoming Events and Ongoing Series](/resources/events)
+[Upcoming and Past Events](/resources/events)
 
-[Past Events (All Series)](/resources/past-events)
+[Events by Series](/resources/series)
 
 # Tools and practices
 

diff --git a/resources/concluded-series b/resources/concluded-series
diff --git a/resources/events.md b/resources/events.md
@@ -5,12 +5,14 @@ layout: page
 title: "Events"
 
 ---
-Events organized by the IDEAS Productivity project are organized into several series, some of which are ongoing, others of which may have concluded.  Select a series to see events in that particular series.  Scroll down for the complete list of upcoming events and a link to past events and concluded series.
+Events organized by the IDEAS Productivity project are organized into several series.  Select a series to see events in that particular series.  Scroll down for the complete lists of [upcoming](#upcoming-events) and [past](#past-events) events.
 
-{% include_relative ongoing-series %}
+{% include_relative series-teaser %}
 
 <!-- Event List -->
 
-{% include _events/events-list.html %}
-{% include text-biglink.html blurb = 'See past events and concluded series' url = '/resources/past-events' pushleft = 'TRUE'
-%}
+{% include _events/events-list.html 
+    title = "Upcoming events" %}
+
+{% 	include _events/events-list.html past=true 
+    title = "Past events" %}
diff --git a/resources/past-events.md b/resources/past-events.md
diff --git a/resources/ongoing-series → resources/series-teaser b/resources/ongoing-series → resources/series-teaser
@@ -1,7 +1,7 @@
-<!-- Ongoing Series -->
+<!-- Event Series -->
 
 {% 	include teasers-4x_noimg.html 
-		group-title = "Ongoing Series"
+		group-title = "Event series"
         group-linktext = include.linktext
         group-linkurl = include.linkurl
 
@@ -21,4 +21,10 @@
 		title4 = "Strategies for Working Remotely"
 		url4 = "/series/strategies-for-working-remotely"
 		blurb4 = "Exploring strategies for working remotely, with emphasis on how HPC teams can be effective and efficient in long-term hybrid settings."
-%}
+%}
+
+{% comment %}
+	title5 = "Performance Portability & ECP"
+	url5 = "/series/performance-portability-ecp"
+	blurb5 = "Experiences of projects in the Exascale Computing Project Application Development with performance portability -- how they've handled it and the outcomes they've realized."
+{% endcomment %}
diff --git a/resources/series.md b/resources/series.md
@@ -0,0 +1,14 @@
+---
+
+layout: page
+
+title: "Event Series"
+
+---
+
+Events organized by the IDEAS Productivity project are organized into several series.  Select a series to see events in that particular series or follow the links to the main events page for all upcoming or past events.
+
+{% include_relative series-teaser
+	linktext = "see full list of events"
+	linkurl = "/resources/events"
+%}
diff --git a/series.md b/series.md
@@ -5,18 +5,10 @@ layout: page
 title: "Event Series"
 
 ---
-<!-- 
-	This page has been added primarily to satisfy the link to "series" that will show up in breadcrumbs when a visitor is looking at a particular series.  It intentionally does not appear on the site navigation.  We prefer to focus on the Events and Past Events pages. -
--->
 
-Events organized by the IDEAS Productivity project are organized into several series, some of which are ongoing, others of which may have concluded.  Select a series to see events in that particular series or follow the links to the main pages for all upcoming or past events.
+Events organized by the IDEAS Productivity project are organized into several series.  Select a series to see events in that particular series or follow the links to the main events page for all upcoming or past events.
 
-{% include_relative resources/ongoing-series
-	linktext = "see upcoming events"
+{% include_relative resources/series-teaser
+	linktext = "see full list of events"
 	linkurl = "/resources/events"
 %}
-
-{% include_relative resources/concluded-series 
-	linktext = "see past events"
-	linkurl = "/resources/past-events"
-%}