From 16897ed88484bec02d86739a3bd05b05b701b79b Mon Sep 17 00:00:00 2001 From: AyakorK Date: Tue, 3 Dec 2024 15:29:32 +0100 Subject: [PATCH 1/3] fix(rgaa): change logos to match accessibility --- decidim-core/app/views/layouts/decidim/_logo.html.erb | 2 +- .../app/views/layouts/decidim/footer/_main_intro.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/decidim-core/app/views/layouts/decidim/_logo.html.erb b/decidim-core/app/views/layouts/decidim/_logo.html.erb index 8968b210c5a66..65f44f3e0af65 100644 --- a/decidim-core/app/views/layouts/decidim/_logo.html.erb +++ b/decidim-core/app/views/layouts/decidim/_logo.html.erb @@ -1,5 +1,5 @@ <% if organization %> - <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %> + <%= link_to decidim.root_url(host: organization.host) do %> <% if organization.logo.attached? %> <%= image_tag organization.attached_uploader(:logo).variant_url(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %> <% else %> diff --git a/decidim-core/app/views/layouts/decidim/footer/_main_intro.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main_intro.html.erb index e5860e20edefe..9e1dafd81ef18 100644 --- a/decidim-core/app/views/layouts/decidim/footer/_main_intro.html.erb +++ b/decidim-core/app/views/layouts/decidim/footer/_main_intro.html.erb @@ -1,6 +1,6 @@ <% if current_organization.official_img_footer.attached? %> <%= link_to current_organization.official_url, class: "block mb-6" do %> - <%= image_tag current_organization.attached_uploader(:official_img_footer).url, alt: current_organization_name, class: "max-h-16" %> + <%= image_tag current_organization.attached_uploader(:official_img_footer).url, alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name), class: "max-h-16" %> <% end %> <% end %>
From 5f11816310ee894fa4191d6ce7b39806b01e024b Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Fri, 13 Dec 2024 17:16:39 +0100 Subject: [PATCH 2/3] fix test by re-adding aria-label --- decidim-core/app/views/layouts/decidim/_logo.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decidim-core/app/views/layouts/decidim/_logo.html.erb b/decidim-core/app/views/layouts/decidim/_logo.html.erb index 65f44f3e0af65..8968b210c5a66 100644 --- a/decidim-core/app/views/layouts/decidim/_logo.html.erb +++ b/decidim-core/app/views/layouts/decidim/_logo.html.erb @@ -1,5 +1,5 @@ <% if organization %> - <%= link_to decidim.root_url(host: organization.host) do %> + <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %> <% if organization.logo.attached? %> <%= image_tag organization.attached_uploader(:logo).variant_url(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %> <% else %> From 5557718e8332b6aac275ddf88ed7c88d185c28a0 Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Mon, 16 Dec 2024 16:31:14 +0100 Subject: [PATCH 3/3] Revert "fix test by re-adding aria-label" This reverts commit 5f11816310ee894fa4191d6ce7b39806b01e024b. --- decidim-core/app/views/layouts/decidim/_logo.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decidim-core/app/views/layouts/decidim/_logo.html.erb b/decidim-core/app/views/layouts/decidim/_logo.html.erb index 8968b210c5a66..65f44f3e0af65 100644 --- a/decidim-core/app/views/layouts/decidim/_logo.html.erb +++ b/decidim-core/app/views/layouts/decidim/_logo.html.erb @@ -1,5 +1,5 @@ <% if organization %> - <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %> + <%= link_to decidim.root_url(host: organization.host) do %> <% if organization.logo.attached? %> <%= image_tag organization.attached_uploader(:logo).variant_url(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %> <% else %>