diff options
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/_follow_grid.html.haml | 7 | ||||
| -rw-r--r-- | app/views/accounts/_header.html.haml | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/app/views/accounts/_follow_grid.html.haml b/app/views/accounts/_follow_grid.html.haml new file mode 100644 index 000000000..322a0ebf4 --- /dev/null +++ b/app/views/accounts/_follow_grid.html.haml @@ -0,0 +1,7 @@ +.accounts-grid + - if accounts.empty? + = render partial: 'accounts/nothing_here' + - else + = render partial: 'accounts/grid_card', collection: accounts, as: :account, cached: true + += paginate accounts diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 6538885a0..ed13ab57c 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -2,9 +2,9 @@ - if user_signed_in? && current_account.id != account.id && !current_account.requested?(account) .controls - if current_account.following?(account) - = link_to t('accounts.unfollow'), unfollow_account_path(account), data: { method: :post }, class: 'button' + = link_to t('accounts.unfollow'), account_unfollow_path(account), data: { method: :post }, class: 'button' - else - = link_to t('accounts.follow'), follow_account_path(account), data: { method: :post }, class: 'button' + = link_to t('accounts.follow'), account_follow_path(account), data: { method: :post }, class: 'button' - elsif !user_signed_in? .controls .remote-follow @@ -24,11 +24,11 @@ = link_to short_account_url(account), class: 'u-url u-uid' do %span.counter-label= t('accounts.posts') %span.counter-number= number_with_delimiter account.statuses_count - .counter{ class: active_nav_class(following_account_url(account)) } - = link_to following_account_url(account) do + .counter{ class: active_nav_class(account_following_index_url(account)) } + = link_to account_following_index_url(account) do %span.counter-label= t('accounts.following') %span.counter-number= number_with_delimiter account.following_count - .counter{ class: active_nav_class(followers_account_url(account)) } - = link_to followers_account_url(account) do + .counter{ class: active_nav_class(account_followers_url(account)) } + = link_to account_followers_url(account) do %span.counter-label= t('accounts.followers') %span.counter-number= number_with_delimiter account.followers_count |