diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-11 17:05:57 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-11 17:05:57 +0400 |
commit | 6d332ce146b634e18b12e2476ace3955d7d33290 (patch) | |
tree | a9851182d80a32b36531e11c2c1bd3d9c727b5e2 /app/views/devise/passwords | |
parent | f4fbc7b92b8dc0ed94524a79326c073560845d1b (diff) |
Improve signin/signup/reset pages UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/devise/passwords')
-rw-r--r-- | app/views/devise/passwords/edit.html.haml | 33 | ||||
-rwxr-xr-x | app/views/devise/passwords/new.html.haml | 27 |
2 files changed, 31 insertions, 29 deletions
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml index 95c52608e1f..efcd0296176 100644 --- a/app/views/devise/passwords/edit.html.haml +++ b/app/views/devise/passwords/edit.html.haml @@ -1,15 +1,18 @@ -= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "login-box" }) do |f| - %h3 Change your password - .devise-errors - = devise_error_messages! - = f.hidden_field :reset_password_token - %div - = f.password_field :password, class: "form-control top", placeholder: "New password", required: true - %div - = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true - %div - .clearfix.append-bottom-10 - = f.submit "Change my password", class: "btn btn-primary" - = link_to "Sign in", new_session_path(resource_name), class: "btn pull-right" - %div - = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) +.login-box.panel.panel-default + .panel-heading + %h3.panel-title Change your password + .panel-body + = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| + .devise-errors + = devise_error_messages! + = f.hidden_field :reset_password_token + %div + = f.password_field :password, class: "form-control top", placeholder: "New password", required: true + %div + = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true + .clearfix.append-bottom-10 + = f.submit "Change my password", class: "btn btn-primary" + .panel-footer + %p + = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) + = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index 040821ca32a..bf44dee5ad7 100755 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -1,14 +1,13 @@ -= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| - %h3.page-title Reset password - .devise-errors - = devise_error_messages! - .clearfix.append-bottom-20 - = f.email_field :email, placeholder: "Email", class: "form-control", required: true - .clearfix.append-bottom-10 - = f.submit "Reset password", class: "btn-primary btn" - %hr - %p - %span.light - Already have login and password? - %strong - = link_to "Sign in", new_session_path(resource_name) +.login-box.panel.panel-default + .panel-heading + %h3.panel-title Reset password + .panel-body + = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| + .devise-errors + = devise_error_messages! + .clearfix.append-bottom-20 + = f.email_field :email, placeholder: "Email", class: "form-control", required: true + .clearfix.append-bottom-10 + = f.submit "Reset password", class: "btn-primary btn" + .panel-footer + = render 'devise/shared/sign_in_link' |