diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-19 12:49:34 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-19 12:49:34 +0100 |
| commit | c349200761bdbf5beac22648da07b0768addc4d6 (patch) | |
| tree | 012519d61f5c8edd08b4ba60cec0152ca60f4d55 /app/views/layouts | |
| parent | d4892ace62cd5d73d7e4958bf98fe37244811c7f (diff) | |
Removing some unused gems, adding pagination to profiles, fix #10
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/application.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/dashboard.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 868944a21..afd29b04a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -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 diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml index 8592144d8..5640213b2 100644 --- a/app/views/layouts/dashboard.html.haml +++ b/app/views/layouts/dashboard.html.haml @@ -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) } |