FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modified settings pages a bit

This commit is contained in:
nilsding 2014-11-11 20:01:24 +01:00
parent 025aaf2ba7
commit 550824e287
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/user/_account.html.haml
View File

@ -1,23 +1,27 @@
.container.j2-page .container.j2-page
= render 'user/settings_tabs' = render 'user/settings_tabs'
.col-md-9.col-xs-12.col-sm-9 .col-md-9.col-xs-12.col-sm-9
= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| .panel.panel-default
= devise_error_messages! .panel-body
= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
= devise_error_messages!
= f.text_field :screen_name, autofocus: true, label: "User name" = f.text_field :screen_name, autofocus: true, label: "User name"
= f.email_field :email, label: "Email address" = f.email_field :email, label: "Email address"
- if devise_mapping.confirmable? && resource.pending_reconfirmation? - if devise_mapping.confirmable? && resource.pending_reconfirmation?
%div %div
Currently waiting confirmation for: #{resource.unconfirmed_email} Currently waiting confirmation for: #{resource.unconfirmed_email}
= f.password_field :password, autocomplete: "off", label: "Password", help: "Leave this blank if you don't want to change it" = f.password_field :password, autocomplete: "off", label: "Password", help: "Leave this blank if you don't want to change it"
= f.password_field :password_confirmation, autocomplete: "off", label: "Confirm password" = f.password_field :password_confirmation, autocomplete: "off", label: "Confirm password"
= f.password_field :current_password, autocomplete: "off", label: "Current password", help: "We need your current password to confirm your changes" = f.password_field :current_password, autocomplete: "off", label: "Current password", help: "We need your current password to confirm your changes"
= f.submit "Update" = f.submit "Save settings", class: 'btn btn-primary'
%p %hr/
=button_to "Delete my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-danger btn-sm" %p
Unsatisfied?
=button_to "Delete my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-danger btn-xs"
= link_to "Back", :back = link_to "Back", :back

8
app/views/user/_settings_tabs.html.haml
View File

@ -1,4 +1,6 @@
.col-md-3.col-xs-12.col-sm-3 .col-md-3.col-xs-12.col-sm-3
%ul.nav.nav-pills.nav-stacked .panel.panel-default
= nav_entry "Account", edit_user_registration_path .panel-body
= nav_entry "Profile", edit_user_profile_path %ul.nav.nav-pills.nav-stacked
= nav_entry "Account", edit_user_registration_path
= nav_entry "Profile", edit_user_profile_path

12
app/views/user/edit.html.haml
View File

@ -1,8 +1,10 @@
.container.j2-page .container.j2-page
= render 'settings_tabs' = render 'settings_tabs'
.col-md-9.col-xs-12.col-sm-9 .col-md-9.col-xs-12.col-sm-9
= bootstrap_form_for(update_user_profile_path, method: "patch") do |f| .panel.panel-default
.panel-body
= f.text_field :display_name, label: "Your name" = bootstrap_form_for(update_user_profile_path, method: "patch") do |f|
= f.submit = f.text_field :display_name, label: "Your name"
= f.submit "Save settings", class: 'btn btn-primary'