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_follows | |
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_follows')
-rw-r--r-- | app/views/authorize_follows/_post_follow_actions.html.haml | 4 | ||||
-rw-r--r-- | app/views/authorize_follows/error.html.haml | 3 | ||||
-rw-r--r-- | app/views/authorize_follows/show.html.haml | 17 | ||||
-rw-r--r-- | app/views/authorize_follows/success.html.haml | 13 |
4 files changed, 0 insertions, 37 deletions
diff --git a/app/views/authorize_follows/_post_follow_actions.html.haml b/app/views/authorize_follows/_post_follow_actions.html.haml deleted file mode 100644 index 2a9c062e9..000000000 --- a/app/views/authorize_follows/_post_follow_actions.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -.post-follow-actions - %div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block' - %div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block' - %div= t('authorize_follow.post_follow.close') diff --git a/app/views/authorize_follows/error.html.haml b/app/views/authorize_follows/error.html.haml deleted file mode 100644 index 88d33b68d..000000000 --- a/app/views/authorize_follows/error.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.form-container - .flash-message#error_explanation - = t('authorize_follow.error') diff --git a/app/views/authorize_follows/show.html.haml b/app/views/authorize_follows/show.html.haml deleted file mode 100644 index 90e65b34f..000000000 --- a/app/views/authorize_follows/show.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -- content_for :page_title do - = t('authorize_follow.title', acct: @account.acct) - -.form-container - .follow-prompt - = render 'application/card', account: @account - - - if current_account.following?(@account) - .flash-message - %strong - = t('authorize_follow.already_following') - = render 'post_follow_actions' - - - else - = form_tag authorize_follow_path, method: :post, class: 'simple_form' do - = hidden_field_tag :acct, @account.acct - = button_tag t('authorize_follow.follow'), type: :submit diff --git a/app/views/authorize_follows/success.html.haml b/app/views/authorize_follows/success.html.haml deleted file mode 100644 index cf9cb50ea..000000000 --- a/app/views/authorize_follows/success.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -- content_for :page_title do - = t('authorize_follow.title', acct: @account.acct) - -.form-container - .follow-prompt - - if @account.locked? - %h2= t('authorize_follow.follow_request') - - else - %h2= t('authorize_follow.following') - - = render 'application/card', account: @account - - = render 'post_follow_actions' |