mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-03 13:33:32 -05:00
0aa69487a2
Conflicts: - `app/models/concerns/user/has_settings.rb`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `app/views/settings/preferences/appearance/show.html.haml`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `config/routes.rb`: Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had an extra route. Moved the extra route to `config/routes/web_app.rb`. - `spec/controllers/settings/preferences/appearance_controller_spec.rb`: This spec got converted to a system spec upstream. However, the theme setting works differently in glitch-soc, so the spec had been changed. Changed the corresponding system spec as well.
28 lines
937 B
Plaintext
28 lines
937 B
Plaintext
- content_for :page_title do
|
|
= t('auth.setup.title')
|
|
|
|
= flavoured_javascript_pack_tag 'sign_up', crossorigin: 'anonymous'
|
|
|
|
= simple_form_for(@user, url: auth_setup_path) do |f|
|
|
= render 'auth/shared/progress', stage: 'confirm'
|
|
|
|
%h1.title= t('auth.setup.title')
|
|
%p.lead= t('auth.setup.email_settings_hint_html', email: content_tag(:strong, @user.email))
|
|
|
|
= render 'shared/error_messages', object: @user
|
|
|
|
%details
|
|
%summary.lead
|
|
%strong= t('auth.setup.link_not_received')
|
|
|
|
%p.lead= t('auth.setup.email_below_hint_html')
|
|
|
|
.fields-group
|
|
= f.input :email,
|
|
hint: false,
|
|
input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.email') },
|
|
required: true
|
|
|
|
.actions
|
|
= f.button :button, t('auth.resend_confirmation'), type: :submit, class: 'button timer-button', disabled: true
|