From 27cb8d814e11296ae05cd1e12d2a9fb1bb3965af Mon Sep 17 00:00:00 2001 From: Hari Sood Date: Tue, 23 Jan 2024 18:15:10 +0000 Subject: [PATCH 1/6] Lots of small updates --- .DS_Store | Bin 8196 -> 6148 bytes assets/sass/main.scss | 2 +- assets/sass/styles.scss | 22 +++-- config/_default/config.yaml | 8 +- config/_default/params.yaml | 7 +- content/about/_index.md | 7 ++ content/about/focus/_index.md | 10 +++ content/about/governance/_index.md | 10 +++ content/about/index.md | 5 -- content/about/people/_index.md | 10 +++ content/about/story/_index.md | 10 +++ layouts/_default/about/index.html | 31 +++++++ layouts/_default/index.html | 4 +- layouts/partials/blurb.html | 2 +- layouts/partials/menu.html | 0 static/favicon.svg | 140 +++++++++++++++++++++++++++++ 16 files changed, 251 insertions(+), 17 deletions(-) create mode 100644 content/about/_index.md create mode 100644 content/about/focus/_index.md create mode 100644 content/about/governance/_index.md delete mode 100644 content/about/index.md create mode 100644 content/about/people/_index.md create mode 100644 content/about/story/_index.md create mode 100644 layouts/_default/about/index.html delete mode 100644 layouts/partials/menu.html create mode 100644 static/favicon.svg diff --git a/.DS_Store b/.DS_Store index 7c55d0445db97078243b720010bc8f4dceff7d3c..107ab29bda63f3550fa55c742f88e129bbb1116b 100644 GIT binary patch delta 116 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jGxXU^g=(&t@KhwTzQFh4d!p z3sr5F7M5Y0Skkqaor6P=8K@cv1h|2OD@fzU!tczJ`DHvo#xO8Jj0D-jusNP*4l@9? C!xN_f delta 277 zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7Z0TH}hr%jz7$c**Q2SHn1=X zZsuWG%c#%7kiwA2P{NStnUkNKl#`zX(gnnhKs@h17ywxe3@i+p42BFAlO5PZm>A|w zUdL*w$-|JxkPpk&_MRq70yt+{p?oVw{Y1P={=e=ULCpCBY4Jk1NP?n*}+(Gf(Ch@to|>!@ +

{{ .Title }}

+

{{ .Description }}

+ +
+
+ {{ range .Site.Taxonomies.tags.about }} +
+
+
+

+ + {{ .Title }} + +

+

+ {{ with .Params.description }} + {{ . }} + {{ else }} + {{ .Summary | truncate 200 }} + {{ end }} +

+
+
+
+ {{ end }} +
+
+{{ end }} \ No newline at end of file diff --git a/layouts/_default/index.html b/layouts/_default/index.html index a3ef554..9c28058 100644 --- a/layouts/_default/index.html +++ b/layouts/_default/index.html @@ -3,7 +3,7 @@
- Bootstrap + UK TRE Logo

Welcome to the UK TRE Community!

{{ .Site.Params.Description }}

@@ -25,6 +25,6 @@

Welcome to the UK TRE Community!

{{ partial "contact" . }} -
+
{{ end }} \ No newline at end of file diff --git a/layouts/partials/blurb.html b/layouts/partials/blurb.html index e761b87..b61836b 100644 --- a/layouts/partials/blurb.html +++ b/layouts/partials/blurb.html @@ -8,6 +8,6 @@

Who we are

- +
\ No newline at end of file diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html deleted file mode 100644 index e69de29..0000000 diff --git a/static/favicon.svg b/static/favicon.svg new file mode 100644 index 0000000..55547c4 --- /dev/null +++ b/static/favicon.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 22bb62cbd4bddf28f04e413d809c92177e606554 Mon Sep 17 00:00:00 2001 From: Hari Sood Date: Tue, 30 Jan 2024 12:53:28 +0000 Subject: [PATCH 2/6] Events page --- .vscode/settings.json | 4 ++ config/_default/config.yaml | 4 ++ content/events/_index.md | 7 ++ content/events/past/december_meeting.md | 9 +++ content/events/upcoming/march_meeting.md | 11 +++ content/events/upcoming/test_event.md | 22 ++++++ layouts/_default/about/index.html | 35 +++++----- layouts/_default/events/index.html | 88 ++++++++++++++++++++++++ layouts/partials/actions.html | 2 +- 9 files changed, 164 insertions(+), 18 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 content/events/_index.md create mode 100644 content/events/past/december_meeting.md create mode 100644 content/events/upcoming/march_meeting.md create mode 100644 content/events/upcoming/test_event.md create mode 100644 layouts/_default/events/index.html diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..564f1dc --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "files.autoSave": "onFocusChange", + "editor.formatOnSave": true +} \ No newline at end of file diff --git a/config/_default/config.yaml b/config/_default/config.yaml index 05dc6e8..5db4c4e 100644 --- a/config/_default/config.yaml +++ b/config/_default/config.yaml @@ -5,8 +5,12 @@ theme: hugo-bootstrap-theme themesdir: node_modules/@filipecarneiro copyright: Add our licence +# Build all pages that have a frontmatter date setting of the future - this allows us to publish pages for events happening in the future +buildFuture: true + # Taxonomies taxonomies: tag: tags + category: categories \ No newline at end of file diff --git a/content/events/_index.md b/content/events/_index.md new file mode 100644 index 0000000..515a05c --- /dev/null +++ b/content/events/_index.md @@ -0,0 +1,7 @@ +--- +title: Community events +layout: events/index +description: See what events we have coming up, and access notes, slides and recordings from previous events +url: /events +--- + diff --git a/content/events/past/december_meeting.md b/content/events/past/december_meeting.md new file mode 100644 index 0000000..e06f6f9 --- /dev/null +++ b/content/events/past/december_meeting.md @@ -0,0 +1,9 @@ +--- +title: "UK TRE Community December quarterly meeting" +description: "The quarterly meeting for the community, including community updates, breakout discussions and project workshops, hosted online" +date: "2024-12-04" +draft: false +url: events/decembermeeting +tags: +- past_event +--- \ No newline at end of file diff --git a/content/events/upcoming/march_meeting.md b/content/events/upcoming/march_meeting.md new file mode 100644 index 0000000..5cfae31 --- /dev/null +++ b/content/events/upcoming/march_meeting.md @@ -0,0 +1,11 @@ +--- +title: "UK TRE Community March quarterly meeting" +description: "The quarterly meeting for the community, including community updates, breakout discussions and project workshops, hosted online" +date: "2024-03-01" +draft: false +url: events/marchmeeting +tags: +- upcoming_event +--- + +# UK TRE Community March quarterly meeting diff --git a/content/events/upcoming/test_event.md b/content/events/upcoming/test_event.md new file mode 100644 index 0000000..9eec953 --- /dev/null +++ b/content/events/upcoming/test_event.md @@ -0,0 +1,22 @@ +--- +title: "Test event" +description: "A different test event" +register_url: "https://example.com" +draft: false +url: events/test +tags: +- upcoming_event +--- + +# Test meeting +**Date**: 1st March 2024 09:00 + +**Host**: Simon Li (Dundee) + +**Registration details**: xxx + +## Description + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + + diff --git a/layouts/_default/about/index.html b/layouts/_default/about/index.html index 2511577..283c8cd 100644 --- a/layouts/_default/about/index.html +++ b/layouts/_default/about/index.html @@ -6,25 +6,26 @@

{{ .Title }}

- {{ range .Site.Taxonomies.tags.about }} -
-
-
-

- - {{ .Title }} - -

-

- {{ with .Params.description }} - {{ . }} - {{ else }} - {{ .Summary | truncate 200 }} - {{ end }} -

-
+ {{ range .Site.Taxonomies.tags.about }} +
+
+
+

+ + {{ .Title }} + +

+ +

+ {{ with .Params.description }} + {{ . }} + {{ else }} + {{ .Summary | truncate 200 }} + {{ end }} +

+
{{ end }}
diff --git a/layouts/_default/events/index.html b/layouts/_default/events/index.html new file mode 100644 index 0000000..b2a0d90 --- /dev/null +++ b/layouts/_default/events/index.html @@ -0,0 +1,88 @@ +{{ define "main" }} + +
+

{{ .Title }}

+

{{ .Description }}

+
+
+

Upcoming events

+
+ {{ range .Site.Taxonomies.tags.upcoming_event }} +
+
+
+

+ + {{ .Title }} + +

+
{{ .Date | time.Format ":date_long" }}
+

+ {{ with .Params.description }} + {{ . }} + {{ else }} + {{ .Summary | truncate 200 }} + {{ end }} +

+ + Register + +

+ + More info + +

+
+ +
+
+ {{ end }} +
+
+
+

Past events

+
+
+

+ +

+
+
+
+ {{ range .Site.Taxonomies.tags.past_event }} +
+
+
+

+ + {{ .Title }} + +

+
{{ .Date | time.Format + ":date_long" }}
+

+ {{ with .Params.description }} + {{ . }} + {{ else }} + {{ .Summary | truncate 200 }} + {{ end }} +

+ + More info + +
+ +
+
+ {{ end }} +
+
+
+
+ +
+
+{{ end }} \ No newline at end of file diff --git a/layouts/partials/actions.html b/layouts/partials/actions.html index fc25f83..28a3cf4 100644 --- a/layouts/partials/actions.html +++ b/layouts/partials/actions.html @@ -7,7 +7,7 @@

Events

We run quarterly community meetings, as well as ad hoc events. See what's coming up!

- + From aa400d68c83faf039905ea608db62101a542648d Mon Sep 17 00:00:00 2001 From: Hari Sood Date: Tue, 30 Jan 2024 13:28:13 +0000 Subject: [PATCH 3/6] Updates plus MarkDown template for events --- content/events/past/december_meeting.md | 20 +++++++++++++++++--- content/events/upcoming/march_meeting.md | 16 ++++++++++++++-- content/events/upcoming/test_event.md | 22 ---------------------- layouts/_default/events/index.html | 21 +++++++++++++++++---- templates/event.md | 24 ++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 31 deletions(-) delete mode 100644 content/events/upcoming/test_event.md create mode 100644 templates/event.md diff --git a/content/events/past/december_meeting.md b/content/events/past/december_meeting.md index e06f6f9..5abd3a2 100644 --- a/content/events/past/december_meeting.md +++ b/content/events/past/december_meeting.md @@ -1,9 +1,23 @@ --- title: "UK TRE Community December quarterly meeting" description: "The quarterly meeting for the community, including community updates, breakout discussions and project workshops, hosted online" -date: "2024-12-04" +date: "2023-12-05T13:30:00" +end_date: "2023-12-05T17:00:00" +location: "Online" +register_url: "https://example.com" draft: false -url: events/decembermeeting +url: events/december_23_community_meeting tags: - past_event ---- \ No newline at end of file +--- + +# UK TRE Community December quarterly meeting +**Date**: 5th December 2023 13:30 - 17:00 + +**Host**: UK TRE Community + +**Registration details**: https://example.com + +## Description + +[ADD DESCRIPTION BELOW] \ No newline at end of file diff --git a/content/events/upcoming/march_meeting.md b/content/events/upcoming/march_meeting.md index 5cfae31..b7ce7f5 100644 --- a/content/events/upcoming/march_meeting.md +++ b/content/events/upcoming/march_meeting.md @@ -1,11 +1,23 @@ --- title: "UK TRE Community March quarterly meeting" description: "The quarterly meeting for the community, including community updates, breakout discussions and project workshops, hosted online" -date: "2024-03-01" +date: "2024-03-01T09:00:00" +end_date: "2024-03-01T10:00:00" +location: "Online" +register_url: "https://example.com" draft: false -url: events/marchmeeting +url: events/march_24_community_meeting tags: - upcoming_event --- # UK TRE Community March quarterly meeting +**Date**: 1st March 2024 09:00 - 17:00 + +**Host**: UK TRE Community + +**Registration details**: https://example.com + +## Description + +[ADD DESCRIPTION BELOW] \ No newline at end of file diff --git a/content/events/upcoming/test_event.md b/content/events/upcoming/test_event.md deleted file mode 100644 index 9eec953..0000000 --- a/content/events/upcoming/test_event.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: "Test event" -description: "A different test event" -register_url: "https://example.com" -draft: false -url: events/test -tags: -- upcoming_event ---- - -# Test meeting -**Date**: 1st March 2024 09:00 - -**Host**: Simon Li (Dundee) - -**Registration details**: xxx - -## Description - -Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. - - diff --git a/layouts/_default/events/index.html b/layouts/_default/events/index.html index b2a0d90..7ee25e6 100644 --- a/layouts/_default/events/index.html +++ b/layouts/_default/events/index.html @@ -16,7 +16,14 @@

{{ .Title }}

-
{{ .Date | time.Format ":date_long" }}
+
+ Date: {{ .Date | time.Format "January 01, 2006, 15:00 PM" }} - {{ .Params.end_date | + time.Format + "15:00 PM" }} +
+
+ Location: {{ .Params.location }} +

{{ with .Params.description }} {{ . }} @@ -61,8 +68,14 @@

{{ .Title }}

-
{{ .Date | time.Format - ":date_long" }}
+
+ Date: {{ .Date | time.Format "January 01, 2006, 15:00 PM" }} - {{ + .Params.end_date | + time.Format "15:00 PM" }} +
+
+ Location: {{ .Params.location }} +

{{ with .Params.description }} {{ . }} @@ -71,7 +84,7 @@

{{ .Date | time.Format {{ end }}

- More info + More info & resources diff --git a/templates/event.md b/templates/event.md new file mode 100644 index 0000000..98d6f4d --- /dev/null +++ b/templates/event.md @@ -0,0 +1,24 @@ +--- +title: "" +description: "" +date: "" +end_date: "" +register_url: " +tags: +- upcoming_event +--- + +# [INSERT TITLE OF EVENT] +**Date**: [ADD DATE AND TIME OF EVENT] + +**Host**: [ADD HOST OF EVENT] + +**Registration details**: [ADD REGISTRATION DETAILS AND LINK] + +## Description + +[ADD DESCRIPTION BELOW] + + From 0cb2d66107b120d1b7f7455a645e133449259881 Mon Sep 17 00:00:00 2001 From: Hari Sood Date: Tue, 30 Jan 2024 18:17:47 +0000 Subject: [PATCH 4/6] Working groups pages --- assets/sass/styles.scss | 2 +- config/_default/menus.yaml | 2 +- content/about/focus/{_index.md => index.md} | 1 + .../about/governance/{_index.md => index.md} | 0 content/about/people/{_index.md => index.md} | 0 content/about/story/{_index.md => index.md} | 0 content/groups/_index.md | 7 ++ .../current/sde_tre_terminology/_index.md | 14 +++ .../current/sde_tre_terminology/charter.md | 8 ++ .../current/sde_tre_terminology/events.md | 16 +++ .../current/sde_tre_terminology/members.md | 15 +++ .../current/sde_tre_terminology/outputs.md | 11 ++ .../current/sde_tre_terminology/resources.md | 17 +++ content/groups/current/test_group/_index.md | 13 +++ content/groups/current/test_group/charter.md | 8 ++ content/groups/current/test_group/events.md | 16 +++ content/groups/current/test_group/members.md | 15 +++ content/groups/current/test_group/outputs.md | 11 ++ .../groups/current/test_group/resources.md | 17 +++ .../groups/past/david_appreciation/_index.md | 12 ++ .../groups/past/david_appreciation/charter.md | 8 ++ .../groups/past/david_appreciation/events.md | 16 +++ .../groups/past/david_appreciation/members.md | 15 +++ .../groups/past/david_appreciation/outputs.md | 11 ++ .../past/david_appreciation/resources.md | 17 +++ layouts/_default/events/index.html | 4 +- layouts/_default/groups/group_page.html | 107 ++++++++++++++++++ layouts/_default/groups/index.html | 92 +++++++++++++++ templates/event.md | 4 +- 29 files changed, 453 insertions(+), 6 deletions(-) rename content/about/focus/{_index.md => index.md} (99%) rename content/about/governance/{_index.md => index.md} (100%) rename content/about/people/{_index.md => index.md} (100%) rename content/about/story/{_index.md => index.md} (100%) create mode 100644 content/groups/_index.md create mode 100644 content/groups/current/sde_tre_terminology/_index.md create mode 100644 content/groups/current/sde_tre_terminology/charter.md create mode 100644 content/groups/current/sde_tre_terminology/events.md create mode 100644 content/groups/current/sde_tre_terminology/members.md create mode 100644 content/groups/current/sde_tre_terminology/outputs.md create mode 100644 content/groups/current/sde_tre_terminology/resources.md create mode 100644 content/groups/current/test_group/_index.md create mode 100644 content/groups/current/test_group/charter.md create mode 100644 content/groups/current/test_group/events.md create mode 100644 content/groups/current/test_group/members.md create mode 100644 content/groups/current/test_group/outputs.md create mode 100644 content/groups/current/test_group/resources.md create mode 100644 content/groups/past/david_appreciation/_index.md create mode 100644 content/groups/past/david_appreciation/charter.md create mode 100644 content/groups/past/david_appreciation/events.md create mode 100644 content/groups/past/david_appreciation/members.md create mode 100644 content/groups/past/david_appreciation/outputs.md create mode 100644 content/groups/past/david_appreciation/resources.md create mode 100644 layouts/_default/groups/group_page.html create mode 100644 layouts/_default/groups/index.html diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 2d606b7..0288ff4 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -15,7 +15,7 @@ padding: .75rem 0; background-color: var(--primary-colour); background-image: linear-gradient(to bottom, rgba(var(--bd-violet-rgb), 1), rgba(var(--bd-violet-rgb), 0.95)); - box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15); + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); } // --- diff --git a/config/_default/menus.yaml b/config/_default/menus.yaml index 6e00452..03dfc13 100644 --- a/config/_default/menus.yaml +++ b/config/_default/menus.yaml @@ -13,7 +13,7 @@ main: weight: 20 - name: Working Groups - url: workinggroups + url: groups weight: 30 - name: Events diff --git a/content/about/focus/_index.md b/content/about/focus/index.md similarity index 99% rename from content/about/focus/_index.md rename to content/about/focus/index.md index d35df92..ad15f6e 100644 --- a/content/about/focus/_index.md +++ b/content/about/focus/index.md @@ -8,3 +8,4 @@ tags: --- # Current focus + diff --git a/content/about/governance/_index.md b/content/about/governance/index.md similarity index 100% rename from content/about/governance/_index.md rename to content/about/governance/index.md diff --git a/content/about/people/_index.md b/content/about/people/index.md similarity index 100% rename from content/about/people/_index.md rename to content/about/people/index.md diff --git a/content/about/story/_index.md b/content/about/story/index.md similarity index 100% rename from content/about/story/_index.md rename to content/about/story/index.md diff --git a/content/groups/_index.md b/content/groups/_index.md new file mode 100644 index 0000000..5815075 --- /dev/null +++ b/content/groups/_index.md @@ -0,0 +1,7 @@ +--- +title: Working groups +layout: groups/index +description: Our current and past working groups +url: /groups +--- + diff --git a/content/groups/current/sde_tre_terminology/_index.md b/content/groups/current/sde_tre_terminology/_index.md new file mode 100644 index 0000000..9c385e2 --- /dev/null +++ b/content/groups/current/sde_tre_terminology/_index.md @@ -0,0 +1,14 @@ +--- +title: "SDE/TRE Terminology Working Group" +description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." +chairs: +- Pete Barnsley (Francis Crick Institute) +- Madalyn Hardaker (KCL) +draft: false +url: groups/sde_tre_terminology +layout: groups/group_page +tags: +- current_wg +--- + + diff --git a/content/groups/current/sde_tre_terminology/charter.md b/content/groups/current/sde_tre_terminology/charter.md new file mode 100644 index 0000000..79af595 --- /dev/null +++ b/content/groups/current/sde_tre_terminology/charter.md @@ -0,0 +1,8 @@ +--- +title: "Charter" +--- +# Charter + +testestestestest + +## asdsadsa diff --git a/content/groups/current/sde_tre_terminology/events.md b/content/groups/current/sde_tre_terminology/events.md new file mode 100644 index 0000000..e17ef38 --- /dev/null +++ b/content/groups/current/sde_tre_terminology/events.md @@ -0,0 +1,16 @@ +--- +title: "Events and meetings" +--- +# Events and meetings + +## Meetings + +Meetings take place on X at Y. + +Fill out [this form]() to register interest to be invited to this working group's meetings. +The chairs will review your response and get in touch. + +## Events + +The groups upcoming events are listed below: + diff --git a/content/groups/current/sde_tre_terminology/members.md b/content/groups/current/sde_tre_terminology/members.md new file mode 100644 index 0000000..8e01ced --- /dev/null +++ b/content/groups/current/sde_tre_terminology/members.md @@ -0,0 +1,15 @@ +--- +title: "Members" +--- + +# Members + +## Chairs + +- Pete Barnsley (Francis Crick Institute) +- Madalyn Hardaker (KCL) + +## Other members + +- Test +- Test \ No newline at end of file diff --git a/content/groups/current/sde_tre_terminology/outputs.md b/content/groups/current/sde_tre_terminology/outputs.md new file mode 100644 index 0000000..df909ca --- /dev/null +++ b/content/groups/current/sde_tre_terminology/outputs.md @@ -0,0 +1,11 @@ +--- +title: "Final outputs" +--- + +# Final outputs + +## [RESOURCE 1] + +**Type:** + +**Link:** \ No newline at end of file diff --git a/content/groups/current/sde_tre_terminology/resources.md b/content/groups/current/sde_tre_terminology/resources.md new file mode 100644 index 0000000..42262e4 --- /dev/null +++ b/content/groups/current/sde_tre_terminology/resources.md @@ -0,0 +1,17 @@ +--- +title: "Resources" +--- + +# Resources + +## [RESOURCE 1] + +**Type:** + +**Link:** + +## [RESOURCE 1] + +**Type:** + +**Link:** \ No newline at end of file diff --git a/content/groups/current/test_group/_index.md b/content/groups/current/test_group/_index.md new file mode 100644 index 0000000..8ccaa9f --- /dev/null +++ b/content/groups/current/test_group/_index.md @@ -0,0 +1,13 @@ +--- +title: "Test" +description: "Test" +chairs: +- Hari Sood +draft: false +url: groups/test +layout: groups/group_page +tags: +- current_wg +--- + + diff --git a/content/groups/current/test_group/charter.md b/content/groups/current/test_group/charter.md new file mode 100644 index 0000000..79af595 --- /dev/null +++ b/content/groups/current/test_group/charter.md @@ -0,0 +1,8 @@ +--- +title: "Charter" +--- +# Charter + +testestestestest + +## asdsadsa diff --git a/content/groups/current/test_group/events.md b/content/groups/current/test_group/events.md new file mode 100644 index 0000000..e17ef38 --- /dev/null +++ b/content/groups/current/test_group/events.md @@ -0,0 +1,16 @@ +--- +title: "Events and meetings" +--- +# Events and meetings + +## Meetings + +Meetings take place on X at Y. + +Fill out [this form]() to register interest to be invited to this working group's meetings. +The chairs will review your response and get in touch. + +## Events + +The groups upcoming events are listed below: + diff --git a/content/groups/current/test_group/members.md b/content/groups/current/test_group/members.md new file mode 100644 index 0000000..8e01ced --- /dev/null +++ b/content/groups/current/test_group/members.md @@ -0,0 +1,15 @@ +--- +title: "Members" +--- + +# Members + +## Chairs + +- Pete Barnsley (Francis Crick Institute) +- Madalyn Hardaker (KCL) + +## Other members + +- Test +- Test \ No newline at end of file diff --git a/content/groups/current/test_group/outputs.md b/content/groups/current/test_group/outputs.md new file mode 100644 index 0000000..df909ca --- /dev/null +++ b/content/groups/current/test_group/outputs.md @@ -0,0 +1,11 @@ +--- +title: "Final outputs" +--- + +# Final outputs + +## [RESOURCE 1] + +**Type:** + +**Link:** \ No newline at end of file diff --git a/content/groups/current/test_group/resources.md b/content/groups/current/test_group/resources.md new file mode 100644 index 0000000..42262e4 --- /dev/null +++ b/content/groups/current/test_group/resources.md @@ -0,0 +1,17 @@ +--- +title: "Resources" +--- + +# Resources + +## [RESOURCE 1] + +**Type:** + +**Link:** + +## [RESOURCE 1] + +**Type:** + +**Link:** \ No newline at end of file diff --git a/content/groups/past/david_appreciation/_index.md b/content/groups/past/david_appreciation/_index.md new file mode 100644 index 0000000..4684a9c --- /dev/null +++ b/content/groups/past/david_appreciation/_index.md @@ -0,0 +1,12 @@ +--- +title: "David Sarmiento Appreciation Working Group" +description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." +chairs: +- David Sarmiento (Alan Turing Institute) +- Hari Sood (Alan Turing Institute) +draft: false +url: groups/ds_appreciation +layout: groups/group_page +tags: +- past_wg +--- \ No newline at end of file diff --git a/content/groups/past/david_appreciation/charter.md b/content/groups/past/david_appreciation/charter.md new file mode 100644 index 0000000..79af595 --- /dev/null +++ b/content/groups/past/david_appreciation/charter.md @@ -0,0 +1,8 @@ +--- +title: "Charter" +--- +# Charter + +testestestestest + +## asdsadsa diff --git a/content/groups/past/david_appreciation/events.md b/content/groups/past/david_appreciation/events.md new file mode 100644 index 0000000..e17ef38 --- /dev/null +++ b/content/groups/past/david_appreciation/events.md @@ -0,0 +1,16 @@ +--- +title: "Events and meetings" +--- +# Events and meetings + +## Meetings + +Meetings take place on X at Y. + +Fill out [this form]() to register interest to be invited to this working group's meetings. +The chairs will review your response and get in touch. + +## Events + +The groups upcoming events are listed below: + diff --git a/content/groups/past/david_appreciation/members.md b/content/groups/past/david_appreciation/members.md new file mode 100644 index 0000000..8e01ced --- /dev/null +++ b/content/groups/past/david_appreciation/members.md @@ -0,0 +1,15 @@ +--- +title: "Members" +--- + +# Members + +## Chairs + +- Pete Barnsley (Francis Crick Institute) +- Madalyn Hardaker (KCL) + +## Other members + +- Test +- Test \ No newline at end of file diff --git a/content/groups/past/david_appreciation/outputs.md b/content/groups/past/david_appreciation/outputs.md new file mode 100644 index 0000000..df909ca --- /dev/null +++ b/content/groups/past/david_appreciation/outputs.md @@ -0,0 +1,11 @@ +--- +title: "Final outputs" +--- + +# Final outputs + +## [RESOURCE 1] + +**Type:** + +**Link:** \ No newline at end of file diff --git a/content/groups/past/david_appreciation/resources.md b/content/groups/past/david_appreciation/resources.md new file mode 100644 index 0000000..42262e4 --- /dev/null +++ b/content/groups/past/david_appreciation/resources.md @@ -0,0 +1,17 @@ +--- +title: "Resources" +--- + +# Resources + +## [RESOURCE 1] + +**Type:** + +**Link:** + +## [RESOURCE 1] + +**Type:** + +**Link:** \ No newline at end of file diff --git a/layouts/_default/events/index.html b/layouts/_default/events/index.html index 7ee25e6..908b28d 100644 --- a/layouts/_default/events/index.html +++ b/layouts/_default/events/index.html @@ -51,8 +51,8 @@

Past events

-

diff --git a/layouts/_default/groups/group_page.html b/layouts/_default/groups/group_page.html new file mode 100644 index 0000000..2f244f7 --- /dev/null +++ b/layouts/_default/groups/group_page.html @@ -0,0 +1,107 @@ +{{ define "main" }} + +
+

{{ .Title }}

+

{{ .Description }}

+
+ +
+
+
+ {{ with .GetPage "charter" }} +

+ +

+
+
+
+ {{ .Content }} +
+
+
+ {{ end }} +
+
+ {{ with .GetPage "members" }} +

+ +

+
+
+
+ + {{ .Content }} + +
+
+
+ {{ end }} +
+
+ {{ with .GetPage "events" }} +

+ +

+
+
+
+ + {{ .Content }} + +
+
+
+ {{ end }} +
+
+ {{ with .GetPage "resources" }} +

+ + +

+
+
+
+ {{ .Content }} + +
+
+
+ {{ end }} +
+
+ {{ with .GetPage "outputs" }} +

+ + +

+
+
+
+ {{ .Content }} + +
+
+
+ {{ end }} +
+
+ + + +{{ end }} \ No newline at end of file diff --git a/layouts/_default/groups/index.html b/layouts/_default/groups/index.html new file mode 100644 index 0000000..427e052 --- /dev/null +++ b/layouts/_default/groups/index.html @@ -0,0 +1,92 @@ +{{ define "main" }} + +
+

{{ .Title }}

+

{{ .Description }}

+

+ If you would like to start a working group, or learn more about how our working groups work, + please see our working groups governance documentation. +

+ + Working groups information + +
+
+

Current working groups

+
+
    + {{ range .Site.Taxonomies.tags.current_wg }} +
  • +
    +
    +
    +

    Title

    +
    +
    +

    Chair(s)

    +
    +
    + + {{ .Title}} + +
    +
    + {{ range .Params.chairs }} + {{ . }}
    + {{ end }} +
    +
    +
    +
    • + {{ end }} +
+
+
+
+

Past working groups

+
+
+

+ +

+
+
+
+
    + {{ range .Site.Taxonomies.tags.past_wg }} +
  • +
    +
    +
    +

    Title

    +
    +
    +

    Chair(s)

    +
    +
    + + {{ .Title}} + +
    +
    + {{ range .Params.chairs }} + {{ . }}
    + {{ end }} +
    +
    +
    +
    • + + {{ end }} +
+
+
+
+
+ +
+
+{{ end }} \ No newline at end of file diff --git a/templates/event.md b/templates/event.md index 98d6f4d..60a7d44 100644 --- a/templates/event.md +++ b/templates/event.md @@ -1,8 +1,8 @@ --- title: "" description: "" -date: "" -end_date: "" +date: "" +end_date: "" register_url: " From 4fc91a8ff90405aa7be8be5eed4ac6cd12d996bd Mon Sep 17 00:00:00 2001 From: Hari Sood Date: Tue, 30 Jan 2024 18:21:13 +0000 Subject: [PATCH 5/6] Fixing heading rendering in accordions (commented out main heading) --- content/groups/current/sde_tre_terminology/charter.md | 10 +++++++--- content/groups/current/sde_tre_terminology/events.md | 2 +- content/groups/current/sde_tre_terminology/members.md | 2 +- content/groups/current/sde_tre_terminology/outputs.md | 2 +- .../groups/current/sde_tre_terminology/resources.md | 2 +- content/groups/current/test_group/charter.md | 2 +- content/groups/current/test_group/events.md | 2 +- content/groups/current/test_group/members.md | 2 +- content/groups/current/test_group/outputs.md | 2 +- content/groups/current/test_group/resources.md | 2 +- content/groups/past/david_appreciation/events.md | 2 +- content/groups/past/david_appreciation/members.md | 2 +- content/groups/past/david_appreciation/outputs.md | 2 +- content/groups/past/david_appreciation/resources.md | 2 +- 14 files changed, 20 insertions(+), 16 deletions(-) diff --git a/content/groups/current/sde_tre_terminology/charter.md b/content/groups/current/sde_tre_terminology/charter.md index 79af595..7c08425 100644 --- a/content/groups/current/sde_tre_terminology/charter.md +++ b/content/groups/current/sde_tre_terminology/charter.md @@ -1,8 +1,12 @@ --- title: "Charter" --- -# Charter + -testestestestest +## Background -## asdsadsa +xxxxx + +## Targets + +xxxx diff --git a/content/groups/current/sde_tre_terminology/events.md b/content/groups/current/sde_tre_terminology/events.md index e17ef38..96144ab 100644 --- a/content/groups/current/sde_tre_terminology/events.md +++ b/content/groups/current/sde_tre_terminology/events.md @@ -1,7 +1,7 @@ --- title: "Events and meetings" --- -# Events and meetings + ## Meetings diff --git a/content/groups/current/sde_tre_terminology/members.md b/content/groups/current/sde_tre_terminology/members.md index 8e01ced..7947bb9 100644 --- a/content/groups/current/sde_tre_terminology/members.md +++ b/content/groups/current/sde_tre_terminology/members.md @@ -2,7 +2,7 @@ title: "Members" --- -# Members + ## Chairs diff --git a/content/groups/current/sde_tre_terminology/outputs.md b/content/groups/current/sde_tre_terminology/outputs.md index df909ca..b3e040b 100644 --- a/content/groups/current/sde_tre_terminology/outputs.md +++ b/content/groups/current/sde_tre_terminology/outputs.md @@ -2,7 +2,7 @@ title: "Final outputs" --- -# Final outputs + ## [RESOURCE 1] diff --git a/content/groups/current/sde_tre_terminology/resources.md b/content/groups/current/sde_tre_terminology/resources.md index 42262e4..4ad9245 100644 --- a/content/groups/current/sde_tre_terminology/resources.md +++ b/content/groups/current/sde_tre_terminology/resources.md @@ -2,7 +2,7 @@ title: "Resources" --- -# Resources + ## [RESOURCE 1] diff --git a/content/groups/current/test_group/charter.md b/content/groups/current/test_group/charter.md index 79af595..13cb53c 100644 --- a/content/groups/current/test_group/charter.md +++ b/content/groups/current/test_group/charter.md @@ -1,7 +1,7 @@ --- title: "Charter" --- -# Charter + testestestestest diff --git a/content/groups/current/test_group/events.md b/content/groups/current/test_group/events.md index e17ef38..96144ab 100644 --- a/content/groups/current/test_group/events.md +++ b/content/groups/current/test_group/events.md @@ -1,7 +1,7 @@ --- title: "Events and meetings" --- -# Events and meetings + ## Meetings diff --git a/content/groups/current/test_group/members.md b/content/groups/current/test_group/members.md index 8e01ced..7947bb9 100644 --- a/content/groups/current/test_group/members.md +++ b/content/groups/current/test_group/members.md @@ -2,7 +2,7 @@ title: "Members" --- -# Members + ## Chairs diff --git a/content/groups/current/test_group/outputs.md b/content/groups/current/test_group/outputs.md index df909ca..b3e040b 100644 --- a/content/groups/current/test_group/outputs.md +++ b/content/groups/current/test_group/outputs.md @@ -2,7 +2,7 @@ title: "Final outputs" --- -# Final outputs + ## [RESOURCE 1] diff --git a/content/groups/current/test_group/resources.md b/content/groups/current/test_group/resources.md index 42262e4..4ad9245 100644 --- a/content/groups/current/test_group/resources.md +++ b/content/groups/current/test_group/resources.md @@ -2,7 +2,7 @@ title: "Resources" --- -# Resources + ## [RESOURCE 1] diff --git a/content/groups/past/david_appreciation/events.md b/content/groups/past/david_appreciation/events.md index e17ef38..ef90a1f 100644 --- a/content/groups/past/david_appreciation/events.md +++ b/content/groups/past/david_appreciation/events.md @@ -1,7 +1,7 @@ --- title: "Events and meetings" --- -# Events and meetings + ## Meetings diff --git a/content/groups/past/david_appreciation/members.md b/content/groups/past/david_appreciation/members.md index 8e01ced..7947bb9 100644 --- a/content/groups/past/david_appreciation/members.md +++ b/content/groups/past/david_appreciation/members.md @@ -2,7 +2,7 @@ title: "Members" --- -# Members + ## Chairs diff --git a/content/groups/past/david_appreciation/outputs.md b/content/groups/past/david_appreciation/outputs.md index df909ca..b3e040b 100644 --- a/content/groups/past/david_appreciation/outputs.md +++ b/content/groups/past/david_appreciation/outputs.md @@ -2,7 +2,7 @@ title: "Final outputs" --- -# Final outputs + ## [RESOURCE 1] diff --git a/content/groups/past/david_appreciation/resources.md b/content/groups/past/david_appreciation/resources.md index 42262e4..4ad9245 100644 --- a/content/groups/past/david_appreciation/resources.md +++ b/content/groups/past/david_appreciation/resources.md @@ -2,7 +2,7 @@ title: "Resources" --- -# Resources + ## [RESOURCE 1] From 0658b257a3c29e3dc61fb13f04ec78d780093799 Mon Sep 17 00:00:00 2001 From: Hari Sood Date: Wed, 31 Jan 2024 17:45:29 +0000 Subject: [PATCH 6/6] Resources and get involved --- config/_default/config.yaml | 2 + content/getinvolved/_index.md | 6 +++ .../current/sde_tre_terminology/charter.md | 2 +- layouts/_default/events/index.html | 2 +- layouts/_default/getinvolved/index.html | 47 +++++++++++++++++++ layouts/_default/index.html | 26 +++++----- layouts/partials/actions.html | 6 +-- layouts/partials/contact.html | 2 +- templates/resources.md | 37 +++++++++++++++ 9 files changed, 111 insertions(+), 19 deletions(-) create mode 100644 content/getinvolved/_index.md create mode 100644 layouts/_default/getinvolved/index.html create mode 100644 templates/resources.md diff --git a/config/_default/config.yaml b/config/_default/config.yaml index 5db4c4e..a46403a 100644 --- a/config/_default/config.yaml +++ b/config/_default/config.yaml @@ -12,5 +12,7 @@ buildFuture: true taxonomies: tag: tags category: categories + tag_resource_type: tag_resource_types + tag_resource_topic: tag_resource_topics \ No newline at end of file diff --git a/content/getinvolved/_index.md b/content/getinvolved/_index.md new file mode 100644 index 0000000..4c53152 --- /dev/null +++ b/content/getinvolved/_index.md @@ -0,0 +1,6 @@ +--- +title: Get Involved +layout: getinvolved/index +description: Great to have you here! Please see the different ways you can get involved below +url: /getinvolved +--- diff --git a/content/groups/current/sde_tre_terminology/charter.md b/content/groups/current/sde_tre_terminology/charter.md index 7c08425..2bf3a97 100644 --- a/content/groups/current/sde_tre_terminology/charter.md +++ b/content/groups/current/sde_tre_terminology/charter.md @@ -5,7 +5,7 @@ title: "Charter" ## Background -xxxxx +xxxx ## Targets diff --git a/layouts/_default/events/index.html b/layouts/_default/events/index.html index 908b28d..51e4ebd 100644 --- a/layouts/_default/events/index.html +++ b/layouts/_default/events/index.html @@ -31,7 +31,7 @@
{{ .Summary | truncate 200 }} {{ end }}

- + Register

diff --git a/layouts/_default/getinvolved/index.html b/layouts/_default/getinvolved/index.html new file mode 100644 index 0000000..df7b082 --- /dev/null +++ b/layouts/_default/getinvolved/index.html @@ -0,0 +1,47 @@ +{{ define "main" }} + +

+

{{ .Title }}

+

{{ .Description }}

+
+ +
+
+
+ + + +

Join the mailing list

+

Our primary source for community announcements and discussions

+ Join + list +
+
+ + + +

Chat to us on Slack

+

A more informal space for working groups and community members to chat directly

+ Join + Slack +
+
+ + + +

Star our repos

+

We have a GitHub organisation, where we track all community tasks and discuss thorny issues

+ Star GitHub + repos +
+
+
+ +
+ Or send us an email. +
+ +{{ end }} \ No newline at end of file diff --git a/layouts/_default/index.html b/layouts/_default/index.html index 9c28058..a62498c 100644 --- a/layouts/_default/index.html +++ b/layouts/_default/index.html @@ -1,30 +1,30 @@ {{ define "main" }}
-
-
- UK TRE Logo -

Welcome to the UK TRE Community!

-

{{ .Site.Params.Description }}

- -
+
+
+ UK TRE Logo +

Welcome to the UK TRE Community!

+

{{ .Site.Params.Description }}

+ Get involved
-
+
+
-{{ partial "features" . }} + {{ partial "features" . }}
-{{ partial "blurb" . }} + {{ partial "blurb" . }}
-{{ partial "actions" . }} + {{ partial "actions" . }}
- {{ partial "contact" . }} -
+ {{ partial "contact" . }} + {{ end }} \ No newline at end of file diff --git a/layouts/partials/actions.html b/layouts/partials/actions.html index 28a3cf4..01a5250 100644 --- a/layouts/partials/actions.html +++ b/layouts/partials/actions.html @@ -9,7 +9,7 @@

Events

- + Go to events
@@ -20,7 +20,7 @@

Resources

See what resources the community has created

- + Explore resources
@@ -31,7 +31,7 @@

Working groups

See what work is currently taking place in the community, as well as past and planned working groups

- + See working groups \ No newline at end of file diff --git a/layouts/partials/contact.html b/layouts/partials/contact.html index 51c3424..01ec23a 100644 --- a/layouts/partials/contact.html +++ b/layouts/partials/contact.html @@ -1,7 +1,7 @@

Get involved

We'd love for you to get involved with the community!

-

See the Get Involved page for details on how to start with the community.

+

See the Get Involved page for details on how to start with the community.

Or simply use the button below to sign up for our mailing list to keep up with the latest developments!

\ No newline at end of file diff --git a/templates/resources.md b/templates/resources.md new file mode 100644 index 0000000..2b9bcf9 --- /dev/null +++ b/templates/resources.md @@ -0,0 +1,37 @@ +--- +title: "" +description: "" +owners: +- +- (optional - complete or delete) +- (optional - complete or delete) +url: resources/ +tags: +- resource +tag_resource_types: +- +- (optional - complete or delete) +- (optional - complete or delete) +tag_resource_topics: +-