From 7efde22c3ab0464a0896abcaa8be277fd14bdee9 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sun, 16 Apr 2017 10:37:49 -0400 Subject: [PATCH] Use local vars in partials (#1935) * Use local vars in accounts/header partial * Use local variable in 2fa recovery codes partial --- app/views/accounts/_header.html.haml | 40 +++++++++---------- app/views/accounts/followers.html.haml | 2 +- app/views/accounts/following.html.haml | 2 +- app/views/accounts/show.html.haml | 2 +- .../_recovery_codes.html.haml | 2 +- .../two_factor_auths/create.html.haml | 2 +- .../two_factor_auths/recovery_codes.html.haml | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index beee96cd8d..6538885a01 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -1,34 +1,34 @@ -.card.h-card.p-author{ style: "background-image: url(#{@account.header.url( :original)})" } - - if user_signed_in? && current_account.id != @account.id && !current_account.requested?(@account) +.card.h-card.p-author{ style: "background-image: url(#{account.header.url( :original)})" } + - 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' + - if current_account.following?(account) + = link_to t('accounts.unfollow'), unfollow_account_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'), follow_account_path(account), data: { method: :post }, class: 'button' - elsif !user_signed_in? .controls .remote-follow - = link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button' - .avatar= image_tag @account.avatar.url(:original), class: 'u-photo' + = link_to t('accounts.remote_follow'), account_remote_follow_path(account), class: 'button' + .avatar= image_tag account.avatar.url(:original), class: 'u-photo' %h1.name - %span.p-name.emojify= display_name(@account) + %span.p-name.emojify= display_name(account) %small - %span= "@#{@account.username}" - = fa_icon('lock') if @account.locked? + %span= "@#{account.username}" + = fa_icon('lock') if account.locked? .details .bio - .account__header__content.p-note.emojify= Formatter.instance.simplified_format(@account) + .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account) .details-counters - .counter{ class: active_nav_class(short_account_url(@account)) } - = link_to short_account_url(@account), class: 'u-url u-uid' do + .counter{ class: active_nav_class(short_account_url(account)) } + = 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 + %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 %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 + %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 %span.counter-label= t('accounts.followers') - %span.counter-number= number_with_delimiter @account.followers_count + %span.counter-number= number_with_delimiter account.followers_count diff --git a/app/views/accounts/followers.html.haml b/app/views/accounts/followers.html.haml index fa5071f383..4b53aef0cc 100644 --- a/app/views/accounts/followers.html.haml +++ b/app/views/accounts/followers.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('accounts.people_who_follow', name: display_name(@account)) -= render partial: 'header' += render 'header', account: @account .accounts-grid - if @followers.empty? diff --git a/app/views/accounts/following.html.haml b/app/views/accounts/following.html.haml index 987dcba1fa..4711997d9d 100644 --- a/app/views/accounts/following.html.haml +++ b/app/views/accounts/following.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('accounts.people_followed_by', name: display_name(@account)) -= render partial: 'header' += render 'header', account: @account .accounts-grid - if @following.empty? diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index fd7ff9653d..9a70fd16fe 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -20,7 +20,7 @@ .h-feed %data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ - = render partial: 'header' + = render 'header', account: @account - if @statuses.empty? .accounts-grid diff --git a/app/views/settings/two_factor_auths/_recovery_codes.html.haml b/app/views/settings/two_factor_auths/_recovery_codes.html.haml index 719a1e01ba..054588b97d 100644 --- a/app/views/settings/two_factor_auths/_recovery_codes.html.haml +++ b/app/views/settings/two_factor_auths/_recovery_codes.html.haml @@ -1,6 +1,6 @@ %p.hint= t('two_factor_auth.recovery_instructions') %ol.recovery-codes - - @codes.each do |code| + - recovery_codes.each do |code| %li %samp= code diff --git a/app/views/settings/two_factor_auths/create.html.haml b/app/views/settings/two_factor_auths/create.html.haml index 8710b6e020..138a930fd6 100644 --- a/app/views/settings/two_factor_auths/create.html.haml +++ b/app/views/settings/two_factor_auths/create.html.haml @@ -1,4 +1,4 @@ - content_for :page_title do = t('settings.two_factor_auth') -= render 'recovery_codes' += render partial: 'recovery_codes', object: @codes diff --git a/app/views/settings/two_factor_auths/recovery_codes.html.haml b/app/views/settings/two_factor_auths/recovery_codes.html.haml index 8710b6e020..138a930fd6 100644 --- a/app/views/settings/two_factor_auths/recovery_codes.html.haml +++ b/app/views/settings/two_factor_auths/recovery_codes.html.haml @@ -1,4 +1,4 @@ - content_for :page_title do = t('settings.two_factor_auth') -= render 'recovery_codes' += render partial: 'recovery_codes', object: @codes