Skip to content

Commit

Permalink
Merge branch 'main' into neoantigen
Browse files Browse the repository at this point in the history
  • Loading branch information
subinamehta authored Dec 20, 2024
2 parents de37b2b + d4c49c4 commit 9df3880
Show file tree
Hide file tree
Showing 21 changed files with 329 additions and 42 deletions.
10 changes: 5 additions & 5 deletions _includes/contributor-badge.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
{%- else -%}
{%- assign contributor_badge_entity = site | fetch_contributor: include.id -%}
{%- assign name = contributor_badge_entity.short_name | default: contributor_badge_entity.name | default: include.id -%}
{% if include.small %}
<a href="{{ site.baseurl }}/hall-of-fame/{{ include.id }}/" class="contributor-badge contributor-{{ include.id }}">
{{ contributor_badge_entity | fetch_entity_avatar:include.id, 36 }}
{%- if include.small -%}
<a href="{{ site.baseurl }}/hall-of-fame/{{ include.id }}/" class="contributor-badge contributor-badge-small contributor-{{ include.id }}">
{{- contributor_badge_entity | fetch_entity_avatar:include.id, 36 -}}
</a>
{% else %}
{%- else -%}
<a href="{{ site.baseurl }}/hall-of-fame/{{ include.id }}/" class="contributor-badge contributor-{{ include.id }}">
{%- if contributor_badge_entity.orcid -%}<img src="{% link assets/images/orcid.png %}" alt="orcid logo" width="36" height="36"/>{%- endif -%}
{{ contributor_badge_entity | fetch_entity_avatar:include.id, 36 }}
Expand All @@ -16,5 +16,5 @@
{%- include _includes/contributor-human-icons.html activity=include.activity -%}
{%- endif -%}
</a>
{% endif %}
{%- endif -%}
{%- endif -%}
63 changes: 35 additions & 28 deletions _includes/news-card.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<article>
{% assign n = include.news %}

{% if n.cover %}
Expand All @@ -18,38 +17,46 @@
{% assign coverimagealt = "GTN logo with a multi-coloured star and the words Galaxy Training Network" %}
{% endif %}

<div class="card newsitem">
<div class="card-header">
<a href="{% if n.external %}{{ n.link }}{% else %}{{site.baseurl}}{{n.url}}{% endif %}"><h3 class="card-title">{{n.title}}</h3></a>
</div>
<div class="row no-gutters">
<div class="col-sm-5">
<img class="card-img newscover" src="{% unless coverimage contains 'http' %}{{site.baseurl}}/{% endunless %}{{coverimage}}" alt="{{ coverimagealt }}" loading="lazy">
</div>
<div class="col-sm-7">
<div class="card-body">
<!--<a href="{{site.baseurl}}{{n.url}}"><h4 class="card-title">{{n.title}}</h4></a>-->
<div class="text-muted">
{{ n.date | date: "%-d %B %Y" }}

<div class="pathwayitem col-md-4">
<div class="card d-flex">
<a href="{% if n.external %}{{ n.link }}{% else %}{{site.baseurl}}{{n.url}}{% endif %}">
<div class="d-flex align-items-center" style="height:200px;">
<img class="card-img-top pathwaycover" src="{% unless coverimage contains 'http' %}{{site.baseurl}}/{% endunless %}{{coverimage}}" alt="{{ coverimagealt }}" loading="lazy">
</div>
</a>
<div class="card-body d-flex flex-column">
<h5 class="card-title">{{n.title}}</h5>
<div class="card-text">
{% for id in n.contributions.authorship %}
{% include _includes/contributor-badge.html id=id small=true %}
{% endfor %}
<div class="text-muted">
{{ n.date | date: "%-d %B %Y" }}
</div>

<a href="{% if n.external %}{{ n.link }}{% else %}{{site.baseurl}}{{n.url}}{% endif %}">

{% if n.external %}
This is an external post, please follow the link to read it.
{% else %}
{{ n.excerpt | strip_html }}
{% endif %}
</a>

</div>
{% include _includes/contributors-line.html page=n %}

</div>

<div class="card-footer">
{% for tag in n.tags %}
{% unless tag == 'already-on-hub' %}
<span class="label label-default tutorial_tag" style="{{ tag | colour_tag }}">{{ tag }}</span>
{% endunless %}
{% endfor %}
<hr/>
<p class="card-text">
{% if n.external %}
This is an external post, please follow the link to read it.
{% else %}
{{ n.excerpt | strip_html }}
{% endif %}
</p>
<a href="{% if n.external %}{{ n.link }}{% else %}{{site.baseurl}}{{n.url}}{% endif %}" class="btn btn-primary">Full Story</a>
</div>
</div>
</div>
</div>

</div>
</div>
</article>


2 changes: 1 addition & 1 deletion _layouts/topic-maintainer.html
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ <h2>Events using materials from this Topic</h2>
TODO once this is merged:
https://github.com/galaxyproject/training-material/pull/4963

<h2>Statistics For Your Materials</h2>
<h2 id="statistics-for-your-materials">Statistics For Your Materials</h2>

<iframe plausible-embed src="https://plausible.galaxyproject.eu/training.galaxyproject.org?page=%7E%2Ftopics%2F{{ topic.name }}%2F&embed=true&theme=system&background=transparent" scrolling="no" frameborder="0" loading="lazy" style="width: 1px; min-width: 100%; height: 1800px;"></iframe>
<div style="font-size: 14px; padding-bottom: 14px;">Stats powered by <a target="_blank" style="color: #4F46E5; text-decoration: underline;" href="https://plausible.io">Plausible Analytics</a></div>
Expand Down
7 changes: 6 additions & 1 deletion assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ blockquote {
vertical-align: center;
}
.card-title{
height: 5rem;
height: 6rem;
}
.card-header {
background: var(--brand-color);
Expand Down Expand Up @@ -1220,6 +1220,11 @@ nav[data-toggle='toc'] {
}
}

.contributor-badge-small{
border: none;
padding-right: 0em;
}

.contributor-badge-inline {
/* prevent breaking across lines */
white-space: nowrap;
Expand Down
5 changes: 3 additions & 2 deletions news.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ Keep an eye on this page for the latest news around the GTN. New tutorials, GTN

Want to add your own news here (e.g. new tutorial, event, publication, anything else training related)? Check out how to do that in [this FAQ]({% link faqs/gtn/gtn_news_create_post.md %})

<div class="newslist">
{% for n in site.categories['news'] %}
<div class="pathwaylist row">

{% for n in site.categories['news'] %}

{% include _includes/news-card.html news=n %}

{% endfor %}

</div>

2 changes: 1 addition & 1 deletion news/_posts/2024-12-18-spoc.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ coveralt: "A group of people standing along a staircase holding up the Vulcan sa

# 🚀 2024: A SPOC-tacular Year in Review 🌌

As we orbit the end of another stellar year, let’s engage warp drive and reflect on the out-of-this-world achievements of the [**Single-cell & sPatial Omics Community (SPOC 🖖)](https://galaxyproject.org/community/sig/singlecell/). From launching new tools to charting new tutorials, SPOC’s journey through the Galaxy (platform) has been nothing short of cosmic! 🌠
As we orbit the end of another stellar year, let’s engage warp drive and reflect on the out-of-this-world achievements of the [**Single-cell & sPatial Omics Community (SPOC 🖖)**](https://galaxyproject.org/community/sig/singlecell/). From launching new tools to charting new tutorials, SPOC’s journey through the Galaxy (platform) has been nothing short of cosmic! 🌠

## 🌟 The Mission: Empowering Single-Cell Scientists
This year, we continued to boldly go where no omics community has gone before, propelling the SPOC ecosystem beyond single-cell RNA sequencing. With new training materials, tools, and workflows, our community has bridged the gap between transcriptomics, multiomics, and even spatial data analysis, ensuring that researchers have the tools they need to explore biological frontiers. Think of it as assembling the ultimate research starship! 🚀
Expand Down
41 changes: 41 additions & 0 deletions news/_posts/2024-12-19-community_page.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
title: "GTN's Gift for 2024"
contributions:
authorship:
- nomadscientist
- hexylena
tags: [gtn, single-cell, new feature, new tutorial, contributing, community]
layout: news
cover: "news/images/spoc_images/community_page.png"
coveralt: "four graphs showing increases over time: training materials including slides and tutorials; contributors; workflows; and other"
---

# Community Pages

# 🎉 Ring in 2025 with the GTN’s Amazing New Feature! 🎉

We’re absolutely *thrilled* to introduce the fabulous **Community Page**—a glorious new addition that has us cheering! 🎊

Here’s why we’re so excited: this page **automatically** tracks and celebrates all the incredible resource contributions from our community over time. 🚀 Whether it’s new workflows, fresh training materials, or awesome contributors, everything is summed up for you, hassle-free!

Gone are the days of frantically piecing together achievements to impress institutes or grant bodies. No more scratching your head at year’s end wondering, *“Wait... what *did* we accomplish?”* GTN gets it. 💡 We know trainers are superheroes juggling this alongside their full-time research or infrastructure roles.

Now, with sleek live charts, we can *see* how our community shines 🌟—in real time! It’s a joyful reflection of all the hard work, dedication, and collaboration that make this community so special.

So here’s a huge **THANK YOU** to the GTN team for this spectacular gift! 🥳 You’ve truly embodied the spirit of user-centered design—not just for the scientists using Galaxy, but for those of us building it, too. 💖

Here’s to an exciting 2024 full of growth, achievements, and community magic! 🎆

#GratefulForGTN

You can find this and other useful features in a [new tutorial collecting community resources]( {% link topics/community/tutorials/community_content/tutorial.md %} ).

Finally, you can see an example from the Single-cell topic below:

<iframe
src="https://training.galaxyproject.org/training-material/topics/single-cell/community.html"
width="100%"
height="800"
style="border: none;"
title="Single-Cell Topic Community Page">
</iframe>
Binary file added news/images/spoc_images/community_page.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions topics/community/faqs/community_activites_calendar.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: How can I add my SIG meetings to the Galaxy Community Activities calendar?
box_type: tip
layout: faq
contributors: [nomadscientist]
---

Add the following guest to all of your Google Calendar meeting events: 8a762890fbe724e9d29b67915aa0197a352642f94b22ec64a85430daaf1abb5e@group.calendar.google.com

Then it will show up in the **Galaxy Community Activities** calendar!

<iframe src="https://calendar.google.com/calendar/embed?height=600&wkst=1&ctz=Europe%2FLondon&showPrint=0&showCalendars=0&mode=AGENDA&src=OGE3NjI4OTBmYmU3MjRlOWQyOWI2NzkxNWFhMDE5N2EzNTI2NDJmOTRiMjJlYzY0YTg1NDMwZGFhZjFhYmI1ZUBncm91cC5jYWxlbmRhci5nb29nbGUuY29t&color=%234285F4" style="border-width:0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
21 changes: 21 additions & 0 deletions topics/community/faqs/community_home.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
title: How do I find the Community Home pages?
box_type: tip
layout: faq
contributors: [nomadscientist, hexylena, shiltemann]
---

The **Community Home** shows statistics for the topic (e.g. number of tutorials, slides, events, contributors, etc),
as well as annual "Year in review" sections listing all new additions to the topic/community for each year.

You can find your **Community Home** by
1. Opening the GTN **Topic** page of your choice
2. Scrolling down to the **Community Resources** section (below the list of tutorials)
3. Clicking the **Community Home** button

![screenshot of the community and maintainer homepage buttons]({% link topics/community/images/community_maintainer_home_buttons.png %})

For example, have a look at the [Single Cell Community Home]({% link topics/single-cell/community.md %})

![screenshot of the single cell community home page]({% link topics/community/images/community_home.png %})

20 changes: 20 additions & 0 deletions topics/community/faqs/maintainer_home.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
title: How do I find the Maintainer Home pages?
box_type: tip
layout: faq
contributors: [nomadscientist, hexylena, shiltemann]
---

The **Maintainer Home** pages shows the state of the topic and its materials in terms of which available GTN features are being used, adherence to best practices, and when tutorials have last been updated, and which tutorials are the most used, etc. This can help inform where to focus your efforts.

You can find your **Maintainer Home** by
1. Opening the GTN **Topic** page of your choice
2. Scrolling down to the **Community Resources** section (below the list of tutorials)
3. Clicking the **Maintainer Home** button

![screenshot of the community and maintainer homepage buttons]({% link topics/community/images/community_maintainer_home_buttons.png %})

For example, have a look at the [Single Cell Maintainer Home]({% link topics/single-cell/maintainer.md %})

![screenshot of the single cell maintainer home page]({% link topics/community/images/maintainer_home.png %})

Binary file added topics/community/images/community_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added topics/community/images/maintainer_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions topics/community/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,13 @@ summary: |
#docker_image: "quay.io/galaxy/community"
learning_path_cta: dev_tools_training

subtopics:
- id: sig
title: "Special Interest Groups & Communities"
description: "These tutorials will get you started with the basics of what a special interest group is and how to build one."
- id: subdomain
title: "Subdomains & Galaxy Labs"
description: "This tutorial will guide you on how to build subdomains / Galaxy Labs"

editorial_board:
- nomadscientist
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ title: Creation of an interactive Galaxy tools table for your community
level: Introductory
redirect_from:
- /topics/dev/tutorials/community-tool-table/tutorial
subtopic: sig

questions:
- Is it possible to have an overview of all Galaxy tools for a specific scientific domain?
Expand Down
3 changes: 3 additions & 0 deletions topics/community/tutorials/community_content/faqs/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
layout: faq-page
---
Loading

0 comments on commit 9df3880

Please sign in to comment.