gearheads
/
mastodon
Archived
2
0
Fork 0

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
gh/stable
guigeekz 2020-03-08 16:04:03 +01:00 committed by GitHub
parent fd76955f39
commit e31ba618d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 9 deletions

View File

@ -4,7 +4,10 @@
- content_for :page_title do - content_for :page_title do
= t('admin.settings.title') = 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 = render 'shared/error_messages', object: @admin_settings
.fields-group .fields-group

View File

@ -1,7 +1,10 @@
- content_for :page_title do - content_for :page_title do
= t('settings.appearance') = 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-row
.fields-group.fields-row__column.fields-row__column-6 .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 = 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

View File

@ -1,7 +1,10 @@
- content_for :page_title do - content_for :page_title do
= t('settings.notifications') = 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 = render 'shared/error_messages', object: current_user
%h4= t 'notifications.email_events' %h4= t 'notifications.email_events'
@ -32,6 +35,3 @@
= ff.input :must_be_follower, as: :boolean, wrapper: :with_label = 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, as: :boolean, wrapper: :with_label
= ff.input :must_be_following_dm, 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

View File

@ -1,7 +1,10 @@
- content_for :page_title do - content_for :page_title do
= t('settings.preferences') = 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 = render 'shared/error_messages', object: current_user
.fields-group .fields-group

View File

@ -1,7 +1,10 @@
- content_for :page_title do - content_for :page_title do
= t('settings.edit_profile') = 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 = render 'shared/error_messages', object: @account
.fields-row .fields-row

View File

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