Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Instance helper to replace site title helper (#2038)

Browse source 
* 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
This commit is contained in:
Matt Jankowski 2017-04-17 18:16:32 -04:00 • committed by Eugen
parent e1e15adf1d
commit 389f8f8249
19 changed files with 64 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/api/oembed/show.json.rabl
View file

@ -6,7 +6,7 @@ node(:version) { '1.0' }
node(:title, &:title)
node(:author_name) { |entry| entry.account.display_name.blank? ? entry.account.username : entry.account.display_name }
node(:author_url) { |entry| account_url(entry.account) }
node(:provider_name) { Rails.configuration.x.local_domain }
node(:provider_name) { site_hostname }
node(:provider_url) { root_url }
node(:cache_age) { 86_400 }
node(:html) { |entry| "<iframe src=\"#{embed_account_stream_entry_url(entry.account, entry)}\" style=\"width: 100%; overflow: hidden\" frameborder=\"0\" width=\"#{@width}\" height=\"#{@height}\" scrolling=\"no\"></iframe>" }

2
app/views/api/v1/instances/show.rabl
View file

@ -1,6 +1,6 @@
object false
node(:uri) { Rails.configuration.x.local_domain }
node(:uri) { site_hostname }
node(:title) { Setting.site_title }
node(:description) { Setting.site_description }
node(:email) { Setting.site_contact_email }