diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-18 03:03:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 03:03:12 +0200 |
| commit | 78fa926ed560e6a9738144bec7e152fa42104139 (patch) | |
| tree | 77470dc0c731cf32e298a32d618d65f5dc5b3820 /app/views/authorize_interactions | |
| parent | bf1bde5d6a8306284a0cce89eb8f492b8c9b7a67 (diff) | |
Add remote interaction dialog for toots (#8202)
* Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests
Diffstat (limited to 'app/views/authorize_interactions')
4 files changed, 38 insertions, 0 deletions
diff --git a/app/views/authorize_interactions/_post_follow_actions.html.haml b/app/views/authorize_interactions/_post_follow_actions.html.haml new file mode 100644 index 000000000..561c60137 --- /dev/null +++ b/app/views/authorize_interactions/_post_follow_actions.html.haml @@ -0,0 +1,4 @@ +.post-follow-actions + %div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@resource.id}"), class: 'button button--block' + %div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@resource), class: 'button button--block' + %div= t('authorize_follow.post_follow.close') diff --git a/app/views/authorize_interactions/error.html.haml b/app/views/authorize_interactions/error.html.haml new file mode 100644 index 000000000..88d33b68d --- /dev/null +++ b/app/views/authorize_interactions/error.html.haml @@ -0,0 +1,3 @@ +.form-container + .flash-message#error_explanation + = t('authorize_follow.error') diff --git a/app/views/authorize_interactions/show.html.haml b/app/views/authorize_interactions/show.html.haml new file mode 100644 index 000000000..7ca9b98c1 --- /dev/null +++ b/app/views/authorize_interactions/show.html.haml @@ -0,0 +1,18 @@ +- content_for :page_title do + = t('authorize_follow.title', acct: @resource.acct) + +.form-container + .follow-prompt + = render 'application/card', account: @resource + + - if current_account.following?(@resource) + .flash-message + %strong + = t('authorize_follow.already_following') + + = render 'post_follow_actions' + - else + = form_tag authorize_interaction_path, method: :post, class: 'simple_form' do + = hidden_field_tag :action, :follow + = hidden_field_tag :acct, @resource.acct + = button_tag t('authorize_follow.follow'), type: :submit diff --git a/app/views/authorize_interactions/success.html.haml b/app/views/authorize_interactions/success.html.haml new file mode 100644 index 000000000..47fd09767 --- /dev/null +++ b/app/views/authorize_interactions/success.html.haml @@ -0,0 +1,13 @@ +- content_for :page_title do + = t('authorize_follow.title', acct: @resource.acct) + +.form-container + .follow-prompt + - if @resource.locked? + %h2= t('authorize_follow.follow_request') + - else + %h2= t('authorize_follow.following') + + = render 'application/card', account: @resource + + = render 'post_follow_actions' |