diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-08 06:15:40 -0400 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-08 12:15:40 +0200 |
| commit | ca44c134554585ac4fe5dfa301f82697224ded9d (patch) | |
| tree | 2ea21342a7f5d7f0983c3287167c2d34357b67f2 /app | |
| parent | a345eb44fc502a0f255d1017313342649e8d4ee0 (diff) | |
Use Setting.site_title value for `og:site_name` occurrences (#1194)
* Add helper method to return Setting.site_title * Use site_title helper in application layout * Use site_title value for og:site_name
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/site_title_helper.rb | 7 | ||||
| -rw-r--r-- | app/views/about/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/accounts/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/show.html.haml | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/app/helpers/site_title_helper.rb b/app/helpers/site_title_helper.rb new file mode 100644 index 000000000..d2caa9203 --- /dev/null +++ b/app/helpers/site_title_helper.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module SiteTitleHelper + def site_title + Setting.site_title.to_s + end +end diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml index ebca4213a..f6b0c1668 100644 --- a/app/views/about/index.html.haml +++ b/app/views/about/index.html.haml @@ -5,7 +5,7 @@ = Rails.configuration.x.local_domain - content_for :header_tags do - %meta{ property: 'og:site_name', content: 'Mastodon' }/ + %meta{ property: 'og:site_name', content: site_title }/ %meta{ property: 'og:type', content: 'website' }/ %meta{ property: 'og:title', content: Rails.configuration.x.local_domain }/ %meta{ property: 'og:description', content: @description.blank? ? "Mastodon is a free, open-source social network server. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the social network seamlessly" : strip_tags(@description) }/ diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 3b8c67b45..e90897729 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -5,7 +5,7 @@ %link{ rel: 'salmon', href: api_salmon_url(@account.id) }/ %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/ - %meta{ property: 'og:site_name', content: 'Mastodon' }/ + %meta{ property: 'og:site_name', content: site_title }/ %meta{ property: 'og:type', content: 'profile' }/ %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ %meta{ property: 'og:description', content: @account.note }/ diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index abab14a28..e8253bd6f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -15,7 +15,7 @@ - if content_for?(:page_title) = yield(:page_title) = ' - ' - = Setting.site_title + = site_title = stylesheet_link_tag 'application', media: 'all' = csrf_meta_tags diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml index c109ff4b8..088881b11 100644 --- a/app/views/stream_entries/show.html.haml +++ b/app/views/stream_entries/show.html.haml @@ -2,7 +2,7 @@ %link{ rel: 'alternate', type: 'application/atom+xml', href: account_stream_entry_url(@account, @stream_entry, format: 'atom') }/ %link{ rel: 'alternate', type: 'application/json+oembed', href: api_oembed_url(url: account_stream_entry_url(@account, @stream_entry), format: 'json') }/ - %meta{ property: 'og:site_name', content: 'Mastodon' }/ + %meta{ property: 'og:site_name', content: site_title }/ %meta{ property: 'og:type', content: 'article' }/ %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/ |