Merge pull request #4925 from galaxyproject/wombat-bangus

Hackathon Improvements

404.md

@@ -9,3 +9,5 @@ title: "404 Page Not Found"
 Perhaps you are here due to a mis-typed URL
 
 [Return to the homepage]({{ site.baseurl }}){:.btn.btn-primary}, or [Search]({% link search.md %}){:.btn.btn-secondary} for your page.
+
+<script>document.addEventListener('DOMContentLoaded', function () { plausible('404', { props: { path: document.location.pathname } }); });</script>

_includes/analytics.html

@@ -27,11 +27,12 @@
 </script>
 
 <!-- Page view tracking -->
-<script async defer data-domain="training.galaxyproject.org" src="https://plausible.galaxyproject.eu/js/plausible.js"></script>
+<script defer data-domain="training.galaxyproject.org" src="https://plausible.galaxyproject.eu/js/plausible.js"></script>
 <script>
 if(localStorage.getItem('plausible-opt-out') !== 'opt-out' && navigator.doNotTrack !== "1") {
 	localStorage.removeItem("plausible_ignore")
 	console.log("Plausible: opt-in");
+	window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }
 } else {
 	// if they're opting-out, or DNT
 	// we might get one page by accident but we won't get future ones.

_layouts/home.html

@@ -34,7 +34,7 @@ <h2 class="alert-heading">{{ site.announcement.title }}</h2>
             <h2>Galaxy for Scientists</h2>
 	    <p>We have separated the tutorials into several categories based on field and technology. We are exploring other ways to organise the tutorials going forward!</p>
 
-	    <h3>Introduction</h3>
+	    <h3>Start Here</h3>
             <table class="table table-striped">
                 <thead>
                     <tr>
@@ -77,7 +77,7 @@ <h3 style="margin: unset;">Not sure where to start?</h3>
               </div>
             </div>
 
-            <h3>Fields</h3>
+            <h3>Scientific Fields</h3>
             <table class="table table-striped">
                 <thead>
                     <tr>
@@ -105,7 +105,7 @@ <h3>Fields</h3>
                 </tbody>
             </table>
 
-            <h3>Technologies</h3>
+            <h3>Methodologies</h3>
             <table class="table table-striped">
                 <thead>
                     <tr>

_layouts/tutorial_hands_on.html

@@ -276,6 +276,25 @@ <h4 class="alert-heading">Under Development!</h4>
                 </section>
 
                 <section aria-label="Tutorial Footer, Feedback, Citation" id="tutorial-footer">
+                        <h3>You've Finished the Tutorial</h3>
+                        <button id="tutorial-finish-button" class="btn btn-primary" onclick="tutorial_finish()">I finished this tutorial 👍</button>
+                        <p style="display: none" id="tutorial-finish-text">Please also consider filling out the <a href="#gtn-feedback">Feedback Form</a> as well!</p>
+                        <script>
+                        function tutorial_finish() {
+                          if(plausible !== undefined){
+                            plausible('TutorialComplete', {callback: tutorial_finish_finish, props: {path: document.location.pathname}})
+                          } else {
+                            tutorial_finish_finish();
+                          }
+                        }
+                        function tutorial_finish_finish() {
+                          document.getElementById("tutorial-finish-button").innerText = 'Congrats! Thanks for letting us know! 🎉'
+                          document.getElementById("tutorial-finish-button").disabled = true
+                          document.getElementById("tutorial-finish-button").disabled = true
+                          document.getElementById("tutorial-finish-text").style.display = 'block'
+                        }
+                        </script>
+
                 {% if page.key_points %}
                 <blockquote class="key_points">
                     <div class="box-title">{% icon keypoints aria=false %} {{locale['key-points'] | default: "Key points" }}</div>
@@ -331,14 +350,12 @@ <h1 data-toc-skip>{{ locale['glossary'] | default: "Glossary"}}</h1>
                 </dl>
                 {% endif %}
 
-                <h1>{{locale['feedback'] | default: "Feedback" }}</h1>
+                <h1 id="gtn-feedback">{{locale['feedback'] | default: "Feedback" }}</h1>
                 <p class="text-muted">{{ locale['feedback-text'] | default: "Did you use this material as an instructor? Feel free to give us feedback on"}} <a href="https://github.com/galaxyproject/training-material/issues/1452">{{ locale['feedback-link-text'] | default: "how it went"}}</a>.
                 <br>{{ locale['feedback-text-learner'] | default: "Did you use this material as a learner or student? Click the form below to leave feedback." }}<i class="fas fa-hand-point-down"></i>
                 </p>
 
-		<a href="https://docs.google.com/forms/d/e/1FAIpQLSd4VZptFTQ03kHkMz0JyW9b6_S8geU5KjNE_tLM0dixT3ZQmA/viewform?embedded=true&entry.1235803833={{ own_material_id }}" alt="Feedback form link">
-                    <img src="/training-material/shared/images/feedback.png" alt="Preview of the google form" />
-                </a>
+                <iframe id="feedback-google" class="google-form" src="https://docs.google.com/forms/d/e/1FAIpQLSd4VZptFTQ03kHkMz0JyW9b6_S8geU5KjNE_tLM0dixT3ZQmA/viewform?embedded=true&entry.1235803833={{ own_material_id }}"><a href="https://docs.google.com/forms/d/e/1FAIpQLSd4VZptFTQ03kHkMz0JyW9b6_S8geU5KjNE_tLM0dixT3ZQmA/viewform?embedded=true&entry.1235803833={{ own_material_id }}">Feedback Form</a></iframe>
 
                 <h1>{{locale['citing-tutorial'] | default: "Citing this Tutorial"}}</h1>
                 <p>

_plugins/gtn.rb

@@ -681,6 +681,17 @@ def group_icons(icons)
           match
         end
       end
+
+      # This would also need to modify the box types themselves, not sure how is best to do that.
+      page.content = page.content.gsub(/> \[!(NOTE|TIP|IMPORTANT|WARNING|CAUTION)\]/) do |match|
+        if match =~ /(CAUTION|WARNING)/
+          "> <warning-title></warning-title>"
+        elsif match =~ /TIP/
+          "> <tip-title></tip-title>"
+        else
+          "> <comment-title></comment-title>"
+        end
+      end
     end
   end
 end

assets/css/fonts.css

@@ -1,7 +1,12 @@
 @font-face {
-  font-family: 'Yanone Kaffeesatz';
-  font-style: normal;
-  font-weight: 100 900;
-  font-style: normal oblique;
-  src: url(/training-material/assets/fonts/yanonekaffeesatz/YanoneKaffeesatz-VariableFont_wght.woff2);
+  font-family: 'DIN 1451';
+  font-display: swap;
+  src: url(/training-material/assets/fonts/DIN1451/Altinn-DINCondensed.woff2);
+}
+
+@font-face {
+  font-family: 'DIN 1451';
+  font-weight: bold;
+  font-display: swap;
+  src: url(/training-material/assets/fonts/DIN1451/Altinn-DINCondensed-Bold.woff2);
 }

assets/css/slides.scss

@@ -21,10 +21,10 @@ body.remark-container {
 	h1,
 	h2,
 	h3 {
-		font-family: 'Yanone Kaffeesatz';
-		font-weight: normal;
+		font-family: 'DIN 1451';
 		text-align: center;
 	}
+	h1 { font-weight: 900; }
 
 	h3 {
 		position: absolute;

assets/fonts/yanonekaffeesatz/LICENSE.txt → assets/fonts/DIN1451/OFL-1.1.txt

@@ -1,93 +1,102 @@
-Copyright 2010 The Yanone Kaffeesatz Project Authors (https://github.com/alexeiva/yanone-kaffeesatz)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright (C) 2019 Altinn https://github.com/Altinn/altinn-din,
+with Reserved Font Names "Altinn-DIN".
+
+Copyright (C) 2019 Altinn https://github.com/Altinn/altinn-din,
+with Reserved Font Names "Altinn-DIN Condensed".
+
+Copyright (C) 2019 Altinn https://github.com/Altinn/altinn-din,
+with Reserved Font Names "Altinn-DIN Expanded".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: 
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+
+

licenses.md

@@ -15,10 +15,10 @@ Our default avatar is from https://thenounproject.com/icon/users-1926333/ availa
 {% include assets/fonts/AtkinsonHyperlegible/LICENSE.txt %}
 </pre>
 
-## Yanone Kaffeesatz
+## Altin-DIN
 
 <pre>
-{% include assets/fonts/yanonekaffeesatz/LICENSE.txt %}
+{% include assets/fonts/DIN1451/OFL-1.1.txt %}
 </pre>
 
 ## Comic Mono

topics/data-science/metadata.yaml

@@ -7,7 +7,7 @@ summary: "These lessons will help you get your feet in data science and give you
 edam_ontology: ["topic_3372"]
 
 subtopics:
-  - id: olympics
+  - id: next-steps # It's a bad ID but we need to sync with intro topic to crosslink the galaxy data manip
     title: "Data Manipulation Olympics"
     description: "These tutorials take the same dataset, and show you how to slice and dice it in numerous languages"
   - id: bash

topics/data-science/tutorials/data-manipulation-olympics

@@ -0,0 +1 @@
+../../introduction/tutorials/data-manipulation-olympics

topics/data-science/tutorials/data-manipulation-olympics-jq/tutorial.md

@@ -30,7 +30,8 @@ contributions:
     - gallantries
 level: Introductory
 
-subtopic: olympics
+priority: 4
+subtopic: next-steps
 ---
 
 

topics/data-science/tutorials/data-manipulation-olympics-sql/tutorial.md

@@ -34,7 +34,8 @@ notebook:
 abbreviations:
     SQL: "Structured Query Language"
 
-subtopic: olympics
+priority: 3
+subtopic: next-steps
 ---
 
 

topics/data-science/tutorials/data-manipulation-olympics-viz-r/tutorial.md

@@ -37,7 +37,8 @@ notebook:
   - patchwork
   - hexbin
 
-subtopic: olympics
+priority: 2
+subtopic: next-steps
 ---
 
 In this tutorial, you will learn how to produce scatter plots, boxplots, and time series plots using ggplot. You will also learn how to set universal plot settings, modify the aesthetics of an existing ggplot plots (including axis labels and color), and learn how to facet in ggplot.