consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improves styles and texts for devise pages

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2015-09-07 00:16:54 +02:00
parent a7e593c039
commit eedd919424
11 changed files with 192 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/views/devise/confirmations/new.html.erb
View File

@@ -1,23 +1,17 @@
<div class="auth row"> <h1 class="text-center"><%= t("devise_views.confirmations.title") %></h1>
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h1 class="text-center"><%= t("devise_views.confirmations.title") %></h1>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= render 'shared/errors', resource: resource %> <%= render 'shared/errors', resource: resource %>
<div class="row"> <div class="row">
<div class="small-12 columns"> <div class="small-12 columns">
<%= 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) %>
</div> </div>
<div class="small-12 columns"> <div class="small-12 columns">
<%= f.submit(t("devise_views.confirmations.submit"), class: "button radius expand") %> <%= f.submit(t("devise_views.confirmations.submit"), class: "button radius expand") %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div> </div>
</div> </div>
</div> <% end %>
<%= render "devise/shared/links" %>

45
app/views/devise/passwords/edit.html.erb
View File

@@ -1,30 +1,23 @@
<div class="row auth"> <h1 class="text-center"><%= t("devise_views.passwords.edit.title") %></h1>
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h1 class="text-center"><%= t("devise_views.passwords.edit.title") %></h1>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
<%= render 'shared/errors', resource: resource %> <%= render 'shared/errors', resource: resource %>
<%= f.hidden_field :reset_password_token %> <%= f.hidden_field :reset_password_token %>
<div class="field"> <div class="field">
<%= f.password_field :password, autofocus: true, autocomplete: "off", <%= f.password_field :password, autofocus: true, autocomplete: "off",
label: t("devise_views.passwords.edit.password_label") %> label: t("devise_views.passwords.edit.password_label") %>
</div>
<div class="field">
<%= f.password_field :password_confirmation, autocomplete: "off",
label: t("devise_views.passwords.edit.password_confirmation_label") %>
</div>
<div class="actions">
<%= f.submit t("devise_views.passwords.edit.change_submit") %>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
</div> </div>
</div>
<div class="field">
<%= f.password_field :password_confirmation, autocomplete: "off",
label: t("devise_views.passwords.edit.password_confirmation_label") %>
</div>
<div class="actions">
<%= f.submit t("devise_views.passwords.edit.change_submit") %>
</div>
<% end %>
<%= render "devise/shared/links" %>

30
app/views/devise/passwords/new.html.erb
View File

@@ -1,22 +1,16 @@
<div class="row auth"> <h1 class="text-center"><%= t("devise_views.passwords.new.title") %></h1>
<div class="small-12 medium-8 large-5 column small-centered"> <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<div class="panel"> <%= render 'shared/errors', resource: resource %>
<h1 class="text-center"><%= t("devise_views.passwords.new.title") %></h1>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= render 'shared/errors', resource: resource %>
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<%= 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") %>
</div> </div>
<div class="small-12 column text-center"> <div class="small-12 column text-center">
<%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius expand" %> <%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius expand" %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div> </div>
</div> </div>
</div> <% end %>
<%= render "devise/shared/links" %>

55
app/views/devise/sessions/new.html.erb
View File

@@ -1,33 +1,38 @@
<div class="auth row"> <h2><%= t("devise_views.sessions.new.title") %></h2>
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h2><%= t("devise_views.sessions.new.title") %></h2>
<%# render 'devise/omniauth_form' %> <%# render 'devise/omniauth_form' %>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> <p>
<div class="row"> <%= t("devise_views.shared.links.signup",
<div class="small-12 columns"> signup_link: link_to(t("devise_views.shared.links.signup_link"), new_user_registration_path)).html_safe %>
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %> </p>
</div>
<div class="small-12 columns"> <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %> <div class="row">
</div> <div class="small-12 columns">
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %>
</div>
<% if devise_mapping.rememberable? -%> <div class="small-12 columns">
<div class="small-12 columns"> <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "right" %>
<%= f.check_box :remember_me, label: t("devise_views.sessions.new.remember_me") %> <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %>
</div> </div>
<% end -%>
<div class="small-12 columns"> <% if devise_mapping.rememberable? -%>
<%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %> <div class="small-12 columns">
</div> <%= f.label :remember_me do %>
</div> <%= f.check_box :remember_me, label: false %>
<% end %> <span class="checkbox"><%= t("devise_views.sessions.new.remember_me") %></span>
<% end %>
</div>
<% end -%>
<%= render "devise/shared/links" %> <div class="small-12 columns">
<%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %>
</div> </div>
</div> </div>
</div> <% end %>
<%= render "devise/shared/links" %>

18
app/views/devise/shared/_links.html.erb
View File

@@ -3,19 +3,19 @@
<%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %><br> <%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %><br>
<% end -%> <% end -%>
<%- if devise_mapping.registerable? && <%#- if devise_mapping.registerable? &&
controller_name != 'registrations' || controller_name != 'registrations' ||
controller_path != 'users/registrations' %> controller_path != 'users/registrations' %>
<%= link_to t("devise_views.shared.links.signup"), new_user_registration_path %><br> <%#= link_to t("devise_views.shared.links.signup"), new_user_registration_path %><!-- <br> -->
<% end -%> <%# end -%>
<%- if devise_mapping.registerable? && controller_name == 'registrations' && controller_path != 'organizations/registrations' %> <%#- if devise_mapping.registerable? && controller_name == 'registrations' && controller_path != 'organizations/registrations' %>
<%= link_to t("devise_views.shared.links.organization_signup"), new_organization_registration_path %><br> <%#= link_to t("devise_views.shared.links.organization_signup"), new_organization_registration_path %>
<% end -%> <%# end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> <%#- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
<%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %><br> <%#= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %><!-- <br> -->
<% end -%> <%# end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %><br> <%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %><br>

33
app/views/devise/unlocks/new.html.erb
View File

@@ -1,23 +1,16 @@
<div class="row auth"> <h1 class="text-center"><%= t("devise_views.unlocks.new.title") %></h1>
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h1 class="text-center"><%= t("devise_views.unlocks.new.title") %></h1>
<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
<%= render 'shared/errors', resource: resource %> <%= render 'shared/errors', resource: resource %>
<div class="field"> <div class="field">
<%= f.email_field :email, autofocus: true, <%= f.email_field :email, autofocus: true,
label: t("devise_views.unlocks.new.email_label") %> label: t("devise_views.unlocks.new.email_label") %>
</div>
<div class="actions">
<%= f.submit t("devise_views.unlocks.new.submit") %>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
</div> </div>
</div>
<div class="actions">
<%= f.submit t("devise_views.unlocks.new.submit") %>
</div>
<% end %>
<%= render "devise/shared/links" %>

40
app/views/layouts/devise.html.erb
View File

@@ -14,24 +14,6 @@
<body class="auth-page"> <body class="auth-page">
<% if notice %>
<div data-alert class="alert-box success alert-layout">
<a href="#" class="close">&times;</a>
<div class="row">
<%= notice %>
</div>
</div>
<% end %>
<% if alert %>
<div data-alert class="alert-box alert alert-layout">
<a href="#" class="close">&times;</a>
<div class="row">
<%= alert %>
</div>
</div>
<% end %>
<div class="row"> <div class="row">
<div class="small-12 medium-8 large-5 column small-centered"> <div class="small-12 medium-8 large-5 column small-centered">
<h1> <h1>
@@ -42,7 +24,27 @@
</div> </div>
</div> </div>
<%= yield %> <div class="row auth">
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<% if notice %>
<div data-alert class="alert-box radius success">
<a href="#" class="close">&times;</a>
<%= notice %>
</div>
<% end %>
<% if alert %>
<div data-alert class="alert-box radius warning">
<a href="#" class="close">&times;</a>
<%= alert %>
</div>
<% end %>
<%= yield %>
</div>
</div>
</div>
</body> </body>
</html> </html>

63
app/views/organizations/registrations/new.html.erb
View File

@@ -1,36 +1,39 @@
<div class="auth row"> <h2><%= t("devise_views.organizations.registrations.new.title") %></h2>
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h2><%= t("devise_views.organizations.registrations.new.title") %></h2>
<%= form_for(resource, as: :user, url: organization_registration_path) do |f| %> <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %>
<%= render 'shared/errors', resource: resource %> <%= render 'shared/errors', resource: resource %>
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<%= f.fields_for :organization do |fo| %> <%= f.fields_for :organization do |fo| %>
<%= fo.text_field :name, autofocus: true, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %> <%= 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" %>
</div>
</div>
<% end %> <% 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} %>
<!-- Makes me work! -->
<%= f.label :remember_me do %>
<%= f.check_box :remember_me, label: false %>
<span class="checkbox">
<%= t("devise_views.users.registrations.new.terms",
terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", target: "_blank")).html_safe %></span>
<% end %>
<!-- /. Makes me work! -->
<%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button radius expand" %>
</div> </div>
</div> </div>
</div> <% end %>
<%= render "devise/shared/links" %>

57
app/views/users/registrations/new.html.erb
View File

@@ -1,40 +1,45 @@
<div class="auth row"> <h2><%= t("devise_views.users.registrations.new.title") %></h2>
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h2><%= t("devise_views.users.registrations.new.title") %></h2>
<%# render 'devise/omniauth_form' %> <%# render 'devise/omniauth_form' %>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= render 'shared/errors', resource: resource %> <%= render 'shared/errors', resource: resource %>
<%= link_to t("devise_views.users.registrations.new.organization_signup"), new_organization_registration_path %><br> <p>
<br> <%= 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 %>
</p>
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<%= f.label t("devise_views.users.registrations.new.username_label") %> <%= f.label t("devise_views.users.registrations.new.username_label") %>
<span class="note"><%= t("devise_views.users.registrations.new.username_note") %></span> <span class="note"><%= t("devise_views.users.registrations.new.username_note") %></span>
<%= f.text_field :username, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %> <%= 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", <%= f.password_field :password, autocomplete: "off",
placeholder: t("devise_views.users.registrations.new.password_label") %> placeholder: t("devise_views.users.registrations.new.password_label") %>
<%= f.password_field :password_confirmation, autocomplete: "off", <%= f.password_field :password_confirmation, autocomplete: "off",
label: t("devise_views.users.registrations.new.password_confirmation_label"), label: t("devise_views.users.registrations.new.password_confirmation_label"),
placeholder: 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" %> <!-- Makes me work! -->
</div> <%= f.label :remember_me do %>
</div> <%= f.check_box :remember_me, label: false %>
<span class="checkbox">
<%= t("devise_views.users.registrations.new.terms",
terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", target: "_blank")).html_safe %></span>
<% end %> <% end %>
<!-- /. Makes me work! -->
<%= render "devise/shared/links" %> <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button radius expand" %>
</div> </div>
</div> </div>
</div> <% end %>
<%= render "devise/shared/links" %>

8
config/locales/devise_views.en.yml
View File

@@ -59,7 +59,10 @@ en:
password_label: "Password" password_label: "Password"
password_confirmation_label: "Confirm password" password_confirmation_label: "Confirm password"
submit: "Sign up" 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: organizations:
registrations: registrations:
new: new:
@@ -92,7 +95,8 @@ en:
shared: shared:
links: links:
login: "Log in" 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}" signin_with_provider: "Sign in with %{provider}"
organization_signup: "Sign up as an organization / collective" organization_signup: "Sign up as an organization / collective"
new_password: "Forgot your password?" new_password: "Forgot your password?"

8
config/locales/devise_views.es.yml
View File

@@ -59,7 +59,10 @@ es:
password_label: "Contraseña" password_label: "Contraseña"
password_confirmation_label: "Confirmar contraseña" password_confirmation_label: "Confirmar contraseña"
submit: "Registrarse" 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: organizations:
registrations: registrations:
new: new:
@@ -92,7 +95,8 @@ es:
shared: shared:
links: links:
login: "Entrar" login: "Entrar"
signup: "Registrarse" signup: "¿No tienes una cuenta? %{signup_link}"
signup_link: "Regístrate"
organization_signup: "Registro para organizaciones / colectivos" organization_signup: "Registro para organizaciones / colectivos"
signin_with_provider: "Entrar con %{provider}" signin_with_provider: "Entrar con %{provider}"
new_password: "¿Olvidaste tu contraseña?" new_password: "¿Olvidaste tu contraseña?"