Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/profiles/merge.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@

.mt-4.d-flex.justify-content-between
= link_to 'Cancel', edit_profile_path, class: 'btn btn-secondary'
= button_to 'Merge Accounts', merge_profile_path, class: 'btn btn-primary', data: {turbo_confirm: 'Are you sure you want to merge these accounts? This cannot be undone.'}
= button_to 'Merge Accounts', merge_profile_path, class: 'btn btn-primary', form: {data: {turbo: true}}, data: {turbo_confirm: 'Are you sure you want to merge these accounts? This cannot be undone.'}
2 changes: 1 addition & 1 deletion app/views/staff/speaker_email_templates/edit.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.form-group.template-actions
%button.btn.btn-sm.btn-success{type: 'submit'} Save
= link_to "Remove", event_staff_speaker_email_template_path(@event, @type_key), class: "btn btn-sm btn-danger",
data: {turbo_method: :delete, turbo_confirm: 'This template will be erased and the default template will be used instead. Proceed?'}
data: {turbo: true, turbo_method: :delete, turbo_confirm: 'This template will be erased and the default template will be used instead. Proceed?'}
= link_to "Cancel", event_staff_speaker_email_template_path(@event, @type_key), class: "btn btn-sm btn-gray"
.form-group
= f.text_area @type_key, class: 'form-control', rows: 20, placeholder: "Please enter some text", value: @text, autofocus: true
Loading