diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-17 18:16:32 -0400 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-18 00:16:32 +0200 |
| commit | 389f8f824909d60b7560248465416bd4bed92b6b (patch) | |
| tree | 182b37bee6b43d9da4c2b498448aa37eaec4eced /app/views/layouts | |
| parent | e1e15adf1d994dda0fa868bcdd55cb8603d6f1ef (diff) | |
Instance helper to replace site title helper (#2038)
* Move site title helper to instance helper (name change only) * Remove newline in <title> tag * Add site_hostname helper method to wrap up local_domain value * Use site_hostname helper in places that need local_domain value
Diffstat (limited to 'app/views/layouts')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/mailer.text.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index fa5811fd8..688deaebd 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,7 +14,7 @@ %title< - if content_for?(:page_title) - = yield(:page_title) + = yield(:page_title).strip = ' - ' = site_title diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb index 21bf444c3..cdb284de8 100644 --- a/app/views/layouts/mailer.text.erb +++ b/app/views/layouts/mailer.text.erb @@ -1,5 +1,5 @@ <%= yield %> --- -<%= t('application_mailer.signature', instance: Rails.configuration.x.local_domain) %> +<%= t('application_mailer.signature', instance: site_hostname) %> <%= t('application_mailer.settings', link: settings_preferences_url) %> diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index fdde0a681..556102f53 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -4,7 +4,7 @@ - content_for :content do .container= yield .footer - %span.domain= link_to Rails.configuration.x.local_domain, root_path + %span.domain= link_to site_hostname, root_path %span.powered-by = t('generic.powered_by', link: link_to('Mastodon', 'https://github.com/tootsuite/mastodon')).html_safe |