From b7fc78ec93fabb8597864d843cf9f4e0f54eeb95 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Thu, 22 Jun 2023 10:12:38 +0200 Subject: [PATCH 1/5] rename maintainers to editorial board --- _layouts/topic.html | 8 ++++---- _plugins/api.rb | 6 +++--- _plugins/jekyll-topic-filter.rb | 2 +- bin/schema-topic.yaml | 2 +- bin/validate-frontmatter.rb | 2 +- metadata/covid19.yaml | 2 +- metadata/one-health.yaml | 2 +- metadata/swagger.yaml | 4 ++-- topics/admin/metadata.yaml | 2 +- topics/ai4life/metadata.yaml | 2 +- topics/assembly/metadata.yaml | 2 +- topics/climate/metadata.yaml | 2 +- topics/computational-chemistry/metadata.yaml | 2 +- topics/contributing/metadata.yaml | 2 +- .../contributing/tutorials/create-new-topic/tutorial.md | 4 ++-- topics/data-science/metadata.yaml | 2 +- topics/dev/metadata.yaml | 2 +- topics/ecology/metadata.yaml | 2 +- topics/epigenetics/metadata.yaml | 2 +- topics/evolution/metadata.yaml | 2 +- topics/fair/metadata.yaml | 2 +- topics/galaxy-interface/metadata.yaml | 2 +- topics/genome-annotation/metadata.yaml | 2 +- topics/imaging/metadata.yaml | 2 +- topics/introduction/metadata.yaml | 2 +- topics/metabolomics/metadata.yaml | 2 +- topics/metagenomics/metadata.yaml | 2 +- topics/proteomics/metadata.yaml | 2 +- topics/sequence-analysis/metadata.yaml | 2 +- topics/single-cell/metadata.yaml | 2 +- topics/statistics/metadata.yaml | 2 +- topics/synthetic-biology/metadata.yaml | 2 +- topics/teaching/metadata.yaml | 2 +- topics/transcriptomics/metadata.yaml | 2 +- topics/variant-analysis/metadata.yaml | 2 +- topics/visualisation/metadata.yaml | 2 +- 36 files changed, 43 insertions(+), 43 deletions(-) diff --git a/_layouts/topic.html b/_layouts/topic.html index 1531be1398c9fc..2c23576d05a94e 100644 --- a/_layouts/topic.html +++ b/_layouts/topic.html @@ -61,10 +61,10 @@

Frequently Asked Questions

Common questions regarding this topic have been collected on a dedicated FAQ page . Common questions related to specific tutorials can be accessed from the tutorials themselves. {% endunless %} -

Maintainers

-

This material is maintained by:

- {% assign maintainers = topic.maintainers | sorted %} - {% include _includes/contributor-list.html contributors=maintainers badge=true %} +

Editorial Board

+

This material is reviewed by our Editorial Board:

+ {% assign editorial_board = topic.editorial_board | sorted %} + {% include _includes/contributor-list.html contributors=editorial_board badge=true %}

For any question related to this topic and the content, you can contact them or visit our Gitter channel. diff --git a/_plugins/api.rb b/_plugins/api.rb index 84cec4b80b8bf3..7082b6e176ec1a 100644 --- a/_plugins/api.rb +++ b/_plugins/api.rb @@ -221,7 +221,7 @@ def generate(site) q end - out['maintainers'] = out['maintainers'].map { |c| mapContributor(site, c) } + out['editorial_board'] = out['editorial_board'].map { |c| mapContributor(site, c) } page2 = PageWithoutAFile.new(site, '', 'api/topics/', "#{topic}.json") page2.content = JSON.pretty_generate(out) @@ -233,14 +233,14 @@ def generate(site) puts '[GTN/API] Topics' # Individual Topic Indexes site.data.each_pair do |k, v| - if v.is_a?(Hash) && v.key?('type') && v.key?('maintainers') + if v.is_a?(Hash) && v.key?('type') && v.key?('editorial_board') topics[k] = { 'name' => v['name'], 'title' => v['title'], 'summary' => v['summary'], 'url' => site.config['url'] + site.config['baseurl'] + "/api/topics/#{k}.json", - 'maintainers' => v['maintainers'].map { |c| mapContributor(site, c) } + 'editorial_board' => v['editorial_board'].map { |c| mapContributor(site, c) } } end end diff --git a/_plugins/jekyll-topic-filter.rb b/_plugins/jekyll-topic-filter.rb index f379a767d66302..ce1b97dadd347b 100644 --- a/_plugins/jekyll-topic-filter.rb +++ b/_plugins/jekyll-topic-filter.rb @@ -13,7 +13,7 @@ module TopicFilter # Returns: # +Array+:: The list of topics def self.list_topics(site) - site.data.select { |_k, v| v.is_a?(Hash) && v.key?('maintainers') }.map { |k, _v| k } + site.data.select { |_k, v| v.is_a?(Hash) && v.key?('editorial_board') }.map { |k, _v| k } end ## diff --git a/bin/schema-topic.yaml b/bin/schema-topic.yaml index 57fa508d07de22..14eb36f51b1092 100644 --- a/bin/schema-topic.yaml +++ b/bin/schema-topic.yaml @@ -97,7 +97,7 @@ mapping: description: | `false` to hide your topic from the production GTN. This is useful if you need a topic for a workshop, but have not finished making it up to GTN standards. - maintainers: + editorial_board: type: seq required: true sequence: diff --git a/bin/validate-frontmatter.rb b/bin/validate-frontmatter.rb index 9a0d47181806b7..c29dfb577b412d 100755 --- a/bin/validate-frontmatter.rb +++ b/bin/validate-frontmatter.rb @@ -227,7 +227,7 @@ def self.run .grep_v(/schema-*/) .select do |x| d = YAML.load_file(x) - d.key? 'maintainers' or d.key? 'summary' or d.key? 'type' + d.key? 'editorial_board' or d.key? 'summary' or d.key? 'type' end errors += materials.map { |x| [x, lint_topic(x)] } diff --git a/metadata/covid19.yaml b/metadata/covid19.yaml index 19d413f6badd1b..9f3bd6a2c13deb 100644 --- a/metadata/covid19.yaml +++ b/metadata/covid19.yaml @@ -5,7 +5,7 @@ title: "SARS-CoV-2" summary: "Tutorials covering analysis of SARS-CoV-2 (COVID 19)" tag_based: true -maintainers: +editorial_board: - wm75 gitter: galaxyproject/sars-cov-2 diff --git a/metadata/one-health.yaml b/metadata/one-health.yaml index 1d3318befdf45c..a1e1c287a16921 100644 --- a/metadata/one-health.yaml +++ b/metadata/one-health.yaml @@ -7,7 +7,7 @@ summary: | tag_based: true -maintainers: +editorial_board: - wm75 - pvanheus - TKlingstrom diff --git a/metadata/swagger.yaml b/metadata/swagger.yaml index 8cd35c1d79feac..79072c35108e13 100644 --- a/metadata/swagger.yaml +++ b/metadata/swagger.yaml @@ -344,7 +344,7 @@ components: summary: type: string description: A human readable description of the topic's contents. - maintainers: + editorial_board: $ref: '#/components/schemas/ArrayOfUsers' TopicDetail: type: object @@ -383,7 +383,7 @@ components: description: type: string description: A helpful subtopic description. - maintainers: + editorial_board: $ref: '#/components/schemas/ArrayOfUsers' materials: type: array diff --git a/topics/admin/metadata.yaml b/topics/admin/metadata.yaml index 82bffb987c6f5a..05629b543fdde3 100644 --- a/topics/admin/metadata.yaml +++ b/topics/admin/metadata.yaml @@ -32,7 +32,7 @@ subtopics: title: "Deprecated Tutorials" description: "Please do not run these. They are outdated and for historical, archival purposes only." -maintainers: +editorial_board: - hexylena - natefoo - slugger70 diff --git a/topics/ai4life/metadata.yaml b/topics/ai4life/metadata.yaml index f80e07994280e5..b41ac96f24a4fe 100644 --- a/topics/ai4life/metadata.yaml +++ b/topics/ai4life/metadata.yaml @@ -12,7 +12,7 @@ summary: | logo: /training-material/topics/ai4life/images/AI4Life-logo_neg_giraffe-solid.png logo_alt: "Giraffe icon. AI 4 life" -maintainers: +editorial_board: - beatrizserrano edam_ontology: ["topic_3382"] diff --git a/topics/assembly/metadata.yaml b/topics/assembly/metadata.yaml index 56f9b6994faa12..5011f9f6fe34a8 100644 --- a/topics/assembly/metadata.yaml +++ b/topics/assembly/metadata.yaml @@ -16,7 +16,7 @@ requirements: tutorials: - quality-control -maintainers: +editorial_board: - slugger70 - nekrut - delphine-l diff --git a/topics/climate/metadata.yaml b/topics/climate/metadata.yaml index 274a48bcbd475e..5880143ce6bb15 100644 --- a/topics/climate/metadata.yaml +++ b/topics/climate/metadata.yaml @@ -7,5 +7,5 @@ requirements: - type: internal topic_name: introduction docker_image: '' -maintainers: +editorial_board: - annefou diff --git a/topics/computational-chemistry/metadata.yaml b/topics/computational-chemistry/metadata.yaml index 5b5e53e79256a4..d83375a6332ad4 100644 --- a/topics/computational-chemistry/metadata.yaml +++ b/topics/computational-chemistry/metadata.yaml @@ -11,7 +11,7 @@ requirements: type: "internal" topic_name: introduction -maintainers: +editorial_board: - chrisbarnettster - tsenapathi - simonbray diff --git a/topics/contributing/metadata.yaml b/topics/contributing/metadata.yaml index 0d2d5f8f202fd5..b1b26c6ecb2a71 100644 --- a/topics/contributing/metadata.yaml +++ b/topics/contributing/metadata.yaml @@ -24,6 +24,6 @@ subtopics: title: "Contributing through GitHub" description: "How to collaborate with the GTN" -maintainers: +editorial_board: - bebatut - bgruening diff --git a/topics/contributing/tutorials/create-new-topic/tutorial.md b/topics/contributing/tutorials/create-new-topic/tutorial.md index ac009a9d0ca5ae..9d2fb33809e4a8 100644 --- a/topics/contributing/tutorials/create-new-topic/tutorial.md +++ b/topics/contributing/tutorials/create-new-topic/tutorial.md @@ -206,7 +206,7 @@ For tag based topics, first ensure that all of the relevant tutorials share a si ## Defining the topic -Compare with other topic level metadata files in the `metadata/` directory of the training material. Then create a file of your own naming the topic and providing maintainers and so on. We will use the Covid-19 synthetic topic as an example: +Compare with other topic level metadata files in the `metadata/` directory of the training material. Then create a file of your own naming the topic and providing editorial board members and so on. We will use the Covid-19 synthetic topic as an example: ``` --- @@ -216,7 +216,7 @@ title: "SARS-CoV-2" summary: "Tutorials covering analysis of SARS-CoV-2 (COVID 19)" tag_based: true -maintainers: +editorial_board: - wm75 gitter: galaxyproject/sars-cov-2 diff --git a/topics/data-science/metadata.yaml b/topics/data-science/metadata.yaml index 03207a0f2ff1a4..8daf2b876c7bbe 100644 --- a/topics/data-science/metadata.yaml +++ b/topics/data-science/metadata.yaml @@ -28,7 +28,7 @@ subtopics: title: "Scientific Workflow Management Systems" description: "Here you can find brief tutorials on a couple different workflow engines that you might encounter in the wild." -maintainers: +editorial_board: - hexylena - shiltemann - fpsom diff --git a/topics/dev/metadata.yaml b/topics/dev/metadata.yaml index a2fe73ca224632..ad64adc4a0dc61 100644 --- a/topics/dev/metadata.yaml +++ b/topics/dev/metadata.yaml @@ -6,7 +6,7 @@ summary: "Galaxy is an open-source project. Everyone can contribute to its devel edam_ontology: ["topic_3372"] docker_image: "quay.io/galaxy/dev-training" requirements: -maintainers: +editorial_board: - lecorguille - bebatut - hexylena diff --git a/topics/ecology/metadata.yaml b/topics/ecology/metadata.yaml index 0b8f22944d0d33..b68517ea7389c6 100644 --- a/topics/ecology/metadata.yaml +++ b/topics/ecology/metadata.yaml @@ -11,7 +11,7 @@ requirements: type: "internal" topic_name: introduction -maintainers: +editorial_board: - yvanlebras references: diff --git a/topics/epigenetics/metadata.yaml b/topics/epigenetics/metadata.yaml index e77787bbbfb864..52a7d0823c8955 100644 --- a/topics/epigenetics/metadata.yaml +++ b/topics/epigenetics/metadata.yaml @@ -17,7 +17,7 @@ requirements: - quality-control - mapping -maintainers: +editorial_board: - lldelisle - heylf - joachimwolff diff --git a/topics/evolution/metadata.yaml b/topics/evolution/metadata.yaml index 30993e8224655f..98de81d91ba8a9 100644 --- a/topics/evolution/metadata.yaml +++ b/topics/evolution/metadata.yaml @@ -7,7 +7,7 @@ requirements: - type: internal topic_name: introduction docker_image: '' -maintainers: +editorial_board: - cstritt - pvanheus edam_ontology: ["topic_3299"] diff --git a/topics/fair/metadata.yaml b/topics/fair/metadata.yaml index 471fb85dda6858..c4c284eb71024a 100644 --- a/topics/fair/metadata.yaml +++ b/topics/fair/metadata.yaml @@ -12,7 +12,7 @@ subtopics: title: "Make workflows FAIR with RO-Crate" description: "This section brought to you by the BY-COVID project, and will teach you how to make your research objects more FAIR with practical, hands-on advice." -maintainers: +editorial_board: - simleo - ilveroluca - stain diff --git a/topics/galaxy-interface/metadata.yaml b/topics/galaxy-interface/metadata.yaml index 84a27eb7dc056c..5071040f57f695 100644 --- a/topics/galaxy-interface/metadata.yaml +++ b/topics/galaxy-interface/metadata.yaml @@ -26,6 +26,6 @@ subtopics: title: "Download and free up space" description: "Once you are done with your analyses in Galaxy, it's time to download your data and free up space." -maintainers: +editorial_board: - jennaj - hexylena diff --git a/topics/genome-annotation/metadata.yaml b/topics/genome-annotation/metadata.yaml index 8dc431b5e990b7..4859688c5ea9e8 100644 --- a/topics/genome-annotation/metadata.yaml +++ b/topics/genome-annotation/metadata.yaml @@ -13,7 +13,7 @@ requirements: - type: "internal" topic_name: introduction -maintainers: +editorial_board: - hexylena - slugger70 - abretaud diff --git a/topics/imaging/metadata.yaml b/topics/imaging/metadata.yaml index 9cf55c13329fed..db155013ec2b17 100644 --- a/topics/imaging/metadata.yaml +++ b/topics/imaging/metadata.yaml @@ -9,7 +9,7 @@ requirements: - type: "internal" topic_name: introduction -maintainers: +editorial_board: - thomaswollmann references: - diff --git a/topics/introduction/metadata.yaml b/topics/introduction/metadata.yaml index e7e994f0160cb3..70e37536fafdf3 100644 --- a/topics/introduction/metadata.yaml +++ b/topics/introduction/metadata.yaml @@ -7,7 +7,7 @@ docker_image: "quay.io/galaxy/introduction-training" requirements: -maintainers: +editorial_board: - jennaj - tnabtaf diff --git a/topics/metabolomics/metadata.yaml b/topics/metabolomics/metadata.yaml index 4913dfb4796ed8..57925036ce385f 100644 --- a/topics/metabolomics/metadata.yaml +++ b/topics/metabolomics/metadata.yaml @@ -10,7 +10,7 @@ requirements: type: internal topic_name: introduction -maintainers: +editorial_board: - lecorguille - melpetera - foellmelanie diff --git a/topics/metagenomics/metadata.yaml b/topics/metagenomics/metadata.yaml index 484247939f821d..f5741aeacaf1b7 100644 --- a/topics/metagenomics/metadata.yaml +++ b/topics/metagenomics/metadata.yaml @@ -11,7 +11,7 @@ requirements: type: "internal" topic_name: introduction -maintainers: +editorial_board: - bebatut - shiltemann diff --git a/topics/proteomics/metadata.yaml b/topics/proteomics/metadata.yaml index 6a031ed8180efb..b16a9f16be4dc2 100644 --- a/topics/proteomics/metadata.yaml +++ b/topics/proteomics/metadata.yaml @@ -11,7 +11,7 @@ requirements: type: "internal" topic_name: introduction -maintainers: +editorial_board: - foellmelanie - subinamehta - pratikdjagtap diff --git a/topics/sequence-analysis/metadata.yaml b/topics/sequence-analysis/metadata.yaml index f9cd28aa3e6eb2..9287db16d9cef9 100644 --- a/topics/sequence-analysis/metadata.yaml +++ b/topics/sequence-analysis/metadata.yaml @@ -10,7 +10,7 @@ requirements: type: "internal" topic_name: introduction -maintainers: +editorial_board: - yvanlebras - bebatut - joachimwolff diff --git a/topics/single-cell/metadata.yaml b/topics/single-cell/metadata.yaml index d9003d6775c15d..cfbf21b10c5454 100644 --- a/topics/single-cell/metadata.yaml +++ b/topics/single-cell/metadata.yaml @@ -14,7 +14,7 @@ requirements: type: "internal" topic_name: introduction -maintainers: +editorial_board: - nomadscientist - mtekman - pavanvidem diff --git a/topics/statistics/metadata.yaml b/topics/statistics/metadata.yaml index bc3fad28b43403..be167fb016cbbe 100644 --- a/topics/statistics/metadata.yaml +++ b/topics/statistics/metadata.yaml @@ -11,7 +11,7 @@ requirements: type: "internal" topic_name: introduction -maintainers: +editorial_board: - marziacremona - cumbof - anuprulez diff --git a/topics/synthetic-biology/metadata.yaml b/topics/synthetic-biology/metadata.yaml index a39f9f1173ed2d..070b7efdd69d01 100644 --- a/topics/synthetic-biology/metadata.yaml +++ b/topics/synthetic-biology/metadata.yaml @@ -13,7 +13,7 @@ requirements: - type: internal topic_name: introduction docker_image: '' -maintainers: +editorial_board: - kenza12 - tduigou - breakthewall diff --git a/topics/teaching/metadata.yaml b/topics/teaching/metadata.yaml index 9d6f1d40aa76c6..2a05795183e2c1 100644 --- a/topics/teaching/metadata.yaml +++ b/topics/teaching/metadata.yaml @@ -25,5 +25,5 @@ subtopics: title: "Prepare yourself and Galaxy for teaching" description: "Tutorials guide to use Galaxy for teaching, more on the practical aspect" -maintainers: +editorial_board: - bebatut diff --git a/topics/transcriptomics/metadata.yaml b/topics/transcriptomics/metadata.yaml index 2b3703e08a70f6..373192651e84a2 100644 --- a/topics/transcriptomics/metadata.yaml +++ b/topics/transcriptomics/metadata.yaml @@ -16,7 +16,7 @@ requirements: - quality-control - mapping -maintainers: +editorial_board: - bebatut - mblue9 - heylf diff --git a/topics/variant-analysis/metadata.yaml b/topics/variant-analysis/metadata.yaml index eddf8005ee98b1..175bff21051d24 100644 --- a/topics/variant-analysis/metadata.yaml +++ b/topics/variant-analysis/metadata.yaml @@ -31,7 +31,7 @@ requirements: - quality-control - mapping -maintainers: +editorial_board: - bebatut - wm75 - bgruening diff --git a/topics/visualisation/metadata.yaml b/topics/visualisation/metadata.yaml index 31e61ecc32c27c..640e8a389f9b8b 100644 --- a/topics/visualisation/metadata.yaml +++ b/topics/visualisation/metadata.yaml @@ -9,6 +9,6 @@ requirements: - type: "internal" topic_name: introduction -maintainers: +editorial_board: - shiltemann - hexylena From c453ca6a35cd4288d17383370ea0fe0b20073a76 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Thu, 13 Jul 2023 01:52:49 +0200 Subject: [PATCH 2/5] add learning pathways --- _layouts/learning-pathway.html | 8 ++++---- learning-pathways/genome-annotation-eukaryote.md | 2 +- learning-pathways/genome-annotation-prokaryote.md | 2 +- learning-pathways/intro-to-galaxy-and-ecology.md | 2 +- learning-pathways/intro-to-galaxy-and-genomics.md | 2 +- learning-pathways/intro-to-r-and-ml.md | 2 +- learning-pathways/metagenomics.md | 2 +- learning-pathways/train-the-trainers.md | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/_layouts/learning-pathway.html b/_layouts/learning-pathway.html index 98f29ed9b0d016..3e1116fe748ec2 100644 --- a/_layouts/learning-pathway.html +++ b/_layouts/learning-pathway.html @@ -54,10 +54,10 @@

{{ section.section }}

-

Maintained by

-

This material is maintained by:

- {% assign maintainers = pathway.maintainers | sorted %} - {% include _includes/contributor-list.html contributors=maintainers badge=true %} +

Editorial Board

+

This material is reviewed by our Editorial Board:

+ {% assign editorial_board = pathway.maintainers %} + {% include _includes/contributor-list.html contributors=editorial_board badge=true %}

Funders

This material was funded by:

diff --git a/learning-pathways/genome-annotation-eukaryote.md b/learning-pathways/genome-annotation-eukaryote.md index 2b2668b9b62d93..d08c3f2b6fa6d2 100644 --- a/learning-pathways/genome-annotation-eukaryote.md +++ b/learning-pathways/genome-annotation-eukaryote.md @@ -7,7 +7,7 @@ tags: [genome annotation, eukaryote] cover-image: assets/images/gga.png cover-image-alt: "Galaxy Genome Annotation logo" -maintainers: +editorial_board: - abretaud funding: - erasmusplus diff --git a/learning-pathways/genome-annotation-prokaryote.md b/learning-pathways/genome-annotation-prokaryote.md index e0b5ba98fc8d7e..484b1ebac9080c 100644 --- a/learning-pathways/genome-annotation-prokaryote.md +++ b/learning-pathways/genome-annotation-prokaryote.md @@ -7,7 +7,7 @@ tags: [genome annotation, prokaryote] cover-image: assets/images/gga.png cover-image-alt: "Galaxy Genome Annotation logo" -maintainers: +editorial_board: - abretaud funding: - erasmusplus diff --git a/learning-pathways/intro-to-galaxy-and-ecology.md b/learning-pathways/intro-to-galaxy-and-ecology.md index db636659bc8d2a..9d777033b81622 100644 --- a/learning-pathways/intro-to-galaxy-and-ecology.md +++ b/learning-pathways/intro-to-galaxy-and-ecology.md @@ -2,7 +2,7 @@ layout: learning-pathway tags: [beginner] -maintainers: +editorial_board: - yvanlebras funding: - erasmusplus diff --git a/learning-pathways/intro-to-galaxy-and-genomics.md b/learning-pathways/intro-to-galaxy-and-genomics.md index 04a5839a4a340e..7fd728542d87b8 100644 --- a/learning-pathways/intro-to-galaxy-and-genomics.md +++ b/learning-pathways/intro-to-galaxy-and-genomics.md @@ -2,7 +2,7 @@ layout: learning-pathway tags: [beginner] -maintainers: +editorial_board: - shiltemann funding: - erasmusplus diff --git a/learning-pathways/intro-to-r-and-ml.md b/learning-pathways/intro-to-r-and-ml.md index d5c9561c6f9daf..ade4c4a05b15f8 100644 --- a/learning-pathways/intro-to-r-and-ml.md +++ b/learning-pathways/intro-to-r-and-ml.md @@ -2,7 +2,7 @@ layout: learning-pathway tags: [beginner] -maintainers: +editorial_board: - fpsom funding: - erasmusplus diff --git a/learning-pathways/metagenomics.md b/learning-pathways/metagenomics.md index 4a123cb724c9c3..3a9c5d8a5ec3c0 100644 --- a/learning-pathways/metagenomics.md +++ b/learning-pathways/metagenomics.md @@ -1,7 +1,7 @@ --- layout: learning-pathway # (uncomment this line to activate it) -maintainers: +editorial_board: - bebatut funding: - erasmusplus diff --git a/learning-pathways/train-the-trainers.md b/learning-pathways/train-the-trainers.md index 348a2346f0a4f0..00e78e5c457111 100644 --- a/learning-pathways/train-the-trainers.md +++ b/learning-pathways/train-the-trainers.md @@ -6,7 +6,7 @@ description: | This pathway introduces trainers to learning principles, training techniques, lesson, session, course, and material design as well as assessment and feedback. This is has been developed for by trainers in the bioinformatics but is suitable for all trainers and educators in higher education. tags: [training, trainers] -maintainers: +editorial_board: - bebatut - fpsom funding: From 0943b05570048b486baa772388805618263ba872 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Thu, 13 Jul 2023 01:58:11 +0200 Subject: [PATCH 3/5] Add topic/LP editing to profile --- _layouts/contributor_index.html | 15 +++++++++++++++ _plugins/author-page.rb | 5 +++++ _plugins/jekyll-topic-filter.rb | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/_layouts/contributor_index.html b/_layouts/contributor_index.html index 9b0243b87a7df5..9865f114288c40 100644 --- a/_layouts/contributor_index.html +++ b/_layouts/contributor_index.html @@ -175,6 +175,21 @@

GitHub Activity

{% endunless %} {% endunless %}

+ {% if page.editor_count > 0 %} +

Editorial Roles

+

This contributor has taken on additional responsibilities as an editor for the following topics. They are responsible for ensuring that the content is up to date, accurate, and follows GTN best practices.

+
    + {% for res in page.editors %} +
  • + {% if res.layout == 'learning-pathway' %} + {{ res.title }} + {% else %} + {{ res.title }} + {% endif %} +
    • + {% endfor %} +
+ {% endif %} {% if page.tutorials_count > 0 %}

Tutorials

diff --git a/_plugins/author-page.rb b/_plugins/author-page.rb index 5cf4ce64a81639..2cbceada5ee568 100644 --- a/_plugins/author-page.rb +++ b/_plugins/author-page.rb @@ -103,6 +103,11 @@ def generate(site) page2.data['news_count'] = news_by_author[contributor].length page2.data['learning_pathways_count'] = learning_pathways_by_author[contributor].length + page2.data['editors'] = TopicFilter.enumerate_topics(site).select {|t| t.fetch('editorial_board', []).include?(contributor) } + # Also their learning pathways + page2.data['editors'] += site.pages.select {|t| t['layout'] == 'learning-pathway' && t.data.fetch('editorial_board', []).include?(contributor) } + page2.data['editor_count'] = page2.data['editors'].length + page2.data['has_philosophy'] = has_philosophy[contributor] site.pages << page2 diff --git a/_plugins/jekyll-topic-filter.rb b/_plugins/jekyll-topic-filter.rb index ce1b97dadd347b..ef6772ab76f685 100644 --- a/_plugins/jekyll-topic-filter.rb +++ b/_plugins/jekyll-topic-filter.rb @@ -16,6 +16,16 @@ def self.list_topics(site) site.data.select { |_k, v| v.is_a?(Hash) && v.key?('editorial_board') }.map { |k, _v| k } end + ## + # This function returns a list of all the topics that are available. + # Params: + # +site+:: The +Jekyll::Site+ object + # Returns: + # +Array+:: The topic objects themselves + def self.enumerate_topics(site) + site.data.select { |_k, v| v.is_a?(Hash) && v.key?('editorial_board') }.map { |_k, v| v } + end + ## # Fill the cache with all the topics # Params: From 96cae5a9cb11140fc8fabeca5ab1f87a1c988205 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Thu, 13 Jul 2023 02:02:02 +0200 Subject: [PATCH 4/5] schema improvements --- bin/schema-learning-pathway.yaml | 17 +++++++++++++++++ learning-pathways/admin-training.md | 4 ++++ learning-pathways/pathway-example.md | 2 ++ 3 files changed, 23 insertions(+) diff --git a/bin/schema-learning-pathway.yaml b/bin/schema-learning-pathway.yaml index 1ba4cde9773309..dd98eb832a5d56 100644 --- a/bin/schema-learning-pathway.yaml +++ b/bin/schema-learning-pathway.yaml @@ -32,6 +32,23 @@ mapping: type: int description: priority within learning path list + editorial_board: + type: seq + required: true + sequence: + - type: str + required: true + description: A contributor's ID in the CONTRIBUTORS.yaml file. + #enum: + #- CONTRIBUTORS + + funding: + type: seq + description: These entities provided funding support for the development of this resource + sequence: + - type: str + #enum: + #- CONTRIBUTORS tags: type: seq sequence: diff --git a/learning-pathways/admin-training.md b/learning-pathways/admin-training.md index cc338b90969f0e..4eacfc64183a50 100644 --- a/learning-pathways/admin-training.md +++ b/learning-pathways/admin-training.md @@ -8,6 +8,10 @@ description: | cover-image: assets/images/gat.png cover-image-alt: GTN Logo on a spiral galaxy background with text galaxy admin training +editorial_board: +- hexylena +- natefoo +- slugger70 tags: [Galaxy administrators, 5-day course] diff --git a/learning-pathways/pathway-example.md b/learning-pathways/pathway-example.md index 5a2319d0b04a36..97cea167d90549 100644 --- a/learning-pathways/pathway-example.md +++ b/learning-pathways/pathway-example.md @@ -7,6 +7,8 @@ description: | Make this as thorough as possible, 1-2 paragraphs. This appears on the index page that lists all the learning paths, and at the top of the pathway page tags: [some, keywords, here ] +editorial_board: +- shiltemann cover-image: assets/images/gat.png # optional, define your own cover image for the pathway index page, default is the GTN logo cover-image-alt: alt text for this image From 2c29976ed2935c7fdbbff5c9cf621da66d07387c Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Thu, 13 Jul 2023 07:45:20 +0200 Subject: [PATCH 5/5] rubocop --- _plugins/author-page.rb | 8 ++++++-- _plugins/jekyll-duration.rb | 2 +- bin/lint.rb | 25 +++++++++++++------------ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/_plugins/author-page.rb b/_plugins/author-page.rb index 2cbceada5ee568..f0db6a1f649887 100644 --- a/_plugins/author-page.rb +++ b/_plugins/author-page.rb @@ -103,9 +103,13 @@ def generate(site) page2.data['news_count'] = news_by_author[contributor].length page2.data['learning_pathways_count'] = learning_pathways_by_author[contributor].length - page2.data['editors'] = TopicFilter.enumerate_topics(site).select {|t| t.fetch('editorial_board', []).include?(contributor) } + page2.data['editors'] = TopicFilter.enumerate_topics(site).select do |t| + t.fetch('editorial_board', []).include?(contributor) + end # Also their learning pathways - page2.data['editors'] += site.pages.select {|t| t['layout'] == 'learning-pathway' && t.data.fetch('editorial_board', []).include?(contributor) } + page2.data['editors'] += site.pages.select do |t| + t['layout'] == 'learning-pathway' && t.data.fetch('editorial_board', []).include?(contributor) + end page2.data['editor_count'] = page2.data['editors'].length page2.data['has_philosophy'] = has_philosophy[contributor] diff --git a/_plugins/jekyll-duration.rb b/_plugins/jekyll-duration.rb index 008be2883960ad..a0a1f8b225d309 100644 --- a/_plugins/jekyll-duration.rb +++ b/_plugins/jekyll-duration.rb @@ -29,7 +29,7 @@ def duration_to_human(duration) hour = 'hour' hours = 'hours' minutes = 'minutes' - if @context.registers[:page]&.key?('lang') and @context.registers[:page]['lang'] != 'en' + if @context.registers[:page]&.key?('lang') && (@context.registers[:page]['lang'] != 'en') lang = @context.registers[:page]['lang'] hour = @context.registers[:site].data['lang'][lang]['hour'] hours = @context.registers[:site].data['lang'][lang]['hours'] diff --git a/bin/lint.rb b/bin/lint.rb index 327e9a560c1e3c..043754c646aaf3 100755 --- a/bin/lint.rb +++ b/bin/lint.rb @@ -108,7 +108,7 @@ def self.message(path: '', idx: 0, match_start: 0, match_end: 1, replacement: ni # Linting functions for the GTN module GtnLinter @BAD_TOOL_LINK = /{% tool (\[[^\]]*\])\(https?.*tool_id=([^)]*)\)\s*%}/i - @BAD_TOOL_LINK2 = /{% tool (\[[^\]]*\])\(https:\/\/toolshed.g2([^)]*)\)\s*%}/i + @BAD_TOOL_LINK2 = %r{{% tool (\[[^\]]*\])\(https://toolshed.g2([^)]*)\)\s*%}}i def self.find_matching_texts(contents, query) contents.map.with_index do |text, idx| @@ -350,18 +350,19 @@ def self.non_existent_snippet(contents) end def self.bad_tool_links(contents) - find_matching_texts(contents, @BAD_TOOL_LINK) + find_matching_texts(contents, @BAD_TOOL_LINK2) + find_matching_texts(contents, @BAD_TOOL_LINK) + \ + find_matching_texts(contents, @BAD_TOOL_LINK2) .map do |idx, _text, selected| - ReviewDogEmitter.error( - path: @path, - idx: idx, - match_start: selected.begin(0), - match_end: selected.end(0) + 1, - replacement: "{% tool #{selected[1]}(#{selected[2]}) %}", - message: 'You have used the full tool URL to a specific server, here we only need the tool ID portion.', - code: 'GTN:009' - ) - end + ReviewDogEmitter.error( + path: @path, + idx: idx, + match_start: selected.begin(0), + match_end: selected.end(0) + 1, + replacement: "{% tool #{selected[1]}(#{selected[2]}) %}", + message: 'You have used the full tool URL to a specific server, here we only need the tool ID portion.', + code: 'GTN:009' + ) + end end def self.snippets_too_close_together(contents)