diff options
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 24 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 20 |
2 files changed, 17 insertions, 27 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 9c73d07c5..9fc4e91ca 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -1,22 +1,16 @@ - 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' += simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| + = render 'shared/error_messages', object: current_user + + = f.simple_fields_for :notification_emails, current_user.settings(:notification_emails) do |ff| + = ff.input :follow, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone follows you' + = ff.input :reblog, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone reblogs your status' + = ff.input :favourite, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone favourites your status' + = ff.input :mention, as: :boolean, wrapper: :with_label, label: 'Send e-mail when someone mentions you' .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/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 2ff91beff..df0cc3227 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -1,19 +1,15 @@ - content_for :page_title do Edit profile -= form_for @account, url: settings_profile_path, html: { method: :put } do |f| - .field - = f.text_field :display_name, placeholder: 'Display name' - .field - = f.text_area :note, placeholder: 'Bio' - .file-field - = f.label :avatar - = f.file_field :avatar - .file-field - = f.label :header - = f.file_field :header += simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f| + = render 'shared/error_messages', object: @account + + = f.input :display_name, placeholder: 'Display name' + = f.input :note, placeholder: 'Bio' + = f.input :avatar, wrapper: :with_label + = f.input :header, wrapper: :with_label .actions - = f.button 'Save changes', type: :submit + = f.button :button, 'Save changes', type: :submit .form-footer= render "settings/shared/links" |