Browse Source

Add submit button to the top of preferences pages (#13068)

* Move submit button to the top of the edit page

* Duplicate save button on long form

* Fix click submit on profile spec
master
guigeekz 1 year ago
committed by GitHub
parent
commit
e31ba618d4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 9 deletions
  1. +4
    -1
      app/views/admin/settings/edit.html.haml
  2. +4
    -1
      app/views/settings/preferences/appearance/show.html.haml
  3. +4
    -4
      app/views/settings/preferences/notifications/show.html.haml
  4. +4
    -1
      app/views/settings/preferences/other/show.html.haml
  5. +4
    -1
      app/views/settings/profiles/show.html.haml
  6. +1
    -1
      spec/features/profile_spec.rb

+ 4
- 1
app/views/admin/settings/edit.html.haml View File

@ -4,7 +4,10 @@
- content_for :page_title do
= t('admin.settings.title')
= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f|
- content_for :heading_actions do
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_admin'
= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch, id: 'edit_admin' } do |f|
= render 'shared/error_messages', object: @admin_settings
.fields-group

+ 4
- 1
app/views/settings/preferences/appearance/show.html.haml View File

@ -1,7 +1,10 @@
- content_for :page_title do
= t('settings.appearance')
= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put } do |f|
- content_for :heading_actions do
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_user'
= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
.fields-row
.fields-group.fields-row__column.fields-row__column-6
= f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false

+ 4
- 4
app/views/settings/preferences/notifications/show.html.haml View File

@ -1,7 +1,10 @@
- content_for :page_title do
= t('settings.notifications')
= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put } do |f|
- content_for :heading_actions do
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_notification'
= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put, id: 'edit_notification' } do |f|
= render 'shared/error_messages', object: current_user
%h4= t 'notifications.email_events'
@ -32,6 +35,3 @@
= ff.input :must_be_follower, as: :boolean, wrapper: :with_label
= ff.input :must_be_following, as: :boolean, wrapper: :with_label
= ff.input :must_be_following_dm, as: :boolean, wrapper: :with_label
.actions
= f.button :button, t('generic.save_changes'), type: :submit

+ 4
- 1
app/views/settings/preferences/other/show.html.haml View File

@ -1,7 +1,10 @@
- content_for :page_title do
= t('settings.preferences')
= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f|
- content_for :heading_actions do
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put, id: 'edit_preferences' } do |f|
= render 'shared/error_messages', object: current_user
.fields-group

+ 4
- 1
app/views/settings/profiles/show.html.haml View File

@ -1,7 +1,10 @@
- content_for :page_title do
= t('settings.edit_profile')
= simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f|
- content_for :heading_actions do
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_profile'
= simple_form_for @account, url: settings_profile_path, html: { method: :put, id: 'edit_profile' } do |f|
= render 'shared/error_messages', object: @account
.fields-row

+ 1
- 1
spec/features/profile_spec.rb View File

@ -39,7 +39,7 @@ feature 'Profile' do
visit settings_profile_path
fill_in 'Display name', with: 'Bob'
fill_in 'Bio', with: 'Bob is silent'
click_on 'Save changes'
first('.btn[type=submit]').click
is_expected.to have_content 'Changes successfully saved!'
# View my own public profile and see the changes

Loading…
Cancel
Save