devise views polishing

This commit is contained in:
Adrian Hinz 2019-05-09 15:24:14 +02:00
parent 6bf60cd8cb
commit abae676f57
7 changed files with 171 additions and 132 deletions

View File

@ -1,16 +1,27 @@
<h2>Resend confirmation instructions</h2> <div class="row justify-content-center">
<div class="col-xl-10 col-lg-12 col-md-9">
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> <div class="card o-hidden border-0 shadow-lg my-5">
<%= render "devise/shared/error_messages", resource: resource %> <div class="card-body p-0">
<div class="row">
<div class="field"> <div class="col-lg-5 d-none d-lg-block bg-password-image"></div>
<%= f.label :email %><br /> <div class="col-lg-7">
<%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> <div class="p-5">
<div class="text-center">
<h1 class="h4 text-gray-900 mb-4"><%= t('devise.confirmations.new.resend_confirmation_instructions') %></h1>
</div>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'user' }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %>
<div class="form-group">
<%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), class: 'form-control form-control-user' %>
</div>
<%= f.submit t('devise.confirmations.new.resend_confirmation_instructions'), class: 'btn btn-primary btn-user btn-block' %>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div>
<div class="actions">
<%= f.submit "Resend confirmation instructions" %>
</div>
<% end %>
<%= render "devise/shared/links" %>

View File

@ -1,29 +1,35 @@
<div class="row"> <div class="row justify-content-center">
<div class="col-lg-6 d-none d-lg-block bg-password-image"></div> <div class="col-xl-10 col-lg-12 col-md-9">
<div class="col-lg-6"> <div class="card o-hidden border-0 shadow-lg my-5">
<div class="p-5"> <div class="card-body p-0">
<div class="text-center"> <div class="row">
<h1 class="h4 text-gray-900 mb-4"><%= t('devise.passwords.edit.change_your_password') %></h1> <div class="col-lg-6 d-none d-lg-block bg-password-image"></div>
</div> <div class="col-lg-6">
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: 'user' }) do |f| %> <div class="p-5">
<%= render "devise/shared/error_messages", resource: resource %> <div class="text-center">
<%= f.hidden_field :reset_password_token %> <h1 class="h4 text-gray-900 mb-4"><%= t('devise.passwords.edit.change_your_password') %></h1>
</div>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: 'user' }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %>
<%= f.hidden_field :reset_password_token %>
<div class="form-group"> <div class="form-group">
<%= f.password_field :password, autofocus: true, autocomplete: "new-password", placeholder: t('devise.passwords.edit.new_password'), class: 'form-control form-control-user' %> <%= f.password_field :password, autofocus: true, autocomplete: "new-password", placeholder: t('devise.passwords.edit.new_password'), class: 'form-control form-control-user' %>
<% if @minimum_password_length %> <% if @minimum_password_length %>
<small class="form-text text-muted"><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></small><br/> <small class="form-text text-muted"><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></small>
<% end %> <% end %>
</div>
<div class="form-group">
<%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t('devise.passwords.edit.confirm_new_password'), class: 'form-control form-control-user' %>
</div>
<%= f.submit t('devise.passwords.edit.change_my_password'), class: 'btn btn-primary btn-user btn-block' %>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div>
</div>
</div>
</div> </div>
</div>
<div class="form-group">
<%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t('devise.passwords.edit.confirm_new_password'), class: 'form-control form-control-user' %>
</div>
<%= f.submit t('devise.passwords.edit.change_my_password'), class: 'btn btn-primary btn-user btn-block' %>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div> </div>
</div> </div>
</div>

View File

@ -1,21 +1,29 @@
<div class="row"> <div class="row justify-content-center">
<div class="col-lg-6 d-none d-lg-block bg-password-image"></div> <div class="col-xl-10 col-lg-12 col-md-9">
<div class="col-lg-6"> <div class="card o-hidden border-0 shadow-lg my-5">
<div class="p-5"> <div class="card-body p-0">
<div class="text-center"> <div class="row">
<h1 class="h4 text-gray-900 mb-4"><%= t('devise.passwords.new.forgot_your_password') %></h1> <div class="col-lg-6 d-none d-lg-block bg-password-image"></div>
</div> <div class="col-lg-6">
<div class="p-5">
<div class="text-center">
<h1 class="h4 text-gray-900 mb-4"><%= t('devise.passwords.new.forgot_your_password') %></h1>
</div>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: 'user' }) do |f| %> <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: 'user' }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %> <%= render "devise/shared/error_messages", resource: resource %>
<div class="form-group"> <div class="form-group">
<%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', class: 'form-control form-control-user' %> <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', class: 'form-control form-control-user' %>
</div>
<%= f.submit t('devise.passwords.new.send_me_reset_password_instructions'), class: 'btn btn-primary btn-user btn-block' %>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div>
</div>
</div> </div>
</div>
<%= f.submit t('devise.passwords.new.send_me_reset_password_instructions'), class: 'btn btn-primary btn-user btn-block' %>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,29 +1,32 @@
<h2>Sign up</h2> <div class="card o-hidden border-0 shadow-lg my-5">
<div class="card-body p-0">
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> <div class="row">
<%= render "devise/shared/error_messages", resource: resource %> <div class="col-lg-5 d-none d-lg-block bg-register-image"></div>
<div class="col-lg-7">
<div class="field"> <div class="p-5">
<%= f.label :email %><br /> <div class="text-center">
<%= f.email_field :email, autofocus: true, autocomplete: "email" %> <h1 class="h4 text-gray-900 mb-4"><%= t('devise.registrations.new.sign_up') %></h1>
</div>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: 'user' }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %>
<div class="form-group">
<%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), class: 'form-control form-control-user' %>
</div>
<div class="form-group">
<%= f.password_field :password, autofocus: true, autocomplete: "new-password", placeholder: t('devise.passwords.edit.new_password'), class: 'form-control form-control-user' %>
<% if @minimum_password_length %>
<small class="form-text text-muted"><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></small>
<% end %>
</div>
<div class="form-group">
<%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t('devise.passwords.edit.confirm_new_password'), class: 'form-control form-control-user' %>
</div>
<%= f.submit t('devise.confirmations.new.resend_confirmation_instructions'), class: 'btn btn-primary btn-user btn-block' %>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div>
</div>
</div>
</div> </div>
</div>
<div class="field">
<%= f.label :password %>
<% if @minimum_password_length %>
<em>(<%= @minimum_password_length %> characters minimum)</em>
<% end %><br />
<%= f.password_field :password, autocomplete: "new-password" %>
</div>
<div class="field">
<%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation, autocomplete: "new-password" %>
</div>
<div class="actions">
<%= f.submit "Sign up" %>
</div>
<% end %>
<%= render "devise/shared/links" %>

View File

@ -1,32 +1,40 @@
<div class="row"> <div class="row justify-content-center">
<div class="col-lg-6 d-none d-lg-block bg-login-image"></div> <div class="col-xl-10 col-lg-12 col-md-9">
<div class="col-lg-6"> <div class="card o-hidden border-0 shadow-lg my-5">
<div class="p-5"> <div class="card-body p-0">
<div class="text-center"> <div class="row">
<h1 class="h4 text-gray-900 mb-4"><%= t('welcome') %></h1> <div class="col-lg-6 d-none d-lg-block bg-login-image"></div>
</div> <div class="col-lg-6">
<div class="p-5">
<div class="text-center">
<h1 class="h4 text-gray-900 mb-4"><%= t('welcome') %></h1>
</div>
<%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'user' }) do |f| %> <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'user' }) do |f| %>
<div class="form-group"> <div class="form-group">
<%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', class: 'form-control form-control-user' %> <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', class: 'form-control form-control-user' %>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.password_field :password, autocomplete: "current-password", placeholder: 'Hasło', class: 'form-control form-control-user' %> <%= f.password_field :password, autocomplete: "current-password", placeholder: 'Hasło', class: 'form-control form-control-user' %>
</div> </div>
<% if devise_mapping.rememberable? %> <% if devise_mapping.rememberable? %>
<div class="form-group"> <div class="form-group">
<div class="custom-control custom-checkbox small"> <div class="custom-control custom-checkbox small">
<%= f.check_box :remember_me, class: 'custom-control-input' %> <%= f.check_box :remember_me, class: 'custom-control-input' %>
<%= f.label :remember_me, class: 'custom-control-label' %> <%= f.label :remember_me, class: 'custom-control-label' %>
</div>
</div>
<% end %>
<%= f.submit t('login'), class: 'btn btn-primary btn-user btn-block' %>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div> </div>
</div> </div>
<% end %> </div>
<%= f.submit t('login'), class: 'btn btn-primary btn-user btn-block' %> </div>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,16 +1,27 @@
<h2>Resend unlock instructions</h2> <div class="row justify-content-center">
<div class="col-xl-10 col-lg-12 col-md-9">
<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> <div class="card o-hidden border-0 shadow-lg my-5">
<%= render "devise/shared/error_messages", resource: resource %> <div class="card-body p-0">
<div class="row">
<div class="field"> <div class="col-lg-5 d-none d-lg-block bg-password-image"></div>
<%= f.label :email %><br /> <div class="col-lg-7">
<%= f.email_field :email, autofocus: true, autocomplete: "email" %> <div class="p-5">
<div class="text-center">
<h1 class="h4 text-gray-900 mb-4"><%= t('devise.unlocks.new.resend_unlock_instructions') %></h1>
</div>
<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post, class: 'user' }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %>
<div class="form-group">
<%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), class: 'form-control form-control-user' %>
</div>
<%= f.submit t('devise.unlocks.new.resend_unlock_instructions'), class: 'btn btn-primary btn-user btn-block' %>
<% end %>
<hr>
<%= render "devise/shared/links" %>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div>
<div class="actions">
<%= f.submit "Resend unlock instructions" %>
</div>
<% end %>
<%= render "devise/shared/links" %>

View File

@ -14,15 +14,7 @@
<body class="bg-gradient-primary"> <body class="bg-gradient-primary">
<div class="container"> <div class="container">
<!-- Outer Row --> <!-- Outer Row -->
<div class="row justify-content-center"> <%= yield %>
<div class="col-xl-10 col-lg-12 col-md-9">
<div class="card o-hidden border-0 shadow-lg my-5">
<div class="card-body p-0">
<%= yield %>
</div>
</div>
</div>
</div>
</div> </div>
<%= javascript_include_tag 'jquery.min', 'bootstrap.bundle.min' %> <%= javascript_include_tag 'jquery.min', 'bootstrap.bundle.min' %>
<%= javascript_include_tag 'jquery.easing.min', 'sb-admin-2.min' %> <%= javascript_include_tag 'jquery.easing.min', 'sb-admin-2.min' %>