From cc1798674578f1372c4e60d6c744456f33495972 Mon Sep 17 00:00:00 2001 From: kikito Date: Mon, 22 Feb 2016 11:03:56 +0100 Subject: [PATCH 1/2] changes welcome screen to stress verification and demote view proposals --- app/views/welcome/welcome.html.erb | 9 ++++++--- config/locales/en.yml | 4 ++-- config/locales/es.yml | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/views/welcome/welcome.html.erb b/app/views/welcome/welcome.html.erb index 21c35e874..93f12563c 100644 --- a/app/views/welcome/welcome.html.erb +++ b/app/views/welcome/welcome.html.erb @@ -16,11 +16,14 @@

- <%= t("welcome.welcome.user_permission_verify", - verify: link_to(t("welcome.welcome.user_permission_verify_url"), verification_path)).html_safe %> + <%= t("welcome.welcome.user_permission_verify") %>

- <%= link_to t("welcome.welcome.go_to_index"), proposals_path , class: "button success radius" %> + <%= link_to(t("welcome.welcome.user_permission_verify_my_account"), verification_path, class: "button success radius") %> +

+ +

+ <%= link_to t("welcome.welcome.go_to_index"), proposals_path %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index cf210838c..e4c8a6280 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -496,9 +496,9 @@ en: user_permission_info: With your account you can... user_permission_proposal: Create new proposals user_permission_support_proposal: Support proposals* - user_permission_verify: To perform all the actions %{verify}. + user_permission_verify: To perform all the actions verify your account. user_permission_verify_info: "* Only for users on Madrid Census." - user_permission_verify_url: verify your account + user_permission_verify_my_account: Verify my account user_permission_votes: Participate on final voting omniauth: finish_signup: diff --git a/config/locales/es.yml b/config/locales/es.yml index 6c6c65621..3673ea1c4 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -491,15 +491,15 @@ es: title: Propones signed_in_home_title: Actividad reciente welcome: - go_to_index: Ver propuestas + go_to_index: Ahora no, ver propuestas title: Empieza a participar user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... user_permission_proposal: Crear nuevas propuestas user_permission_support_proposal: Apoyar propuestas* - user_permission_verify: Para poder realizar todas las acciones %{verify}. + user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta. user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid." - user_permission_verify_url: verifica tu cuenta + user_permission_verify_my_account: Verificar mi cuenta user_permission_votes: Participar en las votaciones finales* omniauth: finish_signup: From 7db6785845d55e0e933963c852e8a53dae373d3b Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 22 Feb 2016 11:10:01 +0100 Subject: [PATCH 2/2] Makes button bigger --- app/views/welcome/welcome.html.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/welcome/welcome.html.erb b/app/views/welcome/welcome.html.erb index 93f12563c..be9d3abe2 100644 --- a/app/views/welcome/welcome.html.erb +++ b/app/views/welcome/welcome.html.erb @@ -19,9 +19,7 @@ <%= t("welcome.welcome.user_permission_verify") %>

-

- <%= link_to(t("welcome.welcome.user_permission_verify_my_account"), verification_path, class: "button success radius") %> -

+ <%= link_to(t("welcome.welcome.user_permission_verify_my_account"), verification_path, class: "button success radius expand") %>

<%= link_to t("welcome.welcome.go_to_index"), proposals_path %>