diff --git a/_data/contributors.yml b/_data/contributors.yml index c1bb9c4f..b1fe99a1 100644 --- a/_data/contributors.yml +++ b/_data/contributors.yml @@ -12,7 +12,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: leahawasser mastodon: https://fosstodon.org/@leahawasser orcidid: 0000-0002-8177-6550 @@ -170,7 +170,7 @@ deia_advisory: false editorial_board: emeritus_editor: - advisory: false + advisory: true emeritus_advisory: twitter: mastodon: @@ -315,7 +315,7 @@ editorial_board: emeritus_editor: true advisory: true - emeritus_advisory: true + emeritus_advisory: false twitter: xmnlab mastodon: orcidid: 0000-0001-5049-4289 @@ -394,9 +394,9 @@ date_added: '2023-01-18' deia_advisory: false editorial_board: - emeritus_editor: - advisory: true - emeritus_advisory: + emeritus_editor: false + advisory: false + emeritus_advisory: true twitter: mastodon: orcidid: @@ -423,7 +423,7 @@ editorial_board: emeritus_editor: advisory: false - emeritus_advisory: + emeritus_advisory: true twitter: lindsey_jh mastodon: orcidid: @@ -534,7 +534,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: arianemsasso mastodon: orcidid: @@ -651,7 +651,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: mastodon: orcidid: @@ -721,7 +721,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: underdarkGIS mastodon: orcidid: @@ -824,7 +824,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: mastodon: orcidid: @@ -2572,7 +2572,7 @@ editorial_board: false emeritus_editor: true advisory: false - emeritus_advisory: true + emeritus_advisory: false twitter: jbencook mastodon: orcidid: @@ -5799,7 +5799,7 @@ github_image_id: 709020 title: - Editor - sort: 1 + sort: 2 bio: organization: date_added: @@ -6976,12 +6976,12 @@ github_username: NimaSarajpoor github_image_id: 38519522 title: - sort: + sort: 2 bio: Data Scientist | OSS Contributor | Philomath organization: date_added: '2024-07-04' deia_advisory: false - editorial_board: + editorial_board: true emeritus_editor: advisory: false emeritus_advisory: diff --git a/_data/navigation.yml b/_data/navigation.yml index 5615adbd..c455da31 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -34,6 +34,8 @@ main: url: "learn.html" - title: Blog url: "/blog/index.html" + - title: Events + url: "/events/index.html" - title: Ask a question url: "https://pyopensci.discourse.group/" icon: "fa-brands fa-discourse" diff --git a/_includes/archive-cards.html b/_includes/archive-cards.html index bfa8497f..cd1961b6 100644 --- a/_includes/archive-cards.html +++ b/_includes/archive-cards.html @@ -1,15 +1,23 @@
- {% if post.feature_img %} - {{ post.feature_alt }} + {% if post.header.overlay_image %} +
+ {% if post.feature_img %} + {{ post.feature_alt }} + {% endif %} +
+ {% else %} +
+
{% endif %} -
-

{{ post.title | markdownify | strip_html }}

+
+

{{ post.title | markdownify | strip_html }}

+
-

{{ post.excerpt | truncate: 180}}

+

{{ post.excerpt }}

diff --git a/_includes/event-cards.html b/_includes/event-cards.html new file mode 100644 index 00000000..ec2e41c2 --- /dev/null +++ b/_includes/event-cards.html @@ -0,0 +1,33 @@ +
+ + + +
diff --git a/_layouts/posts_events.html b/_layouts/posts_events.html new file mode 100644 index 00000000..b589ede7 --- /dev/null +++ b/_layouts/posts_events.html @@ -0,0 +1,70 @@ +--- +layout: archive +--- + + +{{ content }} + + +

Upcoming events

+ +{% assign all_events = site.posts + | where_exp: "item", "item.hidden != true" + | where_exp: "item", "item.categories contains 'events'" +%} + +{% capture nowunix %}{{'now' | date: '%s'}}{% endcapture %} + +{% for post in all_events %} + + {% assign start_date = post.event.start_date | date: "%Y-%m-%d" %} + {% capture posttime %}{{ start_date | date: '%s'}}{% endcapture %} + + {% if posttime > nowunix %} +
+ {% include event-cards.html %} +
+ {% endif %} + +{% endfor %} + + +

Past events

+ + + +{% assign entries_layout = page.entries_layout | default: 'list' %} +{% assign eventsByYear = site.posts + | where_exp: "item", "item.hidden != true" + | where_exp: "item", "item.categories contains 'events'" + | group_by_exp: 'post', 'post.event.start_date | date: "%Y"' +%} + +{% for year in eventsByYear %} +
+

{{ year.name }}

+
+ {% for post in year.items %} + {% capture posttime %}{{ post.event.start_date | date: '%s'}}{% endcapture %} + {% if posttime < nowunix %} + {% include event-cards.html %} + {% endif %} + {% endfor %} +
+ {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ +
+{% endfor %} diff --git a/_layouts/posts_gallery.html b/_layouts/posts_gallery.html index 57daa0f2..dba9173e 100644 --- a/_layouts/posts_gallery.html +++ b/_layouts/posts_gallery.html @@ -15,6 +15,10 @@ {% endfor %} +{% assign color_counter = 0 %} +{% assign color_max = 4 %} + + {% assign entries_layout = page.entries_layout | default: 'list' %} {% assign postsByYear = site.posts | where_exp: "item", "item.hidden != true" | group_by_exp: 'post', 'post.date | date: "%Y"' %} {% for year in postsByYear %} @@ -22,7 +26,14 @@

{{ year.name }}

{% for post in year.items %} - {% include archive-cards.html %} + {% unless post.header.overlay_image %} + {% assign color_counter = color_counter | plus: 1 %} + {% if color_counter == color_max %} + + {% assign color_counter = 0 %} + {% endif %} + {% endunless %} + {% include archive-cards.html color_counter=color_counter %} {% endfor %}
{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ diff --git a/_pages/blog.md b/_pages/blog.md index 6d25e357..1622cd32 100644 --- a/_pages/blog.md +++ b/_pages/blog.md @@ -7,10 +7,11 @@ excerpt: "Here we will both post updates about pyOpenSci and also highlight cont header: overlay_color: "#666" overlay_filter: 0.6 + overlay_image: images/headers/pyopensci-learn-header.png author_profile: false --- -## Recent pyOpenSci Posts! +## Recent pyOpenSci Posts