Merge pull request #4972 from vladvisan/main

WiP / Draft - Galaxy SSA Poll Results Slides

_includes/contributor-human-icons.html

@@ -12,6 +12,8 @@
 	<abbr title="This person contributed UX or Design improvements to this tutorial or the GTN as a whole">✨</abbr>
 {% elsif include.activity == "funding" %}
 	<abbr title="These individuals or organisations provided funding support for the development of this resource">💵</abbr>
+{% elsif include.activity == "data" %}
+	<abbr title="This person generated some of the underlying data used in the learning resource.">🖥</abbr>
 {% elsif include.activity == "maintainer" %}
 	<abbr title="These individuals or organisations are responsible for maintaining this resource">⚒</abbr>
 {% elsif include.activity == "captioner" %}

_includes/contributor-list2.html

@@ -24,6 +24,14 @@
 	</tr>
 	{% endif %}
 
+	{% if include.contributors.data %}
+	<tr>
+		<td><abbr title="These people generated some of the underlying data used in the learning resource.">Data provider(s)</abbr></td>
+		<td>
+			{% for id in include.contributors.data %}{{ include.sep }}{% if include.badge %}{% include _includes/contributor-badge.html id=id %}{% else %}{% assign name = contributors[id].name | default: id -%}{{ name -}}{% endif %}{%- endfor -%}
+		</td>
+	</tr>
+	{% endif %}
 
 	{% if include.contributors.organisers %}
 	<tr>

assets/css/slides.scss

@@ -102,6 +102,10 @@ body.remark-container {
 		width: 40%;
 	}
 
+	.image-45 img {
+		width: 45%;
+	}
+
 	.image-50 img {
 		width: 50%;
 	}
@@ -348,10 +352,15 @@ body.remark-container {
 	}
 
 	.pull-left-large {
-		/* this does not break compatibility with .pull-right */
+		/* this does break compatibility with .pull-right */
 		float: left;
 		margin-left: -3em;
-		width: 60%;
+		width: 66%;
+	}
+	.pull-right-small {
+		float: right;
+		width: 33%;
+
 	}
 
 	.pull-left {

bin/schema-slides.yaml

@@ -170,6 +170,15 @@ mapping:
                   enum:
                   - CONTRIBUTORS
                   - ORGANISATIONS
+            data:
+                type: seq
+                description: These entities provided data for this resource
+                sequence:
+                - type: str
+                  enum:
+                  - CONTRIBUTORS
+                  - ORGANISATIONS
+                  - FUNDERS
     hands_on:
         type: str
         enum:

bin/schema-tutorial.yaml

@@ -170,6 +170,15 @@ mapping:
                   enum:
                   - CONTRIBUTORS
                   - ORGANISATIONS
+            data:
+                type: seq
+                description: These entities provided data for this resource
+                sequence:
+                - type: str
+                  enum:
+                  - CONTRIBUTORS
+                  - ORGANISATIONS
+                  - FUNDERS
     subtopic:
         type: str
         description: |

topics/admin/tutorials/poll-ssa/faqs/index.md

@@ -0,0 +1,3 @@
+---
+layout: faq-page
+---