diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-05 23:42:40 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-05 23:42:40 +0100 |
| commit | ab80ebdeecf9410c5b43dde333b2e036e1198e24 (patch) | |
| tree | 5526ec2ad37df18bb07ff830e9fc18b22457f446 /app/views | |
| parent | 6045b6cb1880b27e8b21799b9501a794a5f5b88b (diff) | |
Adjusting design of profile and entry pages, linkify mentions in statuses
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 6 | ||||
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 113db12f6..ea55b655b 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -3,7 +3,7 @@ %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/ .card - .avatar= image_tag @account.avatar.url(:medium) + .avatar= image_tag @account.avatar.url(:large) .bio %h1.name = @account.display_name.blank? ? @account.username : @account.display_name diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml new file mode 100644 index 000000000..eb3c54f9d --- /dev/null +++ b/app/views/layouts/public.html.haml @@ -0,0 +1,6 @@ +- content_for :content do + = yield + .footer + .domain= Rails.configuration.x.local_domain + += render template: "layouts/application" diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 89dd53613..a11da83a6 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -22,7 +22,7 @@ = relative_time(status.reblog? ? status.reblog.created_at : status.created_at) .content - = status.content.html_safe + = status.reblog? ? (status.reblog.local? ? linkify(status.reblog) : status.reblog.content.html_safe) : (status.local? ? linkify(status) : status.content.html_safe) - if include_threads - status.replies.each do |status| |