mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Use local vars in partials (#1935)
* Use local vars in accounts/header partial * Use local variable in 2fa recovery codes partial
This commit is contained in:
parent
90760eae4c
commit
7efde22c3a
@ -1,34 +1,34 @@
|
|||||||
.card.h-card.p-author{ style: "background-image: url(#{@account.header.url( :original)})" }
|
.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)
|
- if user_signed_in? && current_account.id != account.id && !current_account.requested?(account)
|
||||||
.controls
|
.controls
|
||||||
- if current_account.following?(@account)
|
- if current_account.following?(account)
|
||||||
= link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button'
|
= link_to t('accounts.unfollow'), unfollow_account_path(account), data: { method: :post }, class: 'button'
|
||||||
- else
|
- 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?
|
- elsif !user_signed_in?
|
||||||
.controls
|
.controls
|
||||||
.remote-follow
|
.remote-follow
|
||||||
= link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button'
|
= link_to t('accounts.remote_follow'), account_remote_follow_path(account), class: 'button'
|
||||||
.avatar= image_tag @account.avatar.url(:original), class: 'u-photo'
|
.avatar= image_tag account.avatar.url(:original), class: 'u-photo'
|
||||||
%h1.name
|
%h1.name
|
||||||
%span.p-name.emojify= display_name(@account)
|
%span.p-name.emojify= display_name(account)
|
||||||
%small
|
%small
|
||||||
%span= "@#{@account.username}"
|
%span= "@#{account.username}"
|
||||||
= fa_icon('lock') if @account.locked?
|
= fa_icon('lock') if account.locked?
|
||||||
.details
|
.details
|
||||||
.bio
|
.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
|
.details-counters
|
||||||
.counter{ class: active_nav_class(short_account_url(@account)) }
|
.counter{ class: active_nav_class(short_account_url(account)) }
|
||||||
= link_to short_account_url(@account), class: 'u-url u-uid' do
|
= link_to short_account_url(account), class: 'u-url u-uid' do
|
||||||
%span.counter-label= t('accounts.posts')
|
%span.counter-label= t('accounts.posts')
|
||||||
%span.counter-number= number_with_delimiter @account.statuses_count
|
%span.counter-number= number_with_delimiter account.statuses_count
|
||||||
.counter{ class: active_nav_class(following_account_url(@account)) }
|
.counter{ class: active_nav_class(following_account_url(account)) }
|
||||||
= link_to following_account_url(@account) do
|
= link_to following_account_url(account) do
|
||||||
%span.counter-label= t('accounts.following')
|
%span.counter-label= t('accounts.following')
|
||||||
%span.counter-number= number_with_delimiter @account.following_count
|
%span.counter-number= number_with_delimiter account.following_count
|
||||||
.counter{ class: active_nav_class(followers_account_url(@account)) }
|
.counter{ class: active_nav_class(followers_account_url(account)) }
|
||||||
= link_to followers_account_url(@account) do
|
= link_to followers_account_url(account) do
|
||||||
%span.counter-label= t('accounts.followers')
|
%span.counter-label= t('accounts.followers')
|
||||||
%span.counter-number= number_with_delimiter @account.followers_count
|
%span.counter-number= number_with_delimiter account.followers_count
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
= t('accounts.people_who_follow', name: display_name(@account))
|
= t('accounts.people_who_follow', name: display_name(@account))
|
||||||
|
|
||||||
= render partial: 'header'
|
= render 'header', account: @account
|
||||||
|
|
||||||
.accounts-grid
|
.accounts-grid
|
||||||
- if @followers.empty?
|
- if @followers.empty?
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
= t('accounts.people_followed_by', name: display_name(@account))
|
= t('accounts.people_followed_by', name: display_name(@account))
|
||||||
|
|
||||||
= render partial: 'header'
|
= render 'header', account: @account
|
||||||
|
|
||||||
.accounts-grid
|
.accounts-grid
|
||||||
- if @following.empty?
|
- if @following.empty?
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
.h-feed
|
.h-feed
|
||||||
%data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
|
%data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
|
||||||
|
|
||||||
= render partial: 'header'
|
= render 'header', account: @account
|
||||||
|
|
||||||
- if @statuses.empty?
|
- if @statuses.empty?
|
||||||
.accounts-grid
|
.accounts-grid
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
%p.hint= t('two_factor_auth.recovery_instructions')
|
%p.hint= t('two_factor_auth.recovery_instructions')
|
||||||
|
|
||||||
%ol.recovery-codes
|
%ol.recovery-codes
|
||||||
- @codes.each do |code|
|
- recovery_codes.each do |code|
|
||||||
%li
|
%li
|
||||||
%samp= code
|
%samp= code
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
= t('settings.two_factor_auth')
|
= t('settings.two_factor_auth')
|
||||||
|
|
||||||
= render 'recovery_codes'
|
= render partial: 'recovery_codes', object: @codes
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
= t('settings.two_factor_auth')
|
= t('settings.two_factor_auth')
|
||||||
|
|
||||||
= render 'recovery_codes'
|
= render partial: 'recovery_codes', object: @codes
|
||||||
|
Loading…
Reference in New Issue
Block a user