From 580ed6e4c670f8e5863198a150d9f52f467baf2a Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Mar 2017 13:15:12 +0100 Subject: [PATCH 1/6] adds alternative text for share on WhatsApp links --- app/views/budgets/investments/_investment_show.html.erb | 1 + app/views/debates/show.html.erb | 1 + app/views/proposals/show.html.erb | 1 + app/views/spending_proposals/show.html.erb | 1 + config/locales/social_share_button.en.yml | 1 + config/locales/social_share_button.es.yml | 1 + 6 files changed, 6 insertions(+) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index 17abf4faf..37ddc8930 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -105,6 +105,7 @@ <% if browser.device.mobile? %> + <%= t("social_share_button.whatsapp") %> <% end %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 363a3bab3..f28691727 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -55,6 +55,7 @@ <% if browser.device.mobile? %> + <%= t("social_share_button.whatsapp") %> <% end %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 6209805cf..869417777 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -128,6 +128,7 @@ <% if browser.device.mobile? %> + <%= t("social_share_button.whatsapp") %> <% end %> diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb index 0da045860..96468eb4c 100644 --- a/app/views/spending_proposals/show.html.erb +++ b/app/views/spending_proposals/show.html.erb @@ -47,6 +47,7 @@ <% if browser.device.mobile? %> + <%= t("social_share_button.whatsapp") %> <% end %> diff --git a/config/locales/social_share_button.en.yml b/config/locales/social_share_button.en.yml index b06cb5ad3..a4ba5436f 100644 --- a/config/locales/social_share_button.en.yml +++ b/config/locales/social_share_button.en.yml @@ -17,3 +17,4 @@ en: plurk: "Plurk" pinterest: "Pinterest" email: "Email" + whatsapp: "WhatsApp" \ No newline at end of file diff --git a/config/locales/social_share_button.es.yml b/config/locales/social_share_button.es.yml index 45e4ab2a5..4647fc010 100644 --- a/config/locales/social_share_button.es.yml +++ b/config/locales/social_share_button.es.yml @@ -17,3 +17,4 @@ es: plurk: "Plurk" pinterest: "Pinterest" email: "Correo electrónico" + whatsapp: "WhatsApp" \ No newline at end of file From ad9d6d0713ddc3ce38cee6903827fce14c874ecd Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Mar 2017 13:31:18 +0100 Subject: [PATCH 2/6] fixes tabs role on proposals show --- app/views/proposals/_filter_subnav.html.erb | 2 +- app/views/proposals/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/proposals/_filter_subnav.html.erb b/app/views/proposals/_filter_subnav.html.erb index fe875c9a9..6347d56b0 100644 --- a/app/views/proposals/_filter_subnav.html.erb +++ b/app/views/proposals/_filter_subnav.html.erb @@ -1,6 +1,6 @@
-
    +
    • <%= link_to "#tab-comments" do %>

      diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 869417777..22d17d29f 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -137,7 +137,7 @@

<% end %> -
+
<%= render "proposals/filter_subnav" %> <%= render "proposals/notifications" %> From 5cf9a98e6a79f0251eaf115880880250cdc3ccf4 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Mar 2017 13:38:40 +0100 Subject: [PATCH 3/6] adds lang attribute on error pages --- public/404.html | 2 +- public/422.html | 2 +- public/500.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/404.html b/public/404.html index cc6820bba..5b5362192 100644 --- a/public/404.html +++ b/public/404.html @@ -1,5 +1,5 @@ - + Error 404 | Not found diff --git a/public/422.html b/public/422.html index e68d2956f..cca90e5a3 100644 --- a/public/422.html +++ b/public/422.html @@ -1,5 +1,5 @@ - + Error 422 | The change you wanted was rejected diff --git a/public/500.html b/public/500.html index 71978cdce..0b563452a 100644 --- a/public/500.html +++ b/public/500.html @@ -1,5 +1,5 @@ - + Error 500 | Internal server error From 737d347c4a3f0de76c6de8fb723eacccbea1e5d1 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Mar 2017 13:45:11 +0100 Subject: [PATCH 4/6] changes alt text of header logo --- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/pt-BR.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index dd9624188..b09ab94cd 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -195,7 +195,7 @@ en: external_link_transparency: Transparency external_link_transparency_url: https://transparency.consul locale: 'Language:' - logo: Consul + logo: Consul logo management: Management moderation: Moderation valuation: Valuation diff --git a/config/locales/es.yml b/config/locales/es.yml index 0b8fa4b1c..7f8164335 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -195,7 +195,7 @@ es: external_link_transparency: Transparencia external_link_transparency_url: https://transparency.consul locale: 'Idioma:' - logo: Consul + logo: Consul logo management: Gestión moderation: Moderar valuation: Evaluación diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 596531c0d..cc0b1c590 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -874,7 +874,7 @@ fr: external_link_transparency: Transparence external_link_transparency_url: https://transparency.consul locale: 'Langue :' - logo: Consul + logo: Consul logo moderation: Modération more_information: Plus d'information my_account_link: Mon compte diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 75e7aebb6..febe0ed5c 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -860,7 +860,7 @@ pt-BR: external_link_transparency: Transparência external_link_transparency_url: https://transparency.consul locale: 'Idioma:' - logo: Consul + logo: Consul logotipo moderation: Moderação more_information: Mais informações my_account_link: Minha conta From 1e3ea14c9939d5ef950f85cf2c59be28eb105d4a Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Mar 2017 14:00:08 +0100 Subject: [PATCH 5/6] improves color contrast on hollow buttons --- app/assets/stylesheets/layout.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7c3300fa3..1511910b1 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -70,6 +70,11 @@ a { } } +.button.hollow { + border: 1px solid $link; + color: $link; +} + .postfix.button { padding: 0; } From b5fd8cc8b293d52d29b52ffc8156537352031da0 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 6 Mar 2017 14:04:17 +0100 Subject: [PATCH 6/6] fixes missing i18n --- app/views/budgets/investments/_investment_show.html.erb | 2 +- app/views/debates/show.html.erb | 2 +- app/views/proposals/show.html.erb | 2 +- app/views/spending_proposals/show.html.erb | 2 +- config/locales/en.yml | 1 + config/locales/es.yml | 1 + config/locales/social_share_button.en.yml | 3 +-- config/locales/social_share_button.es.yml | 3 +-- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index 37ddc8930..ebac39186 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -105,7 +105,7 @@ <% if browser.device.mobile? %> - <%= t("social_share_button.whatsapp") %> + <%= t("social.whatsapp") %> <% end %>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index f28691727..096369bc3 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -55,7 +55,7 @@ <% if browser.device.mobile? %> - <%= t("social_share_button.whatsapp") %> + <%= t("social.whatsapp") %> <% end %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 22d17d29f..5d184088d 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -128,7 +128,7 @@ <% if browser.device.mobile? %> - <%= t("social_share_button.whatsapp") %> + <%= t("social.whatsapp") %> <% end %>
diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb index 96468eb4c..4cdfb688b 100644 --- a/app/views/spending_proposals/show.html.erb +++ b/app/views/spending_proposals/show.html.erb @@ -47,7 +47,7 @@ <% if browser.device.mobile? %> - <%= t("social_share_button.whatsapp") %> + <%= t("social.whatsapp") %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index b09ab94cd..0bd238892 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -472,6 +472,7 @@ en: facebook: Facebook twitter: Twitter youtube: YouTube + whatsapp: WhatsApp spending_proposals: form: association_name_label: 'If you propose in name of an assocation or collective add the name here' diff --git a/config/locales/es.yml b/config/locales/es.yml index 7f8164335..4df6e870e 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -472,6 +472,7 @@ es: facebook: Facebook twitter: Twitter youtube: YouTube + whatsapp: WhatsApp spending_proposals: form: association_name_label: 'Si propones en nombre de una asociación o colectivo añade el nombre aquí' diff --git a/config/locales/social_share_button.en.yml b/config/locales/social_share_button.en.yml index a4ba5436f..84ee6baba 100644 --- a/config/locales/social_share_button.en.yml +++ b/config/locales/social_share_button.en.yml @@ -16,5 +16,4 @@ en: tumblr: "Tumblr" plurk: "Plurk" pinterest: "Pinterest" - email: "Email" - whatsapp: "WhatsApp" \ No newline at end of file + email: "Email" \ No newline at end of file diff --git a/config/locales/social_share_button.es.yml b/config/locales/social_share_button.es.yml index 4647fc010..aa0c3f224 100644 --- a/config/locales/social_share_button.es.yml +++ b/config/locales/social_share_button.es.yml @@ -16,5 +16,4 @@ es: tumblr: "Tumblr" plurk: "Plurk" pinterest: "Pinterest" - email: "Correo electrónico" - whatsapp: "WhatsApp" \ No newline at end of file + email: "Correo electrónico" \ No newline at end of file