diff options
Diffstat (limited to 'app/views/auth/registrations')
| -rw-r--r-- | app/views/auth/registrations/edit.html.haml | 18 | ||||
| -rw-r--r-- | app/views/auth/registrations/new.html.haml | 21 |
2 files changed, 16 insertions, 23 deletions
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml index 567f0ea44..25ed58647 100644 --- a/app/views/auth/registrations/edit.html.haml +++ b/app/views/auth/registrations/edit.html.haml @@ -1,19 +1,15 @@ - content_for :page_title do Change password -= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| - = devise_error_messages! += simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| + = render 'shared/error_messages', object: resource - .field - = f.email_field :email, placeholder: 'E-mail address' - .field - = f.password_field :password, autocomplete: "off", placeholder: 'New password' - .field - = f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password' - .field - = f.password_field :current_password, autocomplete: "off", placeholder: 'Current password' + = f.input :email, placeholder: 'E-mail address' + = f.input :password, autocomplete: "off", placeholder: 'New password' + = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password' + = f.input :current_password, autocomplete: "off", placeholder: 'Current password' .actions - = f.button "Save changes", type: 'submit' + = f.button :button, "Save changes", type: :submit .form-footer= render "settings/shared/links" diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index 97ab5498e..766cbf1a5 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -1,20 +1,17 @@ - content_for :page_title do Sign up -= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| - = devise_error_messages! += simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| + = render 'shared/error_messages', object: resource - = f.fields_for :account do |ff| - .field - = ff.text_field :username, autofocus: true, placeholder: 'Username', required: true + = f.simple_fields_for :account do |ff| + = ff.input :username, autofocus: true, placeholder: 'Username', required: true + + = f.input :email, placeholder: 'E-mail address', required: true + = f.input :password, autocomplete: "off", placeholder: 'Password', required: true + = f.input :password_confirmation, autocomplete: "off", placeholder: 'Confirm password', required: true - .field - = f.email_field :email, placeholder: 'E-mail address', required: true - .field - = f.password_field :password, autocomplete: "off", placeholder: 'Password', required: true - .field - = f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm password', required: true .actions - = f.button "Sign up", type: 'submit' + = f.button :button, "Sign up", type: :submit .form-footer= render "auth/shared/links" |