mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-23 16:44:04 -05:00
Site title is now a setting
This commit is contained in:
parent
02cbfcfe2c
commit
d2619e0b53
@ -15,6 +15,10 @@
|
|||||||
%td= best_in_place @settings['site_contact_username'], :value, url: admin_setting_path(@settings['site_contact_username']), place_holder: 'Enter a username'
|
%td= best_in_place @settings['site_contact_username'], :value, url: admin_setting_path(@settings['site_contact_username']), place_holder: 'Enter a username'
|
||||||
%tr
|
%tr
|
||||||
%td= best_in_place @settings['site_contact_email'], :value, url: admin_setting_path(@settings['site_contact_email']), place_holder: 'Enter a public e-mail address'
|
%td= best_in_place @settings['site_contact_email'], :value, url: admin_setting_path(@settings['site_contact_email']), place_holder: 'Enter a public e-mail address'
|
||||||
|
%tr
|
||||||
|
%td
|
||||||
|
%strong Site title
|
||||||
|
%td= best_in_place @settings['site_title'], :value, url: admin_setting_path(@settings['site_title'])
|
||||||
%tr
|
%tr
|
||||||
%td
|
%td
|
||||||
%strong Site description
|
%strong Site description
|
||||||
@ -33,4 +37,4 @@
|
|||||||
Displayed on extended information page
|
Displayed on extended information page
|
||||||
%br/
|
%br/
|
||||||
You can use HTML tags
|
You can use HTML tags
|
||||||
%td= best_in_place @settings['site_extended_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_extended_description'])
|
%td= best_in_place @settings['site_extended_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_extended_description'])
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
%title
|
%title
|
||||||
= "#{yield(:page_title)} - " if content_for?(:page_title)
|
= "#{yield(:page_title)} - " if content_for?(:page_title)
|
||||||
Mastodon
|
= Setting.site_title
|
||||||
|
|
||||||
= stylesheet_link_tag 'application', media: 'all'
|
= stylesheet_link_tag 'application', media: 'all'
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
|
@ -10,7 +10,7 @@ en:
|
|||||||
get_started: Get started
|
get_started: Get started
|
||||||
learn_more: Learn more
|
learn_more: Learn more
|
||||||
links: Links
|
links: Links
|
||||||
other_instances: Other Instances
|
other_instances: Other instances
|
||||||
source_code: Source code
|
source_code: Source code
|
||||||
status_count_after: statuses
|
status_count_after: statuses
|
||||||
status_count_before: Who authored
|
status_count_before: Who authored
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
# config/app.yml for rails-settings-cached
|
# config/app.yml for rails-settings-cached
|
||||||
defaults: &defaults
|
defaults: &defaults
|
||||||
|
site_title: 'Mastodon'
|
||||||
site_description: ''
|
site_description: ''
|
||||||
site_extended_description: ''
|
site_extended_description: ''
|
||||||
site_contact_username: ''
|
site_contact_username: ''
|
||||||
|
Loading…
Reference in New Issue
Block a user