diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 188d6a800..b815288b2 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,23 +1,17 @@ -
-
-
-

<%= t("devise_views.confirmations.title") %>

+

<%= t("devise_views.confirmations.title") %>

- <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= render 'shared/errors', resource: resource %> +<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> + <%= render 'shared/errors', resource: resource %> -
-
- <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.confirmations.email_label"), value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> -
+
+
+ <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.confirmations.email_label"), value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> +
-
- <%= f.submit(t("devise_views.confirmations.submit"), class: "button radius expand") %> -
-
- <% end %> - - <%= render "devise/shared/links" %> +
+ <%= f.submit(t("devise_views.confirmations.submit"), class: "button radius expand") %>
-
\ No newline at end of file +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 6c1c822bc..6f01c0c83 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,30 +1,23 @@ -
-
-
-

<%= t("devise_views.passwords.edit.title") %>

+

<%= t("devise_views.passwords.edit.title") %>

- <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> - <%= render 'shared/errors', resource: resource %> +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= render 'shared/errors', resource: resource %> - <%= f.hidden_field :reset_password_token %> + <%= f.hidden_field :reset_password_token %> -
- <%= f.password_field :password, autofocus: true, autocomplete: "off", - label: t("devise_views.passwords.edit.password_label") %> -
- -
- <%= f.password_field :password_confirmation, autocomplete: "off", - label: t("devise_views.passwords.edit.password_confirmation_label") %> -
- -
- <%= f.submit t("devise_views.passwords.edit.change_submit") %> -
- <% end %> - - <%= render "devise/shared/links" %> - -
+
+ <%= f.password_field :password, autofocus: true, autocomplete: "off", + label: t("devise_views.passwords.edit.password_label") %>
-
+ +
+ <%= f.password_field :password_confirmation, autocomplete: "off", + label: t("devise_views.passwords.edit.password_confirmation_label") %> +
+ +
+ <%= f.submit t("devise_views.passwords.edit.change_submit") %> +
+<% end %> + +<%= render "devise/shared/links" %> \ No newline at end of file diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 1219c393d..e433c0477 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,22 +1,16 @@ -
-
-
-

<%= t("devise_views.passwords.new.title") %>

- <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= render 'shared/errors', resource: resource %> +

<%= t("devise_views.passwords.new.title") %>

+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= render 'shared/errors', resource: resource %> -
-
- <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %> -
+
+
+ <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %> +
-
- <%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius expand" %> -
-
- <% end %> - - <%= render "devise/shared/links" %> +
+ <%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius expand" %>
-
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 4c4f36054..f1df8e1cc 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,33 +1,38 @@ -
-
-
-

<%= t("devise_views.sessions.new.title") %>

+

<%= t("devise_views.sessions.new.title") %>

- <%# render 'devise/omniauth_form' %> +<%# render 'devise/omniauth_form' %> - <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
-
- <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %> -
+

+ <%= t("devise_views.shared.links.signup", + signup_link: link_to(t("devise_views.shared.links.signup_link"), new_user_registration_path)).html_safe %> +

-
- <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %> -
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+
+ <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %> +
- <% if devise_mapping.rememberable? -%> -
- <%= f.check_box :remember_me, label: t("devise_views.sessions.new.remember_me") %> -
- <% end -%> +
+ <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "right" %> + <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %> +
-
- <%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %> -
-
- <% end %> + <% if devise_mapping.rememberable? -%> +
+ <%= f.label :remember_me do %> + <%= f.check_box :remember_me, label: false %> + <%= t("devise_views.sessions.new.remember_me") %> + <% end %> +
+ <% end -%> - <%= render "devise/shared/links" %> +
+ <%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %>
-
+<% end %> + +<%= render "devise/shared/links" %> + + diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index 7f8142144..3f2eaed81 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -3,19 +3,19 @@ <%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %>
<% end -%> - <%- if devise_mapping.registerable? && + <%#- if devise_mapping.registerable? && controller_name != 'registrations' || controller_path != 'users/registrations' %> - <%= link_to t("devise_views.shared.links.signup"), new_user_registration_path %>
- <% end -%> + <%#= link_to t("devise_views.shared.links.signup"), new_user_registration_path %> + <%# end -%> - <%- if devise_mapping.registerable? && controller_name == 'registrations' && controller_path != 'organizations/registrations' %> - <%= link_to t("devise_views.shared.links.organization_signup"), new_organization_registration_path %>
- <% end -%> + <%#- if devise_mapping.registerable? && controller_name == 'registrations' && controller_path != 'organizations/registrations' %> + <%#= link_to t("devise_views.shared.links.organization_signup"), new_organization_registration_path %> + <%# end -%> - <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %>
- <% end -%> + <%#- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%#= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %> + <%# end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index d21209438..bd1f070ac 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,23 +1,16 @@ -
-
-
-

<%= t("devise_views.unlocks.new.title") %>

+

<%= t("devise_views.unlocks.new.title") %>

- <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= render 'shared/errors', resource: resource %> +<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= render 'shared/errors', resource: resource %> -
- <%= f.email_field :email, autofocus: true, - label: t("devise_views.unlocks.new.email_label") %> -
- -
- <%= f.submit t("devise_views.unlocks.new.submit") %> -
- <% end %> - - <%= render "devise/shared/links" %> - -
+
+ <%= f.email_field :email, autofocus: true, + label: t("devise_views.unlocks.new.email_label") %>
-
\ No newline at end of file + +
+ <%= f.submit t("devise_views.unlocks.new.submit") %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index cb4be97a5..5fae13e8e 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -14,24 +14,6 @@ - <% if notice %> -
- × -
- <%= notice %> -
-
- <% end %> - - <% if alert %> -
- × -
- <%= alert %> -
-
- <% end %> -

@@ -42,7 +24,27 @@

- <%= yield %> +
+
+
+ <% if notice %> +
+ × + <%= notice %> +
+ <% end %> + <% if alert %> +
+ × + <%= alert %> +
+ <% end %> + + <%= yield %> + +
+
+
\ No newline at end of file diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb index 4f8b05862..eb6e0856d 100644 --- a/app/views/organizations/registrations/new.html.erb +++ b/app/views/organizations/registrations/new.html.erb @@ -1,36 +1,39 @@ -
-
-
-

<%= t("devise_views.organizations.registrations.new.title") %>

+

<%= t("devise_views.organizations.registrations.new.title") %>

- <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %> - <%= render 'shared/errors', resource: resource %> -
-
+ <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %> + <%= render 'shared/errors', resource: resource %> +
+
- <%= f.fields_for :organization do |fo| %> - <%= fo.text_field :name, autofocus: true, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %> - <% end %> - - <%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %> - - <%= f.text_field :phone_number, placeholder: t("devise_views.organizations.registrations.new.phone_number_label") %> - - <%= f.password_field :password, autocomplete: "off", - placeholder: t("devise_views.organizations.registrations.new.password_label") %> - - <%= f.password_field :password_confirmation, autocomplete: "off", - label: t("devise_views.organizations.registrations.new.password_confirmation_label"), - placeholder: t("devise_views.organizations.registrations.new.password_confirmation_label") %> - - <%= f.simple_captcha input_html: {required: false} %> - - <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button radius expand" %> -
-
+ <%= f.fields_for :organization do |fo| %> + <%= fo.text_field :name, autofocus: true, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %> <% end %> - <%= render "devise/shared/links" %> + <%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %> + + <%= f.text_field :phone_number, placeholder: t("devise_views.organizations.registrations.new.phone_number_label") %> + + <%= f.password_field :password, autocomplete: "off", + placeholder: t("devise_views.organizations.registrations.new.password_label") %> + + <%= f.password_field :password_confirmation, autocomplete: "off", + label: t("devise_views.organizations.registrations.new.password_confirmation_label"), + placeholder: t("devise_views.organizations.registrations.new.password_confirmation_label") %> + + <%= f.simple_captcha input_html: {required: false} %> + + + <%= f.label :remember_me do %> + <%= f.check_box :remember_me, label: false %> + + <%= t("devise_views.users.registrations.new.terms", + terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", target: "_blank")).html_safe %> + <% end %> + + + <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button radius expand" %>
-
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb index e7818ee6f..6795ece5f 100644 --- a/app/views/users/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -1,40 +1,45 @@ -
-
-
-

<%= t("devise_views.users.registrations.new.title") %>

+

<%= t("devise_views.users.registrations.new.title") %>

- <%# render 'devise/omniauth_form' %> +<%# render 'devise/omniauth_form' %> - <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= render 'shared/errors', resource: resource %> +<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= render 'shared/errors', resource: resource %> - <%= link_to t("devise_views.users.registrations.new.organization_signup"), new_organization_registration_path %>
-
+

+ <%= t("devise_views.users.registrations.new.organization_signup", + signup_link: link_to(t("devise_views.users.registrations.new.organization_signup_link"), new_organization_registration_path)).html_safe %> +

-
-
+
+
- <%= f.label t("devise_views.users.registrations.new.username_label") %> - <%= t("devise_views.users.registrations.new.username_note") %> - <%= f.text_field :username, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %> + <%= f.label t("devise_views.users.registrations.new.username_label") %> + <%= t("devise_views.users.registrations.new.username_note") %> + <%= f.text_field :username, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %> - <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %> + <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %> - <%= f.password_field :password, autocomplete: "off", - placeholder: t("devise_views.users.registrations.new.password_label") %> + <%= f.password_field :password, autocomplete: "off", + placeholder: t("devise_views.users.registrations.new.password_label") %> - <%= f.password_field :password_confirmation, autocomplete: "off", - label: t("devise_views.users.registrations.new.password_confirmation_label"), - placeholder: t("devise_views.users.registrations.new.password_confirmation_label") %> + <%= f.password_field :password_confirmation, autocomplete: "off", + label: t("devise_views.users.registrations.new.password_confirmation_label"), + placeholder: t("devise_views.users.registrations.new.password_confirmation_label") %> - <%= f.simple_captcha input_html: {required: false} %> + <%= f.simple_captcha input_html: {required: false} %> - <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button radius expand" %> -
-
+ + <%= f.label :remember_me do %> + <%= f.check_box :remember_me, label: false %> + + <%= t("devise_views.users.registrations.new.terms", + terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", target: "_blank")).html_safe %> <% end %> + - <%= render "devise/shared/links" %> + <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button radius expand" %>
-
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml index 9869804f2..c7ff6ee0f 100644 --- a/config/locales/devise_views.en.yml +++ b/config/locales/devise_views.en.yml @@ -59,7 +59,10 @@ en: password_label: "Password" password_confirmation_label: "Confirm password" submit: "Sign up" - organization_signup: "Do you represent an organization / group? Enter here" + organization_signup: "Do you represent an organization / group? %{signup_link}" + organization_signup_link: "Sign up here" + terms: "To sign up in this site your accept the %{terms}" + terms_link: "terms of use" organizations: registrations: new: @@ -92,7 +95,8 @@ en: shared: links: login: "Log in" - signup: "Sign up" + signup: "Don't have an account? %{signup_link}" + signup_link: "Sign up" signin_with_provider: "Sign in with %{provider}" organization_signup: "Sign up as an organization / collective" new_password: "Forgot your password?" diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml index 01753bdb6..0a634a953 100644 --- a/config/locales/devise_views.es.yml +++ b/config/locales/devise_views.es.yml @@ -59,7 +59,10 @@ es: password_label: "Contraseña" password_confirmation_label: "Confirmar contraseña" submit: "Registrarse" - organization_signup: "¿Representas a una organización / colectivo? Entra aquí" + organization_signup: "¿Representas a una organización / colectivo? %{signup_link}" + organization_signup_link: "Regístrate aquí" + terms: "Al registrarte aceptas las %{terms}" + terms_link: "condiciones de uso" organizations: registrations: new: @@ -92,7 +95,8 @@ es: shared: links: login: "Entrar" - signup: "Registrarse" + signup: "¿No tienes una cuenta? %{signup_link}" + signup_link: "Regístrate" organization_signup: "Registro para organizaciones / colectivos" signin_with_provider: "Entrar con %{provider}" new_password: "¿Olvidaste tu contraseña?"