Removing some unused gems, adding pagination to profiles, fix #10
This commit is contained in:
parent
d4892ace62
commit
c349200761
8 changed files with 79 additions and 11 deletions
|
@ -1,3 +1,6 @@
|
|||
- content_for :page_title do
|
||||
= display_name(@account)
|
||||
|
||||
- content_for :header_tags do
|
||||
%link{ rel: 'salmon', href: api_salmon_url(@account.id) }/
|
||||
%link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
|
||||
|
@ -5,7 +8,7 @@
|
|||
.card{ style: "background-image: url(#{@account.header.url(:medium)})" }
|
||||
.avatar= image_tag @account.avatar.url(:large)
|
||||
%h1.name
|
||||
= @account.display_name.blank? ? @account.username : @account.display_name
|
||||
= display_name(@account)
|
||||
%small= "@#{@account.username}"
|
||||
.details
|
||||
.counter
|
||||
|
@ -19,6 +22,9 @@
|
|||
%span.counter-number= @account.followers.count
|
||||
.bio
|
||||
%p= @account.note
|
||||
|
||||
.activity-stream
|
||||
- @statuses.each do |status|
|
||||
= render partial: 'stream_entries/status', locals: { status: status, include_threads: false, is_successor: false, is_predecessor: false }
|
||||
|
||||
= will_paginate @statuses, previous_label: "#{fa_icon('chevron-left')} Prev".html_safe, next_label: "Next #{fa_icon('chevron-right')}".html_safe, inner_window: 2
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
%html
|
||||
%head
|
||||
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
|
||||
%title Mastodon
|
||||
%title
|
||||
= "#{yield(:page_title)} - " if content_for?(:page_title)
|
||||
Mastodon
|
||||
= stylesheet_link_tag 'application', media: 'all'
|
||||
= javascript_include_tag 'application'
|
||||
= csrf_meta_tags
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
.dashboard__current-user
|
||||
= link_to account_path(current_user.account) do
|
||||
= image_tag current_user.account.avatar.url(:medium), class: 'dashboard__current-user__avatar'
|
||||
%strong.dashboard__current-user__display-name= current_user.account.display_name.blank? ? current_user.account.username : current_user.account.display_name
|
||||
%strong.dashboard__current-user__display-name= display_name(current_user.account)
|
||||
%span.dashboard__current-user__username= "@#{current_user.account.username}"
|
||||
%ul
|
||||
%li{ class: active_nav_class(root_path) }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue