From 77f4d377df0f8c1d014903131213edba680e2474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9r=C3=A9nice=20Batut?= Date: Mon, 27 Aug 2018 14:44:08 +0200 Subject: [PATCH 1/9] Embed a short feedback form at the bottom of the tutorial --- _layouts/tutorial_hands_on.html | 10 +++++----- assets/css/main.scss | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index ef8d9c23908a1b..f5da34d906a1e5 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -221,12 +221,12 @@

{% icon congratulations %} Congratulations on successfully completing this t
+ + diff --git a/assets/css/main.scss b/assets/css/main.scss index 4f6656115cf6f9..f131e5c0570402 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -219,6 +219,12 @@ footer { .fold-unfold { margin-left: $tutorial-box-spacing; } + + .google-form { + width: 100%; + height: 1000px; + border: 0; + } } .contributors { From be566c3c0559176b67fc3a59cae6c8f5dcdad1b4 Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Tue, 28 Aug 2018 15:47:25 +0200 Subject: [PATCH 2/9] add discalaimer about type and visibility of feedback --- _layouts/tutorial_hands_on.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index f5da34d906a1e5..d4f68f6d3bdd70 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -221,6 +221,10 @@

{% icon congratulations %} Congratulations on successfully completing this t
+

Please let us know what you thought of this tutorial below! This feedback should be about the training materials themselves only. If tools were not working or missing, please contact the administrators of the Galaxy instance you used.

+ +

Please note that your feedback will be anonymous, but publicly visible (on this GitHub issue).

+ From 1c4d8fbb3c0843993884dc072b52ea0e26f588de Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Tue, 28 Aug 2018 15:59:25 +0200 Subject: [PATCH 3/9] change height to account for extra description text added to form --- assets/css/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/main.scss b/assets/css/main.scss index f131e5c0570402..da2d2a9b2657b7 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -222,7 +222,7 @@ footer { .google-form { width: 100%; - height: 1000px; + height: 1200px; border: 0; } } From fd21b11fb4c77f2a4d6b8f87645a4cff7e99ec90 Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Tue, 28 Aug 2018 17:55:22 +0200 Subject: [PATCH 4/9] moved disclaimers to forms --- _layouts/tutorial_hands_on.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index d4f68f6d3bdd70..f5da34d906a1e5 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -221,10 +221,6 @@

{% icon congratulations %} Congratulations on successfully completing this t
-

Please let us know what you thought of this tutorial below! This feedback should be about the training materials themselves only. If tools were not working or missing, please contact the administrators of the Galaxy instance you used.

- -

Please note that your feedback will be anonymous, but publicly visible (on this GitHub issue).

- From d7fd230270f6fd33f2f6f08629099c0d0ab746d3 Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Tue, 28 Aug 2018 17:55:38 +0200 Subject: [PATCH 5/9] change height to account for extra description text added to form --- assets/css/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/main.scss b/assets/css/main.scss index da2d2a9b2657b7..69928ab185b9cd 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -222,7 +222,7 @@ footer { .google-form { width: 100%; - height: 1200px; + height: 1400px; border: 0; } } From 11045485cfce82b39d4922ce62d215d500fd24f2 Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Thu, 30 Aug 2018 11:51:24 +0200 Subject: [PATCH 6/9] improve styling, moved hrule to form header image --- _layouts/tutorial_hands_on.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index f5da34d906a1e5..55bbdb27660842 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -217,9 +217,9 @@

Developing GTN training material

{% endif %} +

{% icon congratulations %} Congratulations on successfully completing this tutorial!

-
From 87d0d81b271c78ead33ddd7a8d734f75c382fd15 Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Thu, 30 Aug 2018 11:59:57 +0200 Subject: [PATCH 7/9] also prefill tutorial name for extended form --- _layouts/tutorial_hands_on.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index 55bbdb27660842..722ab88eec2ae2 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -226,7 +226,7 @@

{% icon congratulations %} Congratulations on successfully completing this t From abc568c7a7f14a676ba47bf839418cac82ecdf6e Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Thu, 30 Aug 2018 12:09:48 +0200 Subject: [PATCH 8/9] phrasing --- _layouts/tutorial_hands_on.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index 722ab88eec2ae2..2d12117735f10c 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -225,8 +225,8 @@

{% icon congratulations %} Congratulations on successfully completing this t From 0b820649795bcb0a5091dfd453f360bf6996c2f6 Mon Sep 17 00:00:00 2001 From: Saskia Hiltemann Date: Fri, 7 Sep 2018 14:42:53 +0200 Subject: [PATCH 9/9] google improved form embedding, undo formatting fixes --- _layouts/tutorial_hands_on.html | 4 ++-- assets/css/main.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index 2d12117735f10c..97fed5c4138fc8 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -217,9 +217,9 @@

Developing GTN training material

{% endif %} -

{% icon congratulations %} Congratulations on successfully completing this tutorial!

- +
+
diff --git a/assets/css/main.scss b/assets/css/main.scss index 69928ab185b9cd..f1e1674466bd60 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -222,7 +222,7 @@ footer { .google-form { width: 100%; - height: 1400px; + height: 1100px; border: 0; } }