diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index b12dd0c..3b354fb 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,16 +1,27 @@ -

Resend confirmation instructions

- -<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= render "devise/shared/error_messages", resource: resource %> - -
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> +
+
+
+
+
+
+
+
+
+

<%= t('devise.confirmations.new.resend_confirmation_instructions') %>

+
+ <%= 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 %> +
+ <%= 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' %> +
+ <%= f.submit t('devise.confirmations.new.resend_confirmation_instructions'), class: 'btn btn-primary btn-user btn-block' %> + <% end %> +
+ <%= render "devise/shared/links" %> +
+
+
+
+
- -
- <%= f.submit "Resend confirmation instructions" %> -
-<% end %> - -<%= render "devise/shared/links" %> +
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 09e0607..8939523 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,29 +1,35 @@ -
-
-
-
-
-

<%= t('devise.passwords.edit.change_your_password') %>

-
- <%= 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 %> +
+
+
+
+
+
+
+
+
+

<%= t('devise.passwords.edit.change_your_password') %>

+
+ <%= 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 %> -
- <%= 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 %> - <%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %>
- <% end %> +
+ <%= 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 %> + <%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %> + <% end %> +
+
+ <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t('devise.passwords.edit.confirm_new_password'), class: 'form-control form-control-user' %> +
+ <%= f.submit t('devise.passwords.edit.change_my_password'), class: 'btn btn-primary btn-user btn-block' %> + <% end %> +
+ <%= render "devise/shared/links" %> +
+
+
- -
- <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t('devise.passwords.edit.confirm_new_password'), class: 'form-control form-control-user' %> -
- - <%= f.submit t('devise.passwords.edit.change_my_password'), class: 'btn btn-primary btn-user btn-block' %> - <% end %> -
- <%= render "devise/shared/links" %> +
-
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 85c5f5f..8b48470 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,21 +1,29 @@ -
-
-
-
-
-

<%= t('devise.passwords.new.forgot_your_password') %>

-
+
+
+
+
+
+
+
+
+
+

<%= t('devise.passwords.new.forgot_your_password') %>

+
- <%= 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 %> -
- <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', class: 'form-control form-control-user' %> + <%= 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 %> +
+ <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', class: 'form-control form-control-user' %> +
+ + <%= f.submit t('devise.passwords.new.send_me_reset_password_instructions'), class: 'btn btn-primary btn-user btn-block' %> + <% end %> +
+ <%= render "devise/shared/links" %> +
+
- - <%= f.submit t('devise.passwords.new.send_me_reset_password_instructions'), class: 'btn btn-primary btn-user btn-block' %> - <% end %> -
- <%= render "devise/shared/links" %> +
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index d655b66..6f90f64 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,29 +1,32 @@ -

Sign up

- -<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= render "devise/shared/error_messages", resource: resource %> - -
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+
+
+
+
+
+
+

<%= t('devise.registrations.new.sign_up') %>

+
+ <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: 'user' }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> +
+ <%= 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' %> +
+
+ <%= 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 %> + <%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %> + <% end %> +
+
+ <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t('devise.passwords.edit.confirm_new_password'), class: 'form-control form-control-user' %> +
+ <%= f.submit t('devise.confirmations.new.resend_confirmation_instructions'), class: 'btn btn-primary btn-user btn-block' %> + <% end %> +
+ <%= render "devise/shared/links" %> +
+
+
- -
- <%= f.label :password %> - <% if @minimum_password_length %> - (<%= @minimum_password_length %> characters minimum) - <% end %>
- <%= f.password_field :password, autocomplete: "new-password" %> -
- -
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "new-password" %> -
- -
- <%= f.submit "Sign up" %> -
-<% end %> - -<%= render "devise/shared/links" %> +
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 15589ac..e076fa8 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,32 +1,40 @@ -
- -
-
-
-

<%= t('welcome') %>

-
+
+
+
+
+
+ +
+
+
+

<%= t('welcome') %>

+
- <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'user' }) do |f| %> -
- <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', class: 'form-control form-control-user' %> -
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'user' }) do |f| %> +
+ <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'Email', class: 'form-control form-control-user' %> +
-
- <%= 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' %> +
- <% if devise_mapping.rememberable? %> -
-
- <%= f.check_box :remember_me, class: 'custom-control-input' %> - <%= f.label :remember_me, class: 'custom-control-label' %> + <% if devise_mapping.rememberable? %> +
+
+ <%= f.check_box :remember_me, class: 'custom-control-input' %> + <%= f.label :remember_me, class: 'custom-control-label' %> +
+
+ <% end %> + <%= f.submit t('login'), class: 'btn btn-primary btn-user btn-block' %> + <% end %> +
+ <%= render "devise/shared/links" %>
- <% end %> - <%= f.submit t('login'), class: 'btn btn-primary btn-user btn-block' %> - <% end %> -
- <%= render "devise/shared/links" %> +
+
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index ffc34de..b090673 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,16 +1,27 @@ -

Resend unlock instructions

- -<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= render "devise/shared/error_messages", resource: resource %> - -
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+
+
+
+
+
+
+
+
+

<%= t('devise.unlocks.new.resend_unlock_instructions') %>

+
+ <%= 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 %> +
+ <%= 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' %> +
+ <%= f.submit t('devise.unlocks.new.resend_unlock_instructions'), class: 'btn btn-primary btn-user btn-block' %> + <% end %> +
+ <%= render "devise/shared/links" %> +
+
+
+
+
- -
- <%= f.submit "Resend unlock instructions" %> -
-<% end %> - -<%= render "devise/shared/links" %> +
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index 4cb9b9b..5ae349b 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -14,15 +14,7 @@
-
-
-
-
- <%= yield %> -
-
-
-
+ <%= yield %>
<%= javascript_include_tag 'jquery.min', 'bootstrap.bundle.min' %> <%= javascript_include_tag 'jquery.easing.min', 'sb-admin-2.min' %>