diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/auth/registrations/edit.html.haml | 3 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 22 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml (renamed from app/views/settings/show.html.haml) | 6 | ||||
| -rw-r--r-- | app/views/settings/shared/_links.html.haml | 7 |
4 files changed, 36 insertions, 2 deletions
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml index 9a52af35c..78f4ef5dc 100644 --- a/app/views/auth/registrations/edit.html.haml +++ b/app/views/auth/registrations/edit.html.haml @@ -10,5 +10,8 @@ = f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password' .field = f.password_field :current_password, autocomplete: "off", placeholder: 'Current password' + .actions = f.button "Save changes", type: 'submit' + +.form-footer= render "settings/shared/links" diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml new file mode 100644 index 000000000..9c73d07c5 --- /dev/null +++ b/app/views/settings/preferences/show.html.haml @@ -0,0 +1,22 @@ +- content_for :page_title do + Preferences + += form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| + = f.fields_for :notification_emails, current_user.settings(:notification_emails) do |ff| + .boolean-field + = ff.check_box :follow + = ff.label :follow, 'Send e-mail when someone follows you' + .boolean-field + = ff.check_box :reblog + = ff.label :reblog, 'Send e-mail when someone reblogs your status' + .boolean-field + = ff.check_box :favourite + = ff.label :favourite, 'Send e-mail when someone favourites your status' + .boolean-field + = ff.check_box :mention + = ff.label :mention, 'Send e-mail when someone mentions you' + + .actions + = f.button 'Save changes', type: :submit + +.form-footer= render "settings/shared/links" diff --git a/app/views/settings/show.html.haml b/app/views/settings/profiles/show.html.haml index fe4d37b55..2ff91beff 100644 --- a/app/views/settings/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do Edit profile -= form_for @account, url: settings_path, html: { method: :put } do |f| += form_for @account, url: settings_profile_path, html: { method: :put } do |f| .field = f.text_field :display_name, placeholder: 'Display name' .field @@ -14,4 +14,6 @@ = f.file_field :header .actions - = f.button 'Save changes', type: :submit + = f.button 'Save changes', type: :submit + +.form-footer= render "settings/shared/links" diff --git a/app/views/settings/shared/_links.html.haml b/app/views/settings/shared/_links.html.haml new file mode 100644 index 000000000..520300416 --- /dev/null +++ b/app/views/settings/shared/_links.html.haml @@ -0,0 +1,7 @@ +%ul.no-list + - if controller_name != 'profiles' + %li= link_to "Edit profile", settings_profile_path + - if controller_name != 'preferences' + %li= link_to "Preferences", settings_preferences_path + - if controller_name != 'registrations' + %li= link_to "Change password", edit_user_registration_path |