diff options
author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
tree | 88a1715021c33add55501351dbf74950deeac481 /app/views/authorize_follow | |
parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/views/authorize_follow')
-rw-r--r-- | app/views/authorize_follow/_card.html.haml | 11 | ||||
-rw-r--r-- | app/views/authorize_follow/error.html.haml | 3 | ||||
-rw-r--r-- | app/views/authorize_follow/new.html.haml | 12 |
3 files changed, 26 insertions, 0 deletions
diff --git a/app/views/authorize_follow/_card.html.haml b/app/views/authorize_follow/_card.html.haml new file mode 100644 index 000000000..a9b02c746 --- /dev/null +++ b/app/views/authorize_follow/_card.html.haml @@ -0,0 +1,11 @@ +.account-card + .detailed-status__display-name + %div + = image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar' + + %span.display-name + %strong= display_name(account) + %span= "@#{account.acct}" + + - unless account.note.blank? + .account__header__content= Formatter.instance.simplified_format(account) diff --git a/app/views/authorize_follow/error.html.haml b/app/views/authorize_follow/error.html.haml new file mode 100644 index 000000000..88d33b68d --- /dev/null +++ b/app/views/authorize_follow/error.html.haml @@ -0,0 +1,3 @@ +.form-container + .flash-message#error_explanation + = t('authorize_follow.error') diff --git a/app/views/authorize_follow/new.html.haml b/app/views/authorize_follow/new.html.haml new file mode 100644 index 000000000..95601253e --- /dev/null +++ b/app/views/authorize_follow/new.html.haml @@ -0,0 +1,12 @@ +- content_for :page_title do + = t('authorize_follow.title', acct: @account.acct) + +.form-container + .follow-prompt + %h2= t('authorize_follow.prompt_html', self: current_account.username) + + = render partial: 'card', locals: { account: @account } + + = 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 |