diff --git a/app/views/admin/configs/_tab_others.html.haml b/app/views/admin/configs/_tab_others.html.haml index 69bb2867..4af9c333 100644 --- a/app/views/admin/configs/_tab_others.html.haml +++ b/app/views/admin/configs/_tab_others.html.haml @@ -3,3 +3,4 @@ = config_input form, :use_nick, as: :boolean = config_input form, :tolerance_is_costly, as: :boolean = config_input form, :help_url, as: :url, input_html: {class: 'input-xlarge'} += config_input form, :webstats_tracking_code, as: :text, input_html: {class: 'input-xxlarge', rows: 3} diff --git a/config/app_config.yml.SAMPLE b/config/app_config.yml.SAMPLE index 46308a02..12a8f69e 100644 --- a/config/app_config.yml.SAMPLE +++ b/config/app_config.yml.SAMPLE @@ -91,9 +91,14 @@ default: &defaults # Page footer (html allowed). Default is a Foodsoft footer. Set to `blank` for no footer. #page_footer: FC Test is supported by Hoster. - # Custom css for the foodcoop + # Custom CSS for the foodcoop #custom_css: 'body { background-color: #fcffba; }' + # Uncomment to add tracking code for web statistics, e.g. for Piwik. (Added to bottom of page) + #webstats_tracking_code: | + # + # ...... + # email address to be used as sender email_sender: foodsoft@foodcoop.test @@ -123,11 +128,6 @@ default: &defaults encoding: utf8 socket: /opt/lampp/var/mysql/mysql.sock - # Uncomment to add tracking code for web statistics, e.g. piwik - #webstats_tracking_code: | - # - # ...... - development: <<: *defaults diff --git a/config/locales/en.yml b/config/locales/en.yml index c3c7e01c..5092f259 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -468,6 +468,7 @@ en: use_messages: Allow members to communicate with each other within Foodsoft. use_nick: Show and use nicknames instead of real names. When enabling this, please check that each user has a nickname. use_wiki: Enable editable wiki pages. + webstats_tracking_code: Tracking code for web analytics (like Piwik or Google analytics). Leave empty for no tracking. keys: applepear_url: Apple system help URL contact: @@ -504,6 +505,7 @@ en: use_messages: Enable messages use_nick: Use nicknames use_wiki: Enable wiki + webstats_tracking_code: Tracking code tabs: foodcoop: Foodcoop language: Language