diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index a8ec8bba..63f771de 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -182,7 +182,7 @@ return array( 'settinggroup' => 'admin', 'varname' => 'show_news_feed', 'type' => 'bool', - 'default' => true, + 'default' => false, 'save_method' => 'storeSettingField', ), 'customer_show_news_feed' => array( @@ -190,7 +190,7 @@ return array( 'settinggroup' => 'customer', 'varname' => 'show_news_feed', 'type' => 'bool', - 'default' => true, + 'default' => false, 'save_method' => 'storeSettingField', ), 'customer_news_feed_url' => array( diff --git a/lng/english.lng.php b/lng/english.lng.php index 905dcb53..de7c6820 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1761,7 +1761,9 @@ $lng['admin']['templates']['SERVER_HOSTNAME'] = 'Replaces the system-hostname (U $lng['admin']['templates']['SERVER_IP'] = 'Replaces the default server ip-address'; $lng['admin']['templates']['SERVER_PORT'] = 'Replaces the default server port'; $lng['admin']['templates']['DOMAINNAME'] = 'Replaces the customers standard-subdomain (can be empty if none is generated)'; -$lng['admin']['show_news_feed'] = 'Show news-feed on admin-dashboard'; +$lng['admin']['show_news_feed']['title'] = 'Show news-feed on admin-dashboard'; +$lng['admin']['show_news_feed']['description'] = 'Enable this to show the official froxlor newsfeed on your dashboard and never miss important information or release-announcements.'; +$lng['panel']['newsfeed_disabled'] = 'The newsfeed is disabled. Click the edit icon to go to the settings.'; // Added in Froxlor 0.9.32 $lng['logger']['reseller'] = "Reseller"; @@ -1803,8 +1805,9 @@ $lng['serversettings']['system_cron_allowautoupdate']['description'] = '
+ + + + + +
+   + {$lng['panel']['newsfeed_disabled']}  + + + +