From f7e3a931f3876e802ba3f8466465010bb4bfda91 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 12 Jan 2024 09:56:59 +0100 Subject: [PATCH 01/11] Remove 'intgraal' --- config/locales/views/pages/en.yml | 2 +- config/locales/views/pages/nl.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index ceb9c35281..ec4bf92f5c 100644 --- a/config/locales/views/pages/en.yml +++ b/config/locales/views/pages/en.yml @@ -148,7 +148,7 @@ en: exercises: Exercises schools: Schools intro_p1_html: "Dodona is an online exercise platform for learning to code. It wants to teach students how to program in the most meaningful and effective way possible. Dodona acts as an online co-teacher, designed to give every student access to high quality education. The focus is on automatic corrections and giving meaningful feedback on the submitted solutions from students." - intro_p2_html: "Dodona is free to use for schools and thanks to your support, we would like to keep it that way! Keeping this platform up and running takes a lot of time, just as supporting hundreds of schools and thousands of students. Your support would go entirely to personnel (e.g., paid internships) that help developing new features and supporting users." + intro_p2_html: "Dodona is free to use for schools and thanks to your support, we would like to keep it that way! Keeping this platform up and running takes a lot of time, just as supporting hundreds of schools and thousands of students. Your support helps to pay our personnel. They develop new features and provide support for users." intro_p3_html: "Please contact us at dodona@ugent.be for more information about this project." how_to_support: How can you support us? support_p1_html: "Thanks to the University Fund of Ghent University, you can support us in a tax-friendly manner. Donations over 40 euros come with a tax certificate, which allows you to recover 45% through your personal income tax. There are no additional charges, so we receive your donation for the full 100%." diff --git a/config/locales/views/pages/nl.yml b/config/locales/views/pages/nl.yml index 296e424e3e..fdac2be9ee 100644 --- a/config/locales/views/pages/nl.yml +++ b/config/locales/views/pages/nl.yml @@ -148,7 +148,7 @@ nl: exercises: Oefeningen schools: Scholen intro_p1_html: "Dodona is een online oefenplatform om te leren programmeren. Het wil studenten op een zo zinvolle en zo effectief mogelijke manier leren programmeren. Dodona gedraagt zich als een online co-teacher die ontworpen is om elke student toegang te geven tot onderwijs van hoge kwaliteit. De focus ligt op het automatisch verbeteren en het geven van zinvolle feedback op ingediende oplossingen van de studenten." - intro_p2_html: "Dodona wordt gratis aangeboden aan scholen en onderwijsinstellingen en met uw steun willen we dat graag zou houden! Het online houden van dit platform vergt heel wat tijd, net als de ondersteuning voor honderden scholen en duizenden studenten. Uw steun gaat integraal naar personeel (zoals bijvoorbeeld jobstudenten) die meehelpen met het ontwikkelen van nieuwe features en het ondersteunen van gebruikers." + intro_p2_html: "Dodona wordt gratis aangeboden aan scholen en onderwijsinstellingen en met uw steun willen we dat graag zou houden! Het online houden van dit platform vergt heel wat tijd, net als de ondersteuning voor honderden scholen en duizenden studenten. Uw steun helpt de lonen van onze medewerkers te betalen. Zij ontwikkelen nieuwe features en ondersteunen gebruikers." intro_p3_html: "Contacteer ons gerust op dodona@ugent.be voor meer info over dit project." how_to_support: Hoe kunt u ons steunen? support_p1_html: "Dankzij het Universiteitsfonds van de Universiteit Gent kunt u fiscaal voordelig schenken aan Dodona. Voor giften vanaf 40 euro ontvangt u een fiscaal attest waarmee u 45% van uw gift recupereert in uw belastingaangifte. Uw gift komt bovendien integraal bij ons terecht." From 9225a57208ffa32af6ae9e539aedbbd7308b6b07 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 12 Jan 2024 10:22:21 +0100 Subject: [PATCH 02/11] Add support button --- app/views/pages/support.html.erb | 8 ++++++-- config/locales/views/pages/en.yml | 5 +++-- config/locales/views/pages/nl.yml | 5 +++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/views/pages/support.html.erb b/app/views/pages/support.html.erb index 8368c766b0..5503deb6eb 100644 --- a/app/views/pages/support.html.erb +++ b/app/views/pages/support.html.erb @@ -22,9 +22,13 @@

<%= t ".how_to_support" %>

<%= t ".support_p1_html" %>

-
- <%= t ".support_p2_html" %> + <% link_lang = I18n.locale == :en ? "en-GB" : "nl-NL" %> +
+ + <%= t ".support_button" %> +
+

<%= t ".support_p2_html" %>

<%= t ".support_p3_html" %>

diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index ec4bf92f5c..8f266f543a 100644 --- a/config/locales/views/pages/en.yml +++ b/config/locales/views/pages/en.yml @@ -151,8 +151,9 @@ en: intro_p2_html: "Dodona is free to use for schools and thanks to your support, we would like to keep it that way! Keeping this platform up and running takes a lot of time, just as supporting hundreds of schools and thousands of students. Your support helps to pay our personnel. They develop new features and provide support for users." intro_p3_html: "Please contact us at dodona@ugent.be for more information about this project." how_to_support: How can you support us? - support_p1_html: "Thanks to the University Fund of Ghent University, you can support us in a tax-friendly manner. Donations over 40 euros come with a tax certificate, which allows you to recover 45% through your personal income tax. There are no additional charges, so we receive your donation for the full 100%." - support_p2_html: "You can make a voluntary donation to our project by making a deposit to the account of the University Fund account at BE26 3900 9658 0329 (BIC: BBRUBEBB) by mentioning Dodona." + support_p1_html: "Thanks to the University Fund of Ghent University, you can support us in a tax-friendly manner. Donations over 40 euros come with a tax certificate, which allows you to recover 45% through your personal income tax." + support_p2_html: "You can als make a deposit to the account of the University Fund account at BE26 3900 9658 0329 (BIC: BBRUBEBB) by mentioning Dodona." support_p3_html: "If you would like to donate a larger amount or wish to sponsor us (by invoice), please contact us at dodona@ugent.be and we'd be happy to look at the possibilities." 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 diff --git a/config/locales/views/pages/nl.yml b/config/locales/views/pages/nl.yml index fdac2be9ee..c26d6ae709 100644 --- a/config/locales/views/pages/nl.yml +++ b/config/locales/views/pages/nl.yml @@ -151,8 +151,9 @@ nl: intro_p2_html: "Dodona wordt gratis aangeboden aan scholen en onderwijsinstellingen en met uw steun willen we dat graag zou houden! Het online houden van dit platform vergt heel wat tijd, net als de ondersteuning voor honderden scholen en duizenden studenten. Uw steun helpt de lonen van onze medewerkers te betalen. Zij ontwikkelen nieuwe features en ondersteunen gebruikers." intro_p3_html: "Contacteer ons gerust op dodona@ugent.be voor meer info over dit project." how_to_support: Hoe kunt u ons steunen? - support_p1_html: "Dankzij het Universiteitsfonds van de Universiteit Gent kunt u fiscaal voordelig schenken aan Dodona. Voor giften vanaf 40 euro ontvangt u een fiscaal attest waarmee u 45% van uw gift recupereert in uw belastingaangifte. Uw gift komt bovendien integraal bij ons terecht." - support_p2_html: "Giften kunnen worden overgemaakt op het rekeningnummer van het Universiteitsfonds zijnde 390-0965803-29 of IBAN BE26 3900 9658 0329 (BIC: BBRUBEBB) met als mededeling Dodona." + support_p1_html: "Dankzij het Universiteitsfonds van de Universiteit Gent kunt u fiscaal voordelig schenken aan Dodona. Voor giften vanaf 40 euro ontvangt u een fiscaal attest waarmee u 45% van uw gift recupereert in uw belastingaangifte." + support_p2_html: "Indien je liever een overschrijving plaatst kan dit op het rekeningnummer van het Universiteitsfonds zijnde BE26 3900 9658 0329 (BIC: BBRUBEBB) met als mededeling Dodona." support_p3_html: "Wenst u een groter bedrag te schenken of kiest u liever voor sponsoring op factuur? Contacteer ons op dodona@ugent.be en we bekijken samen graag de mogelijkheden." 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 From 319a9023babf730649127881c9ebaf1df21d1045 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 12 Jan 2024 11:02:43 +0100 Subject: [PATCH 03/11] Add support button in navbar --- app/assets/stylesheets/layout/navbar.css.scss | 53 +++++++++++++------ app/views/layouts/_breadcrumbs.html.erb | 1 - app/views/layouts/_navbar.html.erb | 3 +- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/layout/navbar.css.scss b/app/assets/stylesheets/layout/navbar.css.scss index 3e689aec32..b95e28fa7c 100644 --- a/app/assets/stylesheets/layout/navbar.css.scss +++ b/app/assets/stylesheets/layout/navbar.css.scss @@ -26,6 +26,10 @@ a:not(.dropdown-item) { color: var(--d-on-primary); text-decoration: none; + + &:hover { + opacity: 0.8; + } } li { @@ -60,7 +64,7 @@ flex-shrink: 1; flex-grow: 100; - @include media-breakpoint-up(sm) { + @include media-breakpoint-up(md) { max-width: calc(100vw - 240px); } @@ -116,7 +120,7 @@ i { line-height: var(--d-navbar-height); - @include media-breakpoint-up(sm) { + @include media-breakpoint-up(md) { display: none; } } @@ -128,7 +132,7 @@ flex-shrink: 1; flex-grow: 1; - @include media-breakpoint-up(sm) { + @include media-breakpoint-up(md) { max-width: calc(100vw - 240px); } @@ -149,7 +153,7 @@ } .actions { - @include media-breakpoint-down(sm) { + @include media-breakpoint-down(md) { display: none; } @@ -165,7 +169,7 @@ padding-left: 8px; padding-right: 8px; - @include media-breakpoint-up(sm) { + @include media-breakpoint-up(md) { padding-bottom: 11px; &.active { @@ -184,6 +188,7 @@ .dropdown-nav { padding-right: 20px; padding-left: 20px; + margin-bottom: 5px; .notification-dropdown { .table > tbody > tr:first-of-type > td { @@ -237,6 +242,11 @@ } } + li { + margin-top: auto; + margin-bottom: auto; + } + li a { padding-left: 8px; } @@ -249,7 +259,7 @@ } .action { - @include media-breakpoint-up(sm) { + @include media-breakpoint-up(md) { display: none; } } @@ -266,7 +276,7 @@ } } - @include media-breakpoint-down(sm) { + @include media-breakpoint-down(md) { .dropdown-toggle { .caret { @include media-breakpoint-down(lg) { @@ -291,7 +301,7 @@ } .dodona-navbar-toggle { - @include media-breakpoint-up(sm) { + @include media-breakpoint-up(md) { display: none; } @@ -310,15 +320,28 @@ .dropdown-nav { white-space: nowrap; - li.sign-in { - transform: translateY(-6px); + li.support { + a.btn.btn-outline { + padding-left: 24px !important; + + &:hover { + border-color: var(--d-on-primary); + } + + @include media-breakpoint-down(md) { + padding: 0 !important; + padding-left: 8px !important; + border: none; + height: initial; + } + } } - @include media-breakpoint-up(sm) { - display: inline-block; + @include media-breakpoint-up(md) { + display: inline-flex; } - @include media-breakpoint-down(sm) { + @include media-breakpoint-down(md) { @include shadow-z3; position: absolute; @@ -336,7 +359,7 @@ } .dropdown-title { - @include media-breakpoint-up(sm) { + @include media-breakpoint-up(md) { @include media-breakpoint-down(lg) { display: none; } @@ -344,7 +367,7 @@ display: inline-block; - @include media-breakpoint-down(sm) { + @include media-breakpoint-down(md) { padding-left: 25px; } diff --git a/app/views/layouts/_breadcrumbs.html.erb b/app/views/layouts/_breadcrumbs.html.erb index 33cf54af98..bb27434541 100644 --- a/app/views/layouts/_breadcrumbs.html.erb +++ b/app/views/layouts/_breadcrumbs.html.erb @@ -10,7 +10,6 @@ <%= link_to(t("layout.menu.activities"), activities_path) %> <%= link_to(t("layout.menu.courses"), courses_path) %> <%= link_to(t("layout.menu.publications"), publications_path) %> - <%= link_to(t("layout.menu.support_us"), support_us_path) %> <%= link_to(t("layout.menu.manual"), "https://docs.dodona.be/#{I18n.locale}") %> <%= link_to(t("layout.menu.contact"), contact_path) %> diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index 3f973d736e..1e5498ccca 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -8,7 +8,7 @@ <% end %> <%= link_to root_path, class: "brand" do %> - Dodona + Dodona <% end %> @@ -25,6 +25,7 @@
-
-
    " class="dropdown-nav collapse"> +
From 857405a9083820cbafb0b750ec940eb315892c3b Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 16 Jan 2024 15:47:02 +0100 Subject: [PATCH 08/11] Add extra margin --- app/assets/stylesheets/layout/navbar.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/layout/navbar.css.scss b/app/assets/stylesheets/layout/navbar.css.scss index 99649f32a8..d09004a662 100644 --- a/app/assets/stylesheets/layout/navbar.css.scss +++ b/app/assets/stylesheets/layout/navbar.css.scss @@ -247,6 +247,7 @@ li { margin-top: auto; margin-bottom: auto; + margin-right: 2px; } li a { From 1ec6c68dddc92528e7dacbf768b235fa955a796c Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 16 Jan 2024 15:52:22 +0100 Subject: [PATCH 09/11] Fix small screen dropdown --- app/assets/stylesheets/layout/navbar.css.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/layout/navbar.css.scss b/app/assets/stylesheets/layout/navbar.css.scss index d09004a662..f6691f953f 100644 --- a/app/assets/stylesheets/layout/navbar.css.scss +++ b/app/assets/stylesheets/layout/navbar.css.scss @@ -244,10 +244,12 @@ } } - li { - margin-top: auto; - margin-bottom: auto; - margin-right: 2px; + @include media-breakpoint-up(md) { + li { + margin-top: auto; + margin-bottom: auto; + margin-right: 2px; + } } li a { From a322bcedf0a72997e25ccfc54a4b10c7ab6a434d Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 16 Jan 2024 15:55:31 +0100 Subject: [PATCH 10/11] Add support button --- app/views/pages/support.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/pages/support.html.erb b/app/views/pages/support.html.erb index 5503deb6eb..c910f36e80 100644 --- a/app/views/pages/support.html.erb +++ b/app/views/pages/support.html.erb @@ -1,3 +1,4 @@ +<% link_lang = I18n.locale == :en ? "en-GB" : "nl-NL" %>
 
@@ -5,6 +6,9 @@

<%= t ".support_dodona" %>

<%= t ".title_l1" %>
<%= t ".title_l2" %>

+ + <%= t ".support_button" %> +
<%= image_tag("home.png", class: 'img-fluid') %> @@ -22,7 +26,6 @@

<%= t ".how_to_support" %>

<%= t ".support_p1_html" %>

- <% link_lang = I18n.locale == :en ? "en-GB" : "nl-NL" %>
<%= t ".support_button" %> From f21f64bf765b9aeac8284db66f63bf13b4c6a70f Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 16 Jan 2024 16:05:15 +0100 Subject: [PATCH 11/11] Add extra line to suggest button --- app/views/pages/support.html.erb | 3 ++- config/locales/views/pages/en.yml | 1 + config/locales/views/pages/nl.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/pages/support.html.erb b/app/views/pages/support.html.erb index c910f36e80..d5b99dcdf3 100644 --- a/app/views/pages/support.html.erb +++ b/app/views/pages/support.html.erb @@ -25,12 +25,13 @@

<%= t ".how_to_support" %>

-

<%= t ".support_p1_html" %>

+

<%= t ".support_p0_html" %>

<%= t ".support_button" %>
+

<%= t ".support_p1_html" %>

<%= t ".support_p2_html" %>

<%= t ".support_p3_html" %>

diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml index 1f18345134..cdfcb4330a 100644 --- a/config/locales/views/pages/en.yml +++ b/config/locales/views/pages/en.yml @@ -151,6 +151,7 @@ en: intro_p2_html: "Dodona is free to use for schools and thanks to your support, we would like to keep it that way! Keeping this platform up and running takes a lot of time, just as supporting hundreds of schools and thousands of students. Your support helps to pay our personnel. They develop new features and provide support for users." intro_p3_html: "Please contact us at dodona@ugent.be for more information about this project." how_to_support: How can you support us? + support_p0_html: "The easiest way to make a donation is using the button below. You can choose the amount yourself." support_p1_html: "Thanks to the University Fund of Ghent University, you can support us in a tax-friendly manner. Donations over 40 euros come with a tax certificate, which allows you to recover 45% through your personal income tax." support_p2_html: "You can also make a deposit to the account of the University Fund account at BE26 3900 9658 0329 (BIC: BBRUBEBB) by mentioning Dodona." support_p3_html: "If you would like to donate a larger amount or wish to sponsor us (by invoice), please contact us at dodona@ugent.be and we'd be happy to look at the possibilities." diff --git a/config/locales/views/pages/nl.yml b/config/locales/views/pages/nl.yml index c26d6ae709..709cee65b4 100644 --- a/config/locales/views/pages/nl.yml +++ b/config/locales/views/pages/nl.yml @@ -151,6 +151,7 @@ nl: intro_p2_html: "Dodona wordt gratis aangeboden aan scholen en onderwijsinstellingen en met uw steun willen we dat graag zou houden! Het online houden van dit platform vergt heel wat tijd, net als de ondersteuning voor honderden scholen en duizenden studenten. Uw steun helpt de lonen van onze medewerkers te betalen. Zij ontwikkelen nieuwe features en ondersteunen gebruikers." intro_p3_html: "Contacteer ons gerust op dodona@ugent.be voor meer info over dit project." how_to_support: Hoe kunt u ons steunen? + support_p0_html: "De eenvoudigste manier om dodona te steunen is via onderstaande knop. U kunt zelf het bedrag kiezen dat u wilt schenken." support_p1_html: "Dankzij het Universiteitsfonds van de Universiteit Gent kunt u fiscaal voordelig schenken aan Dodona. Voor giften vanaf 40 euro ontvangt u een fiscaal attest waarmee u 45% van uw gift recupereert in uw belastingaangifte." support_p2_html: "Indien je liever een overschrijving plaatst kan dit op het rekeningnummer van het Universiteitsfonds zijnde BE26 3900 9658 0329 (BIC: BBRUBEBB) met als mededeling Dodona." support_p3_html: "Wenst u een groter bedrag te schenken of kiest u liever voor sponsoring op factuur? Contacteer ons op dodona@ugent.be en we bekijken samen graag de mogelijkheden."