From c3d4179eebc2ae651ec441518a3fb0f9bfddec09 Mon Sep 17 00:00:00 2001 From: Raghu Betina Date: Wed, 13 Jul 2016 00:52:52 -0400 Subject: [PATCH 1/9] Update to Bootstrap 4 --- passwords/edit.html.erb | 57 ++++++++++++++++++++++ passwords/new.html.erb | 43 +++++++++++++++++ registrations/edit.html.erb | 84 +++++++++++++++++++++----------- registrations/new.html.erb | 95 ++++++++++++++++++++++--------------- sessions/new.html.erb | 38 ++++++++------- 5 files changed, 236 insertions(+), 81 deletions(-) create mode 100644 passwords/edit.html.erb create mode 100644 passwords/new.html.erb mode change 100644 => 100755 registrations/edit.html.erb mode change 100644 => 100755 registrations/new.html.erb mode change 100644 => 100755 sessions/new.html.erb diff --git a/passwords/edit.html.erb b/passwords/edit.html.erb new file mode 100644 index 0000000..ea8c0c5 --- /dev/null +++ b/passwords/edit.html.erb @@ -0,0 +1,57 @@ +
+
+
+

+ Change your password +

+ +
+ <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= f.hidden_field :reset_password_token %> + +
"> + <%= f.label :password, "New password", class: "col-sm-2 control-label" %> +
+ <%= f.password_field :password, class: "form-control" %> + + <% if resource.errors.include?(:password) %> + <% resource.errors.full_messages_for(:password).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% end %> +
+
+ +
"> + <%= f.label :password_confirmation, "Confirm new password", class: "col-sm-2 control-label" %> +
+ <%= f.password_field :password_confirmation, class: "form-control" %> + + <% if resource.errors.include?(:password_confirmation) %> + <% resource.errors.full_messages_for(:password_confirmation).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% end %> +
+
+ +
+
+ <%= f.submit "Change my password", class: "btn btn-primary btn-block" %> +
+
+ +
+
+ <%= render "devise/shared/links" %> +
+
+ <% end %> +
+
+
+
diff --git a/passwords/new.html.erb b/passwords/new.html.erb new file mode 100644 index 0000000..b30bd75 --- /dev/null +++ b/passwords/new.html.erb @@ -0,0 +1,43 @@ +
+
+
+

+ Forgot your password? +

+ +
+ + <%= form_for(resource, as: resource_name, url: password_path(resource_name)) do |f| %> + +
"> + <%= f.label :email, class: "col-sm-2 control-label" %> +
+ <%= f.email_field :email, autofocus: true, class: "form-control" %> + + <% if resource.errors.include?(:email) %> + <% resource.errors.full_messages_for(:email).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% end %> +
+
+ +
+
+ <%= f.submit "Send me reset password instructions", class: "btn btn-primary btn-block" %> +
+
+ +
+
+ <%= render "devise/shared/links" %> +
+
+ + <% end %> +
+
+
+
diff --git a/registrations/edit.html.erb b/registrations/edit.html.erb old mode 100644 new mode 100755 index 9bab2c8..e2d2231 --- a/registrations/edit.html.erb +++ b/registrations/edit.html.erb @@ -1,75 +1,105 @@ -
-
-
-
-

Edit <%= resource_name.to_s.humanize %>

-
+
+
+
+

+ Edit <%= resource_name.to_s.humanize %> +

-
+
- <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: "form-horizontal", role: "form" }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> -
+
"> <%= f.label :email, class: "col-sm-2 control-label" %>
<%= f.email_field :email, autofocus: true, class: "form-control" %> + + <% if resource.errors.include?(:email) %> + <% resource.errors.full_messages_for(:email).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% end %>
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> -
+
-

+

Currently waiting confirmation for: <%= resource.unconfirmed_email %>

<% end %> -
+
"> <%= f.label :password, class: "col-sm-2 control-label" %>
- <%= f.password_field :password, autocomplete: "off", class: "form-control" %> -

- Leave blank if you don't want to change it. -

+ <%= f.password_field :password, class: "form-control" %> + + <% if resource.errors.include?(:password) %> + <% resource.errors.full_messages_for(:password).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% end %>
-
+
"> <%= f.label :password_confirmation, class: "col-sm-2 control-label" %>
- <%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control" %> + <%= f.password_field :password_confirmation, class: "form-control" %> + + <% if resource.errors.include?(:password_confirmation) %> + <% resource.errors.full_messages_for(:password_confirmation).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% end %>
-
+
"> <%= f.label :current_password, class: "col-sm-2 control-label" %>
<%= f.password_field :current_password, autocomplete: "off", class: "form-control" %> -

- We need your current password to confirm your changes. -

+ + <% if resource.errors.include?(:current_password) %> + <% resource.errors.full_messages_for(:current_password).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% else %> +

+ We need your current password to confirm your changes. +

+ <% end %>
-
+
- <%= f.submit "Update", class: "btn btn-success btn-block" %> + <%= f.submit "Update", class: "btn btn-primary btn-block" %>
-
+
<%= link_to "Back", :back, class: "btn btn-link btn-block" %>
+ <% end %>
-
+
Unhappy? diff --git a/registrations/new.html.erb b/registrations/new.html.erb old mode 100644 new mode 100755 index 3853e9e..7dd1643 --- a/registrations/new.html.erb +++ b/registrations/new.html.erb @@ -1,52 +1,73 @@ -
-
-
-
-

Sign up

-
+
+
+
+

+ Sign up +

+ +
+ + <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> -
- <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "form-horizontal", role: "form" }) do |f| %> - <%= devise_error_messages! %> +
"> + <%= f.label :email, class: "col-sm-2 control-label" %> +
+ <%= f.email_field :email, autofocus: true, class: "form-control" %> -
- <%= f.label :email, class: "col-sm-2 control-label" %> -
- <%= f.email_field :email, autofocus: true, class: "form-control" %> + <% if resource.errors.include?(:email) %> + <% resource.errors.full_messages_for(:email).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% end %> +
-
- -
- <%= f.label :password, class: "col-sm-2 control-label" %> -
- <%= f.password_field :password, autocomplete: "off", class: "form-control" %> -

- <% if @validatable %> - (<%= @minimum_password_length %> characters minimum) + +

"> + <%= f.label :password, class: "col-sm-2 control-label" %> +
+ <%= f.password_field :password, class: "form-control" %> + + <% if resource.errors.include?(:password) %> + <% resource.errors.full_messages_for(:password).each do |message| %> +

+ <%= message %> +

+ <% end %> <% end %> -

+
-
-
- <%= f.label :password_confirmation, class: "col-sm-2 control-label" %> -
- <%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control" %> +
"> + <%= f.label :password_confirmation, class: "col-sm-2 control-label" %> +
+ <%= f.password_field :password_confirmation, class: "form-control" %> + + <% if resource.errors.include?(:password_confirmation) %> + <% resource.errors.full_messages_for(:password_confirmation).each do |message| %> +

+ <%= message %> +

+ <% end %> + <% end %> +
-
-
-
- <%= f.submit "Sign up", class: "btn btn-success btn-block" %> +
+
+ <%= f.submit "Sign up", class: "btn btn-primary btn-block" %> +
-
-
-
- <%= render "devise/shared/links" %> +
+
+ <%= render "devise/shared/links" %> +
-
+ <% end %> +
diff --git a/sessions/new.html.erb b/sessions/new.html.erb old mode 100644 new mode 100755 index 2b36683..19812cd --- a/sessions/new.html.erb +++ b/sessions/new.html.erb @@ -1,28 +1,30 @@ -
-
-
-
-

Log In

-
+
+
+
+

+ Sign in +

+ +
+ + <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
- <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "form-horizontal", role: "form" }) do |f| %> -
+
<%= f.label :email, class: "col-sm-2 control-label" %>
<%= f.email_field :email, autofocus: true, class: "form-control" %>
-
+
<%= f.label :password, class: "col-sm-2 control-label" %>
- <%= f.password_field :password, autocomplete: "off", class: "form-control" %> + <%= f.password_field :password, class: "form-control" %>
-
-
+
+
<% if devise_mapping.rememberable? -%> <%= f.label :remember_me do %> <%= f.check_box :remember_me %> Remember me @@ -31,18 +33,20 @@
-
-
- <%= f.submit "Log in", class: "btn btn-success btn-block" %> +
+
+ <%= f.submit "Sign in", class: "btn btn-primary btn-block" %>
-
+
<%= render "devise/shared/links" %>
+ <% end %> +
From e0b7aa0b68b0fdff46e407ba76905e984d2b51fe Mon Sep 17 00:00:00 2001 From: Raghu Betina Date: Wed, 2 Nov 2016 11:14:50 -0500 Subject: [PATCH 2/9] Update new.html.erb --- sessions/new.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sessions/new.html.erb b/sessions/new.html.erb index 19812cd..d031530 100755 --- a/sessions/new.html.erb +++ b/sessions/new.html.erb @@ -1,5 +1,5 @@ -
-
+
+

Sign in @@ -24,7 +24,7 @@

-
+
<% if devise_mapping.rememberable? -%> <%= f.label :remember_me do %> <%= f.check_box :remember_me %> Remember me @@ -34,19 +34,19 @@
-
+
<%= f.submit "Sign in", class: "btn btn-primary btn-block" %>
-
+
<%= render "devise/shared/links" %>
<% end %> - +
From cc0eb21cd80637a9562a5d2c3fd3f566628362f1 Mon Sep 17 00:00:00 2001 From: Raghu Betina Date: Wed, 2 Nov 2016 11:18:21 -0500 Subject: [PATCH 3/9] Update edit.html.erb --- registrations/edit.html.erb | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/registrations/edit.html.erb b/registrations/edit.html.erb index e2d2231..8b2fb30 100755 --- a/registrations/edit.html.erb +++ b/registrations/edit.html.erb @@ -1,5 +1,5 @@ -
-
+
+

Edit <%= resource_name.to_s.humanize %> @@ -26,7 +26,7 @@ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-
+

Currently waiting confirmation for: <%= resource.unconfirmed_email %>

@@ -64,37 +64,18 @@
-
"> - <%= f.label :current_password, class: "col-sm-2 control-label" %> -
- <%= f.password_field :current_password, autocomplete: "off", class: "form-control" %> - - <% if resource.errors.include?(:current_password) %> - <% resource.errors.full_messages_for(:current_password).each do |message| %> -

- <%= message %> -

- <% end %> - <% else %> -

- We need your current password to confirm your changes. -

- <% end %> -
-
-
-
+
<%= f.submit "Update", class: "btn btn-primary btn-block" %>
-
+
<%= link_to "Back", :back, class: "btn btn-link btn-block" %>
- + <% end %>
From d6d1e2604f1c4a2a196c69828c64d5e929215ab7 Mon Sep 17 00:00:00 2001 From: Raghu Betina Date: Wed, 2 Nov 2016 11:18:37 -0500 Subject: [PATCH 4/9] Update new.html.erb --- registrations/new.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/registrations/new.html.erb b/registrations/new.html.erb index 7dd1643..ea393af 100755 --- a/registrations/new.html.erb +++ b/registrations/new.html.erb @@ -1,5 +1,5 @@ -
-
+
+

Sign up @@ -55,13 +55,13 @@

-
+
<%= f.submit "Sign up", class: "btn btn-primary btn-block" %>
-
+
<%= render "devise/shared/links" %>
From 0803499ed3e9eab8c6c41016164d9c7b9fccbd73 Mon Sep 17 00:00:00 2001 From: mrjonesbot Date: Thu, 23 Mar 2017 16:07:42 -0500 Subject: [PATCH 5/9] sessions new --- passwords/edit.html.erb | 2 +- sessions/new.html.erb | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/passwords/edit.html.erb b/passwords/edit.html.erb index ea8c0c5..a352180 100644 --- a/passwords/edit.html.erb +++ b/passwords/edit.html.erb @@ -1,5 +1,5 @@
-
+

Change your password diff --git a/sessions/new.html.erb b/sessions/new.html.erb index d031530..f4fc5fb 100755 --- a/sessions/new.html.erb +++ b/sessions/new.html.erb @@ -1,30 +1,30 @@ -
+

Sign in

-
+
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
- <%= f.label :email, class: "col-sm-2 control-label" %> + <%= f.label :email, class: "col-sm-2 form-control-label" %>
<%= f.email_field :email, autofocus: true, class: "form-control" %>
- <%= f.label :password, class: "col-sm-2 control-label" %> + <%= f.label :password, class: "col-sm-2 form-control-label" %>
<%= f.password_field :password, class: "form-control" %>
-
+
<% if devise_mapping.rememberable? -%> <%= f.label :remember_me do %> <%= f.check_box :remember_me %> Remember me @@ -44,9 +44,7 @@ <%= render "devise/shared/links" %>
- <% end %> -
From 19aa463cf23af58475a465b87fbdc8fe927814e2 Mon Sep 17 00:00:00 2001 From: mrjonesbot Date: Thu, 23 Mar 2017 16:12:22 -0500 Subject: [PATCH 6/9] registrations new --- registrations/new.html.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/registrations/new.html.erb b/registrations/new.html.erb index ea393af..592630e 100755 --- a/registrations/new.html.erb +++ b/registrations/new.html.erb @@ -1,4 +1,4 @@ -
+

@@ -10,13 +10,13 @@ <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
"> - <%= f.label :email, class: "col-sm-2 control-label" %> + <%= f.label :email, class: "col-sm-2 form-control-label" %>
<%= f.email_field :email, autofocus: true, class: "form-control" %> <% if resource.errors.include?(:email) %> <% resource.errors.full_messages_for(:email).each do |message| %> -

+

<%= message %>

<% end %> @@ -25,13 +25,13 @@
"> - <%= f.label :password, class: "col-sm-2 control-label" %> + <%= f.label :password, class: "col-sm-2 form-control-label" %>
<%= f.password_field :password, class: "form-control" %> <% if resource.errors.include?(:password) %> <% resource.errors.full_messages_for(:password).each do |message| %> -

+

<%= message %>

<% end %> @@ -40,13 +40,13 @@
"> - <%= f.label :password_confirmation, class: "col-sm-2 control-label" %> + <%= f.label :password_confirmation, class: "col-sm-2 form-control-label" %>
<%= f.password_field :password_confirmation, class: "form-control" %> <% if resource.errors.include?(:password_confirmation) %> <% resource.errors.full_messages_for(:password_confirmation).each do |message| %> -

+

<%= message %>

<% end %> From 9cdbdbd69d7e22f5f70e8be3597b0045476a3f72 Mon Sep 17 00:00:00 2001 From: mrjonesbot Date: Thu, 23 Mar 2017 16:13:48 -0500 Subject: [PATCH 7/9] registrations edit --- registrations/edit.html.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/registrations/edit.html.erb b/registrations/edit.html.erb index 8b2fb30..1e4002d 100755 --- a/registrations/edit.html.erb +++ b/registrations/edit.html.erb @@ -1,4 +1,4 @@ -
+

@@ -10,13 +10,13 @@ <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
"> - <%= f.label :email, class: "col-sm-2 control-label" %> + <%= f.label :email, class: "col-sm-2 form-control-label" %>
<%= f.email_field :email, autofocus: true, class: "form-control" %> <% if resource.errors.include?(:email) %> <% resource.errors.full_messages_for(:email).each do |message| %> -

+

<%= message %>

<% end %> @@ -27,7 +27,7 @@ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-

+

Currently waiting confirmation for: <%= resource.unconfirmed_email %>

@@ -35,13 +35,13 @@ <% end %>
"> - <%= f.label :password, class: "col-sm-2 control-label" %> + <%= f.label :password, class: "col-sm-2 form-control-label" %>
<%= f.password_field :password, class: "form-control" %> <% if resource.errors.include?(:password) %> <% resource.errors.full_messages_for(:password).each do |message| %> -

+

<%= message %>

<% end %> @@ -50,13 +50,13 @@
"> - <%= f.label :password_confirmation, class: "col-sm-2 control-label" %> + <%= f.label :password_confirmation, class: "col-sm-2 form-control-label" %>
<%= f.password_field :password_confirmation, class: "form-control" %> <% if resource.errors.include?(:password_confirmation) %> <% resource.errors.full_messages_for(:password_confirmation).each do |message| %> -

+

<%= message %>

<% end %> From ae27bf940593d330c6325ca597b3fc30009fb4ce Mon Sep 17 00:00:00 2001 From: mrjonesbot Date: Thu, 23 Mar 2017 16:15:29 -0500 Subject: [PATCH 8/9] passwords new --- passwords/new.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/passwords/new.html.erb b/passwords/new.html.erb index b30bd75..7309dc8 100644 --- a/passwords/new.html.erb +++ b/passwords/new.html.erb @@ -1,5 +1,5 @@ -
-
+
+

Forgot your password? @@ -10,13 +10,13 @@ <%= form_for(resource, as: resource_name, url: password_path(resource_name)) do |f| %>
"> - <%= f.label :email, class: "col-sm-2 control-label" %> + <%= f.label :email, class: "col-sm-2 form-control-label" %>
<%= f.email_field :email, autofocus: true, class: "form-control" %> <% if resource.errors.include?(:email) %> <% resource.errors.full_messages_for(:email).each do |message| %> -

+

<%= message %>

<% end %> @@ -25,13 +25,13 @@
-
+
<%= f.submit "Send me reset password instructions", class: "btn btn-primary btn-block" %>
-
+
<%= render "devise/shared/links" %>
From 7df8d46d8255f753f790341a927cb43118910f3c Mon Sep 17 00:00:00 2001 From: mrjonesbot Date: Thu, 23 Mar 2017 16:16:49 -0500 Subject: [PATCH 9/9] passwords edit --- passwords/edit.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/passwords/edit.html.erb b/passwords/edit.html.erb index a352180..099d3b7 100644 --- a/passwords/edit.html.erb +++ b/passwords/edit.html.erb @@ -1,4 +1,4 @@ -
+

@@ -10,13 +10,13 @@ <%= f.hidden_field :reset_password_token %>
"> - <%= f.label :password, "New password", class: "col-sm-2 control-label" %> + <%= f.label :password, "New password", class: "col-sm-2 form-control-label" %>
<%= f.password_field :password, class: "form-control" %> <% if resource.errors.include?(:password) %> <% resource.errors.full_messages_for(:password).each do |message| %> -

+

<%= message %>

<% end %> @@ -25,13 +25,13 @@
"> - <%= f.label :password_confirmation, "Confirm new password", class: "col-sm-2 control-label" %> + <%= f.label :password_confirmation, "Confirm new password", class: "col-sm-2 form-control-label" %>
<%= f.password_field :password_confirmation, class: "form-control" %> <% if resource.errors.include?(:password_confirmation) %> <% resource.errors.full_messages_for(:password_confirmation).each do |message| %> -

+

<%= message %>

<% end %> @@ -46,7 +46,7 @@
-
+
<%= render "devise/shared/links" %>