mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-24 19:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use local vars in partials (#1935)

Browse source 
* Use local vars in accounts/header partial

* Use local variable in 2fa recovery codes partial
This commit is contained in:
Matt Jankowski 2017-04-16 10:37:49 -04:00 committed by Eugen
parent 90760eae4c
commit 7efde22c3a
7 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/views/accounts/_header.html.haml
View file

@ -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

2
app/views/accounts/followers.html.haml
View file

@ -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?

2
app/views/accounts/following.html.haml
View file

@ -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?

2
app/views/accounts/show.html.haml
View file

@ -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

2
app/views/settings/two_factor_auths/_recovery_codes.html.haml
View file

@ -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

2
app/views/settings/two_factor_auths/create.html.haml
View file

@ -1,4 +1,4 @@
- content_for :page_title do
= t('settings.two_factor_auth')
= render 'recovery_codes'
= render partial: 'recovery_codes', object: @codes

2
app/views/settings/two_factor_auths/recovery_codes.html.haml
View file

@ -1,4 +1,4 @@
- content_for :page_title do
= t('settings.two_factor_auth')
= render 'recovery_codes'
= render partial: 'recovery_codes', object: @codes