Merge pull request #920 from consul/cuentasegura

Implements /cuentasegura
This commit is contained in:
Alberto García Cabeza
2016-02-22 17:07:00 +01:00
5 changed files with 30 additions and 2 deletions

View File

@@ -1,7 +1,7 @@
class WelcomeController < ApplicationController
skip_authorization_check
layout "devise", only: :welcome
layout "devise", only: [:welcome, :verification]
def index
if current_user
@@ -25,5 +25,9 @@ class WelcomeController < ApplicationController
render 'highlights'
end
def verification
redirect_to verification_path if signed_in?
end
end

View File

@@ -0,0 +1,14 @@
<h2><%= t("welcome.verification.title") %></h2>
<div class="text-center margin-top">
<h3><%= t("welcome.verification.question", org_name: Setting["org_name"]) %></h3>
<br>
<div class="row">
<div class="small-12 medium-6 column">
<%= link_to(t("welcome.verification.i_have_an_account"), verification_path, class: "button success radius expand") %>
</div>
<div class="small-12 medium-6 column">
<%= link_to(t("welcome.verification.i_dont_have_an_account"), new_user_registration_path, class: "button radius expand") %>
</div>
</div>
</div>

View File

@@ -489,6 +489,11 @@ en:
description: Open space for citizen proposals about the kind of city we want to live in.
title: You propose
signed_in_home_title: Recent activity
verification:
i_dont_have_an_account: I don't have an account
i_have_an_account: I already have an account
question: Do you already have an account in %{org_name}?
title: Account verification
welcome:
go_to_index: See proposals and debates
title: Participate

View File

@@ -490,6 +490,11 @@ es:
description: Espacio abierto para propuestas ciudadanas sobre el tipo de ciudad en el que queremos vivir.
title: Propones
signed_in_home_title: Actividad reciente
verification:
i_dont_have_an_account: No tengo cuenta, quiero crear una y verificarla
i_have_an_account: Ya tengo una cuenta que quiero verificar
question: ¿Tienes ya una cuenta en %{org_name}?
title: Verificación de cuenta
welcome:
go_to_index: Ahora no, ver propuestas
title: Empieza a participar

View File

@@ -30,7 +30,7 @@ Rails.application.routes.draw do
root 'welcome#index'
get '/welcome', to: 'welcome#welcome'
get '/highlights', to: 'welcome#highlights', as: :highlights
get '/cuentasegura', to: 'welcome#verification', as: :cuentasegura
resources :debates do
member do