From 1d89a0477db07ede9442f5832d7b07d5f21767ae Mon Sep 17 00:00:00 2001 From: Sandro Costa Date: Wed, 26 Jun 2024 08:33:19 +0000 Subject: [PATCH 1/5] fix: display multiple lines in footer branding Duplicate Richie footer behaviour to allow a multi-line branding footer. The last line of the branding footer should be reserved to Republica Portuguesa and FCCN. Update translations. https://github.com/fccn/nau-technical/issues/173 --- .../conf/locale/en/LC_MESSAGES/django.mo | Bin 1033 -> 1033 bytes .../conf/locale/en/LC_MESSAGES/django.po | 4 +- .../conf/locale/en/LC_MESSAGES/djangojs.mo | Bin 442 -> 442 bytes .../conf/locale/en/LC_MESSAGES/djangojs.po | 2 +- .../conf/locale/pt_PT/LC_MESSAGES/django.mo | Bin 29027 -> 29027 bytes .../conf/locale/pt_PT/LC_MESSAGES/django.po | 4 +- .../conf/locale/pt_PT/LC_MESSAGES/djangojs.mo | Bin 2758 -> 2758 bytes .../conf/locale/pt_PT/LC_MESSAGES/djangojs.po | 2 +- .../sass/partials/lms/theme/_footer.scss | 23 +++++-- .../nau-basic/lms/templates/footer.html | 60 +++++++++++++----- 10 files changed, 68 insertions(+), 27 deletions(-) diff --git a/edx-platform/nau-basic/conf/locale/en/LC_MESSAGES/django.mo b/edx-platform/nau-basic/conf/locale/en/LC_MESSAGES/django.mo index ea8e0b34403d65f931560061a2c9b51d17f9cf5e..2504d3a0017b6a621a287e7b1ac5bd2e6bcb93d3 100644 GIT binary patch delta 26 hcmeC==;YXNm66v>*T_u4z{1MNSlhs0^CL!eCIDkX2J!#^ delta 26 hcmeC==;YXNm66v}*T_)8(A3J\n" "Language: en\n" @@ -927,7 +927,7 @@ msgid "" msgstr "" #: edx-platform/nau-basic/cms/templates/widgets/footer.html:91 -#: edx-platform/nau-basic/lms/templates/footer.html:90 +#: edx-platform/nau-basic/lms/templates/footer.html:118 msgid "All rights reserved" msgstr "" diff --git a/edx-platform/nau-basic/conf/locale/en/LC_MESSAGES/djangojs.mo b/edx-platform/nau-basic/conf/locale/en/LC_MESSAGES/djangojs.mo index 09dcb2a6c3b337b96b731a3b11080a57c1f87997..8076a1b1187e224e43dfd96796700d2c43b3efda 100644 GIT binary patch delta 24 fcmdnRyo-6lL|!vpBQpg93o9dIZ3Bai^JEwSSvLlf delta 24 fcmdnRyo-6lL|#)}BSQs4Q!8U*Z3DxN^JEwSSlI@Q diff --git a/edx-platform/nau-basic/conf/locale/en/LC_MESSAGES/djangojs.po b/edx-platform/nau-basic/conf/locale/en/LC_MESSAGES/djangojs.po index 3e8eb79..6251b24 100644 --- a/edx-platform/nau-basic/conf/locale/en/LC_MESSAGES/djangojs.po +++ b/edx-platform/nau-basic/conf/locale/en/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: ajuda@nau.edu.pt\n" -"POT-Creation-Date: 2024-05-21 15:33+0100\n" +"POT-Creation-Date: 2024-06-26 08:23+0000\n" "PO-Revision-Date: 2021-06-02 21:22+0000\n" "Last-Translator: NAU \n" "Language: en\n" diff --git a/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/django.mo b/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/django.mo index ea7defe0ed116ab297f100d31c2142b017d749b6..b6ab9747a4c401b21846fcfa7e7d98822daa1837 100644 GIT binary patch delta 27 icmaF-i1G0w#szk~X1YdZ3I-NdM#kC(2Ag^9!i)iq=m>lO delta 27 icmaF-i1G0w#szk~rn*Lk3Wlau#>UzPhMRfq!i)iqga~#3 diff --git a/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/django.po b/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/django.po index 0c7f7e3..8de2991 100644 --- a/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/django.po +++ b/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: support@edunext.co\n" -"POT-Creation-Date: 2024-05-21 15:33+0100\n" +"POT-Creation-Date: 2024-06-26 08:23+0000\n" "PO-Revision-Date: 2021-03-12 12:49+0000\n" "Last-Translator: NAU \n" "Language: pt_PT\n" @@ -1053,7 +1053,7 @@ msgid "" msgstr "" #: edx-platform/nau-basic/cms/templates/widgets/footer.html:91 -#: edx-platform/nau-basic/lms/templates/footer.html:90 +#: edx-platform/nau-basic/lms/templates/footer.html:118 msgid "All rights reserved" msgstr "Todos os direitos reservados" diff --git a/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo b/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/djangojs.mo index 85b5389efe38db475d75eb2d9b87581941682911..27e88ecc3663f61d2a93ce2836981ad63288c3ee 100644 GIT binary patch delta 26 hcmX>mdQ5af3M;Rfu92C7frXWkv9^K1=0es`Rsd&C2HgMv delta 26 hcmX>mdQ5af3M;Rvu92aFp{bRzv9^KX=0es`Rsd$|2G;-p diff --git a/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/djangojs.po b/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/djangojs.po index 8fd41a7..bb4c236 100644 --- a/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/djangojs.po +++ b/edx-platform/nau-basic/conf/locale/pt_PT/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: ajuda@nau.edu.pt\n" -"POT-Creation-Date: 2024-05-21 15:33+0100\n" +"POT-Creation-Date: 2024-06-26 08:23+0000\n" "PO-Revision-Date: 2021-06-02 21:22+0000\n" "Last-Translator: NAU \n" "Language: pt_PT\n" diff --git a/edx-platform/nau-basic/lms/static/sass/partials/lms/theme/_footer.scss b/edx-platform/nau-basic/lms/static/sass/partials/lms/theme/_footer.scss index 2e3bd7f..d4bd2df 100644 --- a/edx-platform/nau-basic/lms/static/sass/partials/lms/theme/_footer.scss +++ b/edx-platform/nau-basic/lms/static/sass/partials/lms/theme/_footer.scss @@ -87,10 +87,7 @@ footer { } section#entities-quick-links { - display: flex; - justify-content: center; padding: 25px 65px; - flex-wrap: wrap; @media screen and (max-width: $breakpoint-medium) { flex-direction: column; @@ -98,7 +95,24 @@ footer { padding-left: 0; } - & > div { + .entities-quick-links__line { + display:flex; + justify-content: center; + gap: 1.5rem; + border-block-end: 1px solid #dedede; + padding: 1rem 0 1.6rem 0; + + &:last-child { + border: none; + } + + @media screen and (max-width: $breakpoint-medium) { + flex-direction: column; + align-items: center; + } + } + + .entities-links-logo { text-align: center; padding-top: 10px; padding-right: 5px; @@ -110,7 +124,6 @@ footer { } @media screen and (max-width: $breakpoint-medium) { - padding: 10px 10px 0; margin-left: auto; margin-right: auto; } diff --git a/edx-platform/nau-basic/lms/templates/footer.html b/edx-platform/nau-basic/lms/templates/footer.html index c574753..b6bda16 100644 --- a/edx-platform/nau-basic/lms/templates/footer.html +++ b/edx-platform/nau-basic/lms/templates/footer.html @@ -65,26 +65,54 @@ <% entities_logos = static.get_value('NAU_ENTITIES_FOOTER', {}).get("itens", {}) + footer_logos = static.get_value('NAU_FOOTER_LOGOS', {}).get("itens", {}) %> - % if len(entities_logos)>0: - + % if entities_logos or footer_logos: - - %endif + % endif + <% - entities_logos = static.get_value('NAU_ENTITIES_FOOTER', {}).get("itens", {}) footer_logos = static.get_value('NAU_FOOTER_LOGOS', {}).get("itens", {}) %> - % if entities_logos or footer_logos: -