Merge pull request #5627 from rmassei/main

Add the DFG grant to the omero training matherial

GRANTS.yaml

@@ -204,6 +204,27 @@ h2020-defend:
       This work has received funding from the DEFEND project (www.defend2020.eu) with funding from the European Union's Horizon 2020 research and innovation programme under grant agreement No 773701.
     url: https://www.defend2020.eu
 
+nfdi4bioimage:
+    name:  NFDI4Bioimage
+    short_name: "NFDI4Bioimage"
+    github: false
+    joined: 2024-12
+    funding_id: "501864659"
+    funding_database: dfg
+    funder_name: DFG
+    url: https://nfdi4bioimage.de
+    avatar: "/training-material/shared/images/nfdi4bioimage.jpeg"
+
+nfdi4plants:
+    short_name: DataPLANT
+    name: DataPLANT (NFDI4Plants)
+    joined: 2024-07
+    funding_id: "442077441"
+    funding_database: dfg
+    funder_name: DFG
+    url:  https://nfdi4plants.org
+    avatar: "/training-material/shared/images/logo-dataplant.svg"
+
 nhgri-anvil:
     name: National Human Genome Research Institute Genomic Data Science Analysis, Visualization, and Informatics Lab-Space
     short_name: "NHGRI ANVIL"
@@ -235,3 +256,6 @@ skills4eosc:
 
 
 
+
+
+

ORGANISATIONS.yaml

@@ -39,6 +39,14 @@ deNBI:
     name: de.NBI
     url: https://www.denbi.de/
 
+dfg:
+    name:  Deutsche Forschungsgemeinschaft
+    short_name: "DFG"
+    github: false
+    joined: 2024-12
+    url: https://www.dfg.de/de
+    avatar: "/training-material/shared/images/DFG_grant.png"
+
 earlham:
     name: Earlham Institute
     joined: 2017-09
@@ -208,13 +216,6 @@ ncbi:
     avatar: "/training-material/shared/images/ncbi.png"
     ror: "02meqm098"
 
-nfdi4plants:
-    short_name: DataPLANT
-    name: DataPLANT (NFDI4Plants)
-    joined: 2024-07
-    url:  https://nfdi4plants.org
-    avatar: "/training-material/shared/images/logo-dataplant.svg"
-
 NIH:
     name: National Institutes of Health
     short_name: "NIH"
@@ -363,9 +364,3 @@ vib:
     github: false
     ror: "03xrhmk39"
 
-nfdi4bioimage:
-    short_name: NFDI4BIOIMAGE
-    name: NFDI4BIOIMAGE
-    joined: 2024-11
-    url:  https://nfdi4bioimage.de
-    avatar: "/training-material/shared/images/nfdi4bioimage.jpeg"

_layouts/contributor_index.html

@@ -249,8 +249,8 @@ <h3> GitHub Activity</h4>
 		{% if page.gh_prs_count > 0 %}
 		<h4>{{ page.gh_prs_count }} Merged Pull Requests</h4>
 		<p>
-		See all of the 
-                <a href="https://github.com/galaxyproject/training-material/pulls?q=is%3Apr+author%3A{{page.contributor}}">{% icon github %} Pull Requests</a> and 
+		See all of the
+                <a href="https://github.com/galaxyproject/training-material/pulls?q=is%3Apr+author%3A{{page.contributor}}">{% icon github %} Pull Requests</a> and
 		<a href="https://github.com/galaxyproject/training-material/commits?author={{page.contributor}}">{% icon github %} Commits</a> by {{ entity.name | default: page.contributor }}.
 		</p>
 		<ul>
@@ -350,15 +350,23 @@ <h2>External Links</h2>
 				{% endif %}
 
 				{% if entity.funding_id %}
-					Grant ID:
+                <div class="contact-items">
+                    <p><b>Funding information</b>
+                    {% if entity.funder_name %}
+                    <br>Funding body: {{entity.funder_name}}
+                    {% endif %}
+					<br>Grant ID:
 					{% if entity.funding_database %}
 						{% assign url = entity | fetch_funding_url %}
 						<a href="{{ url }}">
 							{{ entity.funding_id }}
 						</a>
 					{% else %}
-						{{ entity.funding_id }}
+						<br>{{ entity.funding_id }}
 					{% endif %}
+
+                    </p>
+                </div>
 				{% endif %}
 
 				{% if entity.email %}
@@ -424,9 +432,9 @@ <h2>External Links</h2>
 				</div>
 				{% endif %}
 
-				<p>Favourite Topics</p>
+				<p><b>Favourite Topics</b></p>
 				<canvas id="myChart" height="300px"></canvas>
-				<p>Favourite Formats</p>
+				<p><b>Favourite Formats</b></p>
 				<canvas id="slidesVsTutorials" height="300px"></canvas>
 
 			</div>

_plugins/gtn/contributors.rb

@@ -235,6 +235,8 @@ def self.fetch_funding_url(contributor)
         "https://gtr.ukri.org/projects?ref=#{contributor['funding_id']}"
       when 'highergov'
         "https://www.highergov.com/contract/#{contributor['funding_id']}/"
+      when 'dfg'
+        "https://gepris-extern.dfg.de/gepris/projekt/#{contributor['funding_id']}?language=en"
       else
         Jekyll.logger.error "Unknown funding system #{contributor['funding_database']}. Please let us know so we can add support for it!"
         'ERROR'

bin/schema-grants.yaml

@@ -112,6 +112,7 @@ mapping:
                     - erasmusplus
                     - ukri
                     - highergov
+                    - dfg
             funder_name:
                 type: str
                 description: A name for the agency providing the funding.

topics/fair/tutorials/dataplant-arcs/tutorial.md

@@ -35,6 +35,7 @@ contributions:
   #editing:
   funding:
     - nfdi4plants
+    - dfg
 
 subtopic: dataplant
 

topics/imaging/tutorials/omero-suite/tutorial.md

@@ -21,6 +21,7 @@ contributions:
     - bgruening
   funding:
     - nfdi4bioimage
+    - dfg
 ---
 The efficient and accurate treatment of microscopy metadata is of great importance, as it 
 provides insights that are essential for effective image management, search, organisation,