diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
| commit | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (patch) | |
| tree | e9d1366c30b94df21ec767276fbde175428399fb /app/views/remote_interaction | |
| parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
| parent | 298ee84488758fc08a0ae9233e04c9637aa2fe02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.
Diffstat (limited to 'app/views/remote_interaction')
| -rw-r--r-- | app/views/remote_interaction/new.html.haml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/views/remote_interaction/new.html.haml b/app/views/remote_interaction/new.html.haml new file mode 100644 index 000000000..7357546b6 --- /dev/null +++ b/app/views/remote_interaction/new.html.haml @@ -0,0 +1,17 @@ +.form-container + .follow-prompt + %h2= t('remote_interaction.prompt') + + .public-layout + .activity-stream.activity-stream--highlighted + = render 'stream_entries/status', status: @status + + = simple_form_for @remote_follow, as: :remote_follow, url: remote_interaction_path(@status) do |f| + = render 'shared/error_messages', object: @remote_follow + + = f.input :acct, placeholder: t('remote_follow.acct'), input_html: { autocapitalize: 'none', autocorrect: 'off' } + + .actions + = f.button :button, t('remote_interaction.proceed'), type: :submit + + %p.hint.subtle-hint= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started') |