diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-25 01:41:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 01:41:18 +0200 |
| commit | 9caa90025fd9f1ef46a74f31cefd19335e291e76 (patch) | |
| tree | 51d91a2c713bcddc9d21cd63836db3ae4bc3d226 /app/views | |
| parent | c5157ef07bbae5c3a307d6a005aef0f1c0452af3 (diff) | |
Pinned statuses (#4675)
* Pinned statuses * yarn manage:translations
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index ec44f4c74..e0f9f869a 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -30,6 +30,9 @@ = render 'nothing_here' - else .activity-stream.with-header + - if params[:page].to_i.zero? + = render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true } + = render partial: 'stream_entries/status', collection: @statuses, as: :status - if @statuses.size == 20 diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 50a373743..e2e1fdd12 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -1,4 +1,5 @@ :ruby + pinned ||= false include_threads ||= false is_predecessor ||= false is_successor ||= false @@ -25,6 +26,12 @@ = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do %strong.emojify= display_name(status.account) = t('stream_entries.reblogged') + - elsif pinned + .pre-header + .pre-header__icon + = fa_icon('thumb-tack fw') + %span + = t('stream_entries.pinned') = render (centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status'), status: status.proper |