From ad4bb313a3dd354d95e43fe212b2aaa88e4de909 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 28 Feb 2024 10:23:51 +0100 Subject: [PATCH 1/8] Create card with a link to our documentation to help teachers get started --- app/views/pages/_teacher_intro_card.html.erb | 15 +++++++++++++++ app/views/pages/home.html.erb | 3 +++ config/locales/views/pages/en.yml | 5 +++++ config/locales/views/pages/nl.yml | 4 ++++ 4 files changed, 27 insertions(+) create mode 100644 app/views/pages/_teacher_intro_card.html.erb diff --git a/app/views/pages/_teacher_intro_card.html.erb b/app/views/pages/_teacher_intro_card.html.erb new file mode 100644 index 0000000000..0c56be7d6e --- /dev/null +++ b/app/views/pages/_teacher_intro_card.html.erb @@ -0,0 +1,15 @@ +
+
+

+ <%= t ".title" %> +

+ <% if current_user.student? %> +

+ <%= t ".rights_request_html" %> +

+ <% end %> +

+ <%= t ".documentation_html" %> +

+
+
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index 6eaca505be..0b96f9c23f 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -38,6 +38,9 @@
+ <% if current_user.administrating_courses.empty? && (current_user.staff? || current_user.institution&.users&.count == 1) %> + <%= render partial: 'teacher_intro_card' %> + <% end %> <%= render "user_card" %> <% if current_user.pending_courses.any? %> <%= render "pending_courses_card" %> diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index cdfcb4330a..23a1e51e70 100644 --- a/config/locales/views/pages/en.yml +++ b/config/locales/views/pages/en.yml @@ -158,3 +158,8 @@ en: supported_by: Supported by supported_p1_html: "Dodona is run by a small team of researchers at Ghent University. The platform is open source and all code is available on GitHub. The hosting is provided by Ghent University. In addition, Dodona is supported by educational innovation projects from Ghent University and the Faculty of Sciences. ELIXIR Belgium also provides some funding." support_button: Make a donation + teacher_intro_card: + title: Create your own course + rights_request_html: "Request teacher rights to be able to create your own courses." + documentation_html: "In our documentation you can find more information about how to get started with Dodona as a teacher in." + diff --git a/config/locales/views/pages/nl.yml b/config/locales/views/pages/nl.yml index 709cee65b4..be940cd9d5 100644 --- a/config/locales/views/pages/nl.yml +++ b/config/locales/views/pages/nl.yml @@ -158,3 +158,7 @@ nl: supported_by: Met de steun van supported_p1_html: "Dodona wordt ontwikkeld door een klein team onderzoekers aan de Universiteit Gent. Het platform is volledig open source en alle code is beschikbaar op GitHub. De hosting wordt aangeboden door de Universiteit Gent. Daarnaast ontving Dodona al steun in de vorm van onderwijsinnovatieprojecten van de Universiteit Gent en de Faculteit Wetenschappen. Ook ELIXIR Belgium ondersteunde dit project." support_button: Doe een gift + teacher_intro_card: + title: Maak je eigen cursus + rights_request_html: "Vraag lesgeversrechten aan om eigen curussen te kunnen maken." + documentation_html: "In onze documentatie vind je alle informatie over hoe je vlot van start gaat met Dodona als leerkracht." From f5e09af8450ca10f547b32cf28920e8d9a572836 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 28 Feb 2024 11:18:34 +0100 Subject: [PATCH 2/8] Update config/locales/views/pages/en.yml Co-authored-by: Charlotte Van Petegem --- config/locales/views/pages/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index 23a1e51e70..7bad32cfe5 100644 --- a/config/locales/views/pages/en.yml +++ b/config/locales/views/pages/en.yml @@ -161,5 +161,5 @@ en: teacher_intro_card: title: Create your own course rights_request_html: "Request teacher rights to be able to create your own courses." - documentation_html: "In our documentation you can find more information about how to get started with Dodona as a teacher in." + documentation_html: "In our documentation you can find more information about how to get started with Dodona as a teacher in." From f2ef6663ec727076a26b472f62b3d3894bd5b7a6 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 28 Feb 2024 14:41:56 +0100 Subject: [PATCH 3/8] Update config/locales/views/pages/en.yml Co-authored-by: Bart Mesuere --- config/locales/views/pages/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index 7bad32cfe5..0ab0ff8a7d 100644 --- a/config/locales/views/pages/en.yml +++ b/config/locales/views/pages/en.yml @@ -159,7 +159,7 @@ en: supported_p1_html: "Dodona is run by a small team of researchers at Ghent University. The platform is open source and all code is available on GitHub. The hosting is provided by Ghent University. In addition, Dodona is supported by educational innovation projects from Ghent University and the Faculty of Sciences. ELIXIR Belgium also provides some funding." support_button: Make a donation teacher_intro_card: - title: Create your own course + title: Start your own course today! rights_request_html: "Request teacher rights to be able to create your own courses." documentation_html: "In our documentation you can find more information about how to get started with Dodona as a teacher in." From e22892c68603334c784afe1abc167ef494734de9 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 28 Feb 2024 14:42:05 +0100 Subject: [PATCH 4/8] Update config/locales/views/pages/nl.yml Co-authored-by: Bart Mesuere --- config/locales/views/pages/nl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/pages/nl.yml b/config/locales/views/pages/nl.yml index be940cd9d5..16dd3f2281 100644 --- a/config/locales/views/pages/nl.yml +++ b/config/locales/views/pages/nl.yml @@ -159,6 +159,6 @@ nl: supported_p1_html: "Dodona wordt ontwikkeld door een klein team onderzoekers aan de Universiteit Gent. Het platform is volledig open source en alle code is beschikbaar op GitHub. De hosting wordt aangeboden door de Universiteit Gent. Daarnaast ontving Dodona al steun in de vorm van onderwijsinnovatieprojecten van de Universiteit Gent en de Faculteit Wetenschappen. Ook ELIXIR Belgium ondersteunde dit project." support_button: Doe een gift teacher_intro_card: - title: Maak je eigen cursus + title: Maak je eigen cursus aan! rights_request_html: "Vraag lesgeversrechten aan om eigen curussen te kunnen maken." documentation_html: "In onze documentatie vind je alle informatie over hoe je vlot van start gaat met Dodona als leerkracht." From e4da6ff54d229ce11c86d692817ee15cddeebf77 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 28 Feb 2024 14:42:55 +0100 Subject: [PATCH 5/8] Update config/locales/views/pages/en.yml Co-authored-by: Bart Mesuere --- config/locales/views/pages/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index 0ab0ff8a7d..d2c494fdcc 100644 --- a/config/locales/views/pages/en.yml +++ b/config/locales/views/pages/en.yml @@ -161,5 +161,5 @@ en: teacher_intro_card: title: Start your own course today! rights_request_html: "Request teacher rights to be able to create your own courses." - documentation_html: "In our documentation you can find more information about how to get started with Dodona as a teacher in." + documentation_html: "Get detailed guidance on launching your own courses with Dodona by visiting our documentation." From 58427a5e3fa22ba55f8f40c9c5ecc6c19f442494 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 28 Feb 2024 14:43:18 +0100 Subject: [PATCH 6/8] Update config/locales/views/pages/nl.yml Co-authored-by: Bart Mesuere --- config/locales/views/pages/nl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/pages/nl.yml b/config/locales/views/pages/nl.yml index 16dd3f2281..510a0c7b8c 100644 --- a/config/locales/views/pages/nl.yml +++ b/config/locales/views/pages/nl.yml @@ -160,5 +160,5 @@ nl: support_button: Doe een gift teacher_intro_card: title: Maak je eigen cursus aan! - rights_request_html: "Vraag lesgeversrechten aan om eigen curussen te kunnen maken." + rights_request_html: "Wist je dat je je eigen cursussen op Dodona kunt maken? Vraag lesgeversrechten aan om van start te gaan." documentation_html: "In onze documentatie vind je alle informatie over hoe je vlot van start gaat met Dodona als leerkracht." From 2c2af96f7d25e01fd9b5fb2ade313b549bd9a442 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 28 Feb 2024 14:43:29 +0100 Subject: [PATCH 7/8] Update config/locales/views/pages/nl.yml Co-authored-by: Bart Mesuere --- config/locales/views/pages/nl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/pages/nl.yml b/config/locales/views/pages/nl.yml index 510a0c7b8c..581bde99fc 100644 --- a/config/locales/views/pages/nl.yml +++ b/config/locales/views/pages/nl.yml @@ -161,4 +161,4 @@ nl: teacher_intro_card: title: Maak je eigen cursus aan! rights_request_html: "Wist je dat je je eigen cursussen op Dodona kunt maken? Vraag lesgeversrechten aan om van start te gaan." - documentation_html: "In onze documentatie vind je alle informatie over hoe je vlot van start gaat met Dodona als leerkracht." + documentation_html: "Ontdek hoe je eigen cursus op Dodona kunt starten met hulp van onze documentatie." From 3d71d0a12445d0fbae7b23261fd367102bfa2c8a Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 28 Feb 2024 15:00:54 +0100 Subject: [PATCH 8/8] Make teacher info card colored --- .../bootstrap_css_variable_overrides.css.scss | 3 ++- app/views/pages/_teacher_intro_card.html.erb | 22 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_css_variable_overrides.css.scss b/app/assets/stylesheets/bootstrap_css_variable_overrides.css.scss index 7da4b3a0ed..4a32f646ce 100644 --- a/app/assets/stylesheets/bootstrap_css_variable_overrides.css.scss +++ b/app/assets/stylesheets/bootstrap_css_variable_overrides.css.scss @@ -38,10 +38,11 @@ --bs-danger-rgb: var(--d-danger-rgb); --bs-light: $neutral-90; --bs-dark: $neutral-25; + --bs-secondary-text-emphasis: var(--d-on-secondary-container); + --bs-secondary-bg-subtle: var(--d-secondary-container); // not overwritten // --bs-primary-text-emphasis: #052c65; - // --bs-secondary-text-emphasis: #2b2f32; // --bs-success-text-emphasis: #0a3622; // --bs-info-text-emphasis: #055160; // --bs-warning-text-emphasis: #664d03; diff --git a/app/views/pages/_teacher_intro_card.html.erb b/app/views/pages/_teacher_intro_card.html.erb index 0c56be7d6e..beae0676c7 100644 --- a/app/views/pages/_teacher_intro_card.html.erb +++ b/app/views/pages/_teacher_intro_card.html.erb @@ -1,15 +1,13 @@ -
-
-

- <%= t ".title" %> -

- <% if current_user.student? %> -

- <%= t ".rights_request_html" %> -

- <% end %> +
+

+ <%= t ".title" %> +

+ <% if current_user.student? %>

- <%= t ".documentation_html" %> + <%= t ".rights_request_html" %>

-
+ <% end %> +

+ <%= t ".documentation_html" %> +