Add terms_url

galaxyproject · Jul 9, 2024 · 2bf3b06 · 2bf3b06
1 parent dc51f37
commit 2bf3b06
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 130 deletions.
diff --git a/subdomains/singlecell/main.yml b/subdomains/singlecell/main.yml
@@ -21,19 +21,23 @@ root_domain: usegalaxy.org.au
 # feedback_email: [email protected]
 
 support_url: https://help.galaxyproject.org
+quota_request_url: https://help.galaxyproject.org
+data_policy_url: https://usegalaxy.org/static/terms.html
+terms_url: https://usegalaxy.org/static/terms.html
+
 help_links:
-  - title: "Single Cell community help forum"
-    url: "https://usegalaxy-eu.github.io/scrna"
-  - title: "General Galaxy help forum"
-    url: "https://help.galaxyproject.org/c/usegalaxy-eu-support/6"
-  - title: "Single cell Galaxy user community chat room"
-    url: "https://matrix.to/#/#Galaxy-Training-Network_galaxy-single-cell:gitter.im"
-  - title: "Galaxy Training Community chat"
-    url: "https://matrix.to/#/#Galaxy-Training-Network_Lobby:gitter.im"
-  - title: "Usegalaxy.eu chat"
-    url: "https://matrix.to/#/#usegalaxy-eu_Lobby:gitter.im"
-  - title: "Usegalaxy.org chat"
-    url: "https://matrix.to/#/#galaxyproject_Lobby:gitter.im"
+  - title: Single Cell community help forum
+    url: https://usegalaxy-eu.github.io/scrna
+  - title: General Galaxy help forum
+    url: https://help.galaxyproject.org/c/usegalaxy-eu-support/6
+  - title: Single cell Galaxy user community chat room
+    url: https://matrix.to/#/#Galaxy-Training-Network_galaxy-single-cell:gitter.im
+  - title: Galaxy Training Community chat
+    url: https://matrix.to/#/#Galaxy-Training-Network_Lobby:gitter.im
+  - title: Usegalaxy.eu chat
+    url: https://matrix.to/#/#usegalaxy-eu_Lobby:gitter.im
+  - title: Usegalaxy.org chat
+    url: https://matrix.to/#/#galaxyproject_Lobby:gitter.im
 conclusion_extra_md: ""
 
 # -----------------------------------------------------------------------------

diff --git a/subdomains/singlecell/sections/1_beginner.yml b/subdomains/singlecell/sections/1_beginner.yml
@@ -8,15 +8,11 @@ tabs:
     content:
       - title_html: For first time Galaxy users
         description_html: >
-          <p>
-            Follow this learning pathway to learn how to use Galaxy and how to do single-cell RNA-seq analysis.
-          </p> 
+          Follow this learning pathway to learn how to use Galaxy and how to do single-cell RNA-seq analysis.
         button_link: "https://training.galaxyproject.org/training-material/learning-pathways/intro_single_cell.html"
       - title_html: For experienced Galaxy users
         description_html: >
-          <p>
-            Follow this learning pathway to learn how to make analytical decisions in performing single-cell RNA-seq analysis and interpreting the data.
-          </p>
+          Follow this learning pathway to learn how to make analytical decisions in performing single-cell RNA-seq analysis and interpreting the data.
         button_link1: "https://training.galaxyproject.org/training-material/topics/single-cell/tutorials/scrna-intro/slides.html"
         button_html1: "Introductory slides"
         button_link2: "https://training.galaxyproject.org/training-material/topics/single-cell/tutorials/scrna-trajectories/slides.html"
@@ -25,86 +21,68 @@ tabs:
         button_link: "https://training.galaxyproject.org/training-material/topics/single-cell/tutorials/scrna-scanpy-pbmc3k/tutorial.html"
       - title_html: From tutorial data to real, messy, analytical decision-making
         description_html: >
-          <p>
-            Analysing real data
-          </p>
+          Analysing real data
         button_link: "https://training.galaxyproject.org/training-material/learning-pathways/beyond_single_cell.html"
-  - id: training
+
+  - id: data_import
     title: Importing public data
     heading_html: >
       Using public data is free! Learn how to retrieve data from common sources.
     content:
       - title_html: Importing files from public atlases
         description_html: >
-          <p>
-            Learn how to import data from common public atlases.
-          </p>
+          Learn how to import data from common public atlases.
         button_link: "https://training.galaxyproject.org/training-material/topics/single-cell/tutorials/EBI-retrieval/tutorial.html"
       - title_html: Importing from NCBI/GEO
         description_html: >
-          <p>
-            Guides you in importing data from the NCBI/GEO repository, including how to get metadata into your object.
-          </p>
+          Guides you in importing data from the NCBI/GEO repository, including how to get metadata into your object.
         button_link: "https://training.galaxyproject.org/training-material/topics/single-cell/tutorials/scrna-ncbi-anndata/tutorial.html"
-  - id: train
+
+  - id: data_convert
     title: Converting data
     heading_html: >
       Single-cell data comes in many formats. Here we demystify them and help you interconvert between formats.
     content:
       - title_html: Converting between formats
         description_html: >
-          <p>
-            From Seurat to Scanpy, from Matrix to Monocle, find common conversions here!
-          </p>
+          From Seurat to Scanpy, from Matrix to Monocle, find common conversions here!
         button_link: "https://training.galaxyproject.org/training-material/topics/single-cell/tutorials/scrna-data-ingest/tutorial.html"
+
   - id: help
     title: Help
     content:
       - title_html: How can I talk to other single cell analysts in the Galaxy community?
         description_html: >
-          <p>
-            Embed this snippet here: https://training.galaxyproject.org/training-material/topics/single-cell/faqs/#tip-how-can-i-talk-with-other-users
-          </p>
-        button_html: More info
-        button_link: https://training.galaxyproject.org/training-material/topics/single-cell/faqs/#tip-how-can-i-talk-with-other-users
+          For information on connecting with the SingleCell community, including requesting tools and contributing feedback, check out [our page on the Galaxy training network](https://training.galaxyproject.org/training-material/topics/single-cell/faqs/user_community_join.html#how-can-i-talk-with-other-users).
       - title_html: How can I troubleshoot?
         description_html: >
-          <p>
-            Embed this snippet here: https://training.galaxyproject.org/training-material/faqs/galaxy/analysis_troubleshooting.html#troubleshooting-errors
-          </p>
-        button_html: More info
-        button_link: https://training.galaxyproject.org/training-material/topics/single-cell/faqs/#tip-how-can-i-talk-with-other-users
+          Check out Galaxy's documentation on [troubleshooting errors](https://training.galaxyproject.org/training-material/faqs/galaxy/analysis_troubleshooting.html#troubleshooting-errors).
       - title_html: Is there a help forum?
         description_html: >
-          <p>
-            <i class="fa fa-question-circle-o" aria-hidden="true"></i> [Single cell help forum](https://help.galaxyproject.org/tag/scrna)\
-          </p>
-        button_html: Help forum
-        button_link: https://help.galaxyproject.org/tag/scrna
+          <i class="fa fa-question-circle-o" aria-hidden="true"></i> [Single cell help forum](https://help.galaxyproject.org/tag/scrna)
       - title_html: Can I upload sensitive data?
         description_html: >
-          <p>
-            No, do not upload personal or sensitive, such as human health or clinical data. Please see our <a href="/about#data-privacy">Data Privacy</a> page for definitions of sensitive and health-related information.
-          </p>
-          <p>
-            Please also make sure you have read our <a href="/about#terms-of-service">Terms of Service</a>, which covers hosting and analysis of research data.
-          </p>
+          No, please do not upload personal or sensitive, such as human health or clinical data. Please see our
+          [Privacy Policy]({{ data_policy_url }})
+          page for definitions of sensitive and health-related information.
+
+          Please also make sure you have read our
+          [Terms of Service]({{ terms_url }}),
+          which covers hosting and analysis of research data.
       - title_html: Is my data private?
         description_html: >
-          <p>
-            Please read our <a href="/about#data-privacy">Privacy Policy</a> for information on your personal data and any data that you upload.
-          </p>
+          Please read our
+          [Privacy Policy]({{ data_policy_url }})
+          for information on your personal data and any data that you upload.
       - title_html: How can I increase my storage quota?
         description_html: >
-          <p>
-            Please submit a quota request if your Galaxy  account reaches its data storage limit. Requests are usually provisioned quickly if you provide a reasonable use case for your request.
-          </p>
+          Please submit a quota request if your Galaxy  account reaches its data storage limit. Requests are usually provisioned quickly if you provide a reasonable use case for your request.
         button_html: Request
-        button_link: /request/quota
+        button_link: "{{ quota_request_url }}"
+        exclude_from:
+          - usegalaxy.org
       - title_html: Galaxy {{ site_name }} support
         description_html: >
-          <p>
-            Any user of Galaxy {{ site_name }} can request support through an online form.
-          </p>
+          Any user of Galaxy {{ site_name }} can request support online.
         button_html: Request support
-        button_link: /request/support
+        button_link: "{{ support_url }}"
diff --git a/subdomains/singlecell/sections/2_intermediate.yml b/subdomains/singlecell/sections/2_intermediate.yml
@@ -13,18 +13,12 @@ tabs:
            content:
              - title_html: About these workflows
                description_html: >
-                 <p>
-                   <iframe src=“https://training.galaxyproject.org/training-material/workflows/embed.html?query=single-cell” height=“600px” width=“100%” class=“gtn-embed” frameborder=“0”></iframe>
-                 </p>
-               button_link: "<iframe src=“https://training.galaxyproject.org/training-material/workflows/embed.html?query=single-cell” height=“600px” width=“100%” class=“gtn-embed” frameborder=“0”></iframe>"
-               view_link:
-               view_tip: Iframe from GTN
+                  <iframe src=“https://training.galaxyproject.org/training-material/workflows/embed.html?query=single-cell” height=“600px” width=“100%” class=“gtn-embed” frameborder=“0”></iframe>
+               button_link: https://training.galaxyproject.org/training-material/workflows/embed.html?query=single-cell
                button_tip: End to End from GTN
              - title_html: Spare space for another GTN
                description_html: >
-                 <p>
-                   More GTN.
-                 </p>
+                  More GTN.
                inputs:
                  - datatypes:
                       - data
@@ -33,7 +27,7 @@ tabs:
                view_link: https://workflowhub.eu/workflows/221
                view_tip: View in WorkflowHub
                button_tip: Import to Galaxy Australia
-  - id: assembly
+  - id: deconvolution
     title: Deconvolution
     heading_html: >
        These tutorials infer cell compositions from bulk RNA-seq data using a scRNA-seq reference
@@ -45,19 +39,15 @@ tabs:
       #   content:
       - title_html: About these workflows
         description_html: >
-             <p>
-               Push this button to have iframe.
-             </p>
+          Push this button to have iframe.
 
         button_link: "<iframe src=“https://training.galaxyproject.org/training-material/workflows/embed.html?query=single-cell” height=“600px” width=“100%” class=“gtn-embed” frameborder=“0”></iframe>"
         view_link: <iframe src=“https://training.galaxyproject.org/training-material/workflows/embed.html?query=single-cell” height=“600px” width=“100%” class=“gtn-embed” frameborder=“0”></iframe>
         view_tip: Iframe from GTN
         button_tip: End to End from GTN
       - title_html: Spare space for another GTN
         description_html: >
-             <p>
-               More GTN.
-             </p>
+          More GTN.
         inputs:
              - datatypes:
                  - data
@@ -75,18 +65,14 @@ tabs:
     content:
       - title_html: About these workflows
         description_html: >
-          <p>
-          hello! Mehmet working here
-          </p>
+          Hello! Mehmet working here
         button_link: "<iframe src='https://training.galaxyproject.org/training-material/topics/single-cell/tutorials/scatac-preprocessing-tenx/tutorial.html#tip-creating-a-new-history' height='600px' width='100%' class='gtn-embed' frameborder='0'></iframe>"
         view_link: "<iframe src='https://training.galaxyproject.org/training-material/topics/single-cell/tutorials/scatac-preprocessing-tenx/tutorial.html#tip-creating-a-new-history' height='600px' width='100%' class='gtn-embed' frameborder='0'></iframe>"
         view_tip: Iframe from GTN
         button_tip: End to End from GTN
       - title_html: Spare space for another GTN
         description_html: >
-         <p>
-           More GTN.
-         </p>
+          More GTN.
         inputs:
            - datatypes:
                  - data
@@ -100,25 +86,19 @@ tabs:
     content:
       - title_html: Single cell training
         description_html: >
-          <p>
-            You can find all Galaxy single-cell training in our training page.
-          </p>
+          You can find all Galaxy single-cell training in our training page.
         button_html: Training Page
         button_link: https://training.galaxyproject.org/training-material/topics/single-cell/
   - id: help
     title: Help
     content:
       - title_html: How can I talk to other single cell analysts in the Galaxy community?
         description_html: >
-          <p>
-            Embed this snippet here: https://training.galaxyproject.org/training-material/topics/single-cell/faqs/#tip-how-can-i-talk-with-other-users
-          </p>
+          Embed this snippet here: https://training.galaxyproject.org/training-material/topics/single-cell/faqs/#tip-how-can-i-talk-with-other-users
         button_html: More info
         button_link: https://training.galaxyproject.org/training-material/topics/single-cell/faqs/#tip-how-can-i-talk-with-other-users
       - title_html: How can I troubleshoot?
         description_html: >
-          <p>
-            Embed this snippet here: https://training.galaxyproject.org/training-material/faqs/galaxy/analysis_troubleshooting.html#troubleshooting-errors
-          </p>
+          Embed this snippet here: https://training.galaxyproject.org/training-material/faqs/galaxy/analysis_troubleshooting.html#troubleshooting-errors
         button_html: More info
         button_link: https://training.galaxyproject.org/training-material/topics/single-cell/faqs/#tip-how-can-i-talk-with-other-users
diff --git a/subdomains/singlecell/usegalaxy.eu.yml b/subdomains/singlecell/usegalaxy.eu.yml
@@ -21,21 +21,28 @@ root_domain: usegalaxy.eu
 # feedback_email: [email protected]
 
 support_url: https://help.galaxyproject.org/
+quota_request_url: https://docs.google.com/forms/d/e/1FAIpQLSf9w2MOS6KOlu9XdhRSDqWnCDkzoVBqHJ3zH_My4p8D8ZgkIQ/viewform
+data_policy_url: "#data-policy"
+terms_url: https://usegalaxy.org/static/terms.html
+
 help_links:
-  - title: "Single Cell community help forum"
-    url: "https://usegalaxy-eu.github.io/scrna"
-  - title: "General Galaxy help forum"
-    url: "https://help.galaxyproject.org/c/usegalaxy-eu-support/6"
-  - title: "Single cell Galaxy user community chat room"
-    url: "https://matrix.to/#/#Galaxy-Training-Network_galaxy-single-cell:gitter.im"
-  - title: "Galaxy Training Community chat"
-    url: "https://matrix.to/#/#Galaxy-Training-Network_Lobby:gitter.im"
-  - title: "Usegalaxy.eu chat"
-    url: "https://matrix.to/#/#usegalaxy-eu_Lobby:gitter.im"
-  - title: "Usegalaxy.org chat"
-    url: "https://matrix.to/#/#galaxyproject_Lobby:gitter.im"
+  - title: Single Cell community help forum
+    url: https://help.galaxyproject.org/tag/scrna
+  - title: General Galaxy help forum
+    url: https://help.galaxyproject.org/c/usegalaxy-eu-support/6
+  - title: Single cell Galaxy user community chat room
+    url: https://matrix.to/#/#Galaxy-Training-Network_galaxy-single-cell:gitter.im
+  - title: Galaxy Training Community chat
+    url: https://matrix.to/#/#Galaxy-Training-Network_Lobby:gitter.im
+  - title: Usegalaxy.eu chat
+    url: https://matrix.to/#/#usegalaxy-eu_Lobby:gitter.im
+  - title: Usegalaxy.org chat
+    url: https://matrix.to/#/#galaxyproject_Lobby:gitter.im
+
 conclusion_extra_md: >
-  {% markdown_from_url 'https://raw.githubusercontent.com/galaxyproject/galaxy-hub/master/content/eu/common/data-policy.md' %}
+  <div id="data-policy">
+    {% markdown_from_url 'https://raw.githubusercontent.com/galaxyproject/galaxy-hub/master/content/eu/common/data-policy.md' %}
+  </div>
   <section>
     <iframe style="border: 0px" width="100%" height="150px" src="https://stats.galaxyproject.eu/d-solo/000000034/jobs-dashboard?orgId=1&amp;refresh=1m&amp;panelId=1"></iframe>
   </section>

diff --git a/subdomains/singlecell/usegalaxy.org.au.yml b/subdomains/singlecell/usegalaxy.org.au.yml
@@ -22,17 +22,21 @@ feedback_email: [email protected]
 
 # More variables for MD/HTML templating
 support_url: https://site.usegalaxy.org.au/request
+quota_request_url: https://site.usegalaxy.org.au/request/quota
+data_policy_url: https://site.usegalaxy.org.au/about#data-privacy
+terms_url: https://site.usegalaxy.org.au/about#terms-of-service
+
 help_links:
-  - title: "Single Cell community help forum"
-    url: "https://usegalaxy-eu.github.io/scrna"
-  - title: "General Galaxy help forum"
-    url: "https://help.galaxyproject.org/c/usegalaxy-eu-support/6"
-  - title: "Single cell Galaxy user community chat room"
-    url: "https://matrix.to/#/#Galaxy-Training-Network_galaxy-single-cell:gitter.im"
-  - title: "Galaxy Training Community chat"
-    url: "https://matrix.to/#/#Galaxy-Training-Network_Lobby:gitter.im"
-  - title: "Usegalaxy.org chat"
-    url: "https://matrix.to/#/#galaxyproject_Lobby:gitter.im"
+  - title: Single Cell community help forum
+    url: https://usegalaxy-eu.github.io/scrna
+  - title: General Galaxy help forum
+    url: https://help.galaxyproject.org/c/usegalaxy-eu-support/6
+  - title: Single cell Galaxy user community chat room
+    url: https://matrix.to/#/#Galaxy-Training-Network_galaxy-single-cell:gitter.im
+  - title: Galaxy Training Community chat
+    url: https://matrix.to/#/#Galaxy-Training-Network_Lobby:gitter.im
+  - title: Usegalaxy.org chat
+    url: https://matrix.to/#/#galaxyproject_Lobby:gitter.im
 # conclusion_extra_md: ""
 
 # -----------------------------------------------------------------------------

diff --git a/subdomains/singlecell/usegalaxy.org.yml b/subdomains/singlecell/usegalaxy.org.yml
@@ -21,19 +21,23 @@ root_domain: usegalaxy.org
 # feedback_email: [email protected]
 
 support_url: https://help.galaxyproject.org/
+# quota_request_url: ""
+data_policy_url: https://usegalaxy.org/static/terms.html
+terms_url: https://usegalaxy.org/static/terms.html
+
 help_links:
-  - title: "Galaxy AU support"
-    url: "https://site.usegalaxy.org.au/request"
-  - title: "Single Cell community help forum"
-    url: "https://usegalaxy-eu.github.io/scrna"
-  - title: "General Galaxy help forum"
-    url: "https://help.galaxyproject.org/c/usegalaxy-eu-support/6"
-  - title: "Single cell Galaxy user community chat room"
-    url: "https://matrix.to/#/#Galaxy-Training-Network_galaxy-single-cell:gitter.im"
-  - title: "Galaxy Training Community chat"
-    url: "https://matrix.to/#/#Galaxy-Training-Network_Lobby:gitter.im"
-  - title: "Usegalaxy.org chat"
-    url: "https://matrix.to/#/#galaxyproject_Lobby:gitter.im"
+  - title: Galaxy AU support
+    url: https://site.usegalaxy.org.au/request
+  - title: Single Cell community help forum
+    url: https://usegalaxy-eu.github.io/scrna
+  - title: General Galaxy help forum
+    url: https://help.galaxyproject.org/c/usegalaxy-eu-support/6
+  - title: Single cell Galaxy user community chat room
+    url: https://matrix.to/#/#Galaxy-Training-Network_galaxy-single-cell:gitter.im
+  - title: Galaxy Training Community chat
+    url: https://matrix.to/#/#Galaxy-Training-Network_Lobby:gitter.im
+  - title: Usegalaxy.org chat
+    url: https://matrix.to/#/#galaxyproject_Lobby:gitter.im
 # conclusion_extra_md: ""
 
 # -----------------------------------------------------------------------------