diff --git a/passwords/edit.html.erb b/passwords/edit.html.erb new file mode 100644 index 0000000..099d3b7 --- /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 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 %> + <% end %> +
+
+ +
"> + <%= 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 %> + <% 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..7309dc8 --- /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 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 %> + <% 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..1e4002d --- a/registrations/edit.html.erb +++ b/registrations/edit.html.erb @@ -1,75 +1,86 @@ -
-
-
-
-

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

+ <%= message %> +

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

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

+ <%= 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 "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..592630e --- 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 form-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 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 %> <% 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 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 %> + <% 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..f4fc5fb --- 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.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, 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,14 +33,14 @@
-
-
- <%= f.submit "Log in", class: "btn btn-success btn-block" %> +
+
+ <%= f.submit "Sign in", class: "btn btn-primary btn-block" %>
-
-
+
+
<%= render "devise/shared/links" %>