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'] = '
Leave this empty to use the official froxlor newsfeed."; $lng['serversettings']['dns_createhostnameentry'] = "Create bind-zone/config for system hostname"; $lng['serversettings']['panel_password_alpha_lower']['title'] = 'Lowercase character'; $lng['serversettings']['panel_password_alpha_lower']['description'] = 'Password must contain at least one lowercase letter (a-z).'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 1f267bc8..34d8d5c6 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1487,7 +1487,9 @@ $lng['admin']['templates']['SERVER_HOSTNAME'] = 'Wird mit dem System-Hostname (U $lng['admin']['templates']['SERVER_IP'] = 'Wird mit der Standard-System-IP-Adresse ersetzt'; $lng['admin']['templates']['SERVER_PORT'] = 'Wird mit dem Standard-Port ersetzt'; $lng['admin']['templates']['DOMAINNAME'] = 'Wird mit der Standardsubdomain des Kunden ersetzt (kann leer sein, wenn keine erstellt werden soll)'; -$lng['admin']['show_news_feed'] = 'Zeige Newsfeed im Admin-Dashboard'; +$lng['admin']['show_news_feed']['title'] = 'Zeige Newsfeed im Admin-Dashboard'; +$lng['admin']['show_news_feed']['description'] = 'Aktiviere diese Option, um das offizielle Froxlor newsfeed auf deinem Dashboard anzuzeigen und verpasse keine wichtigen Informationen oder Release-Announcements.'; +$lng['panel']['newsfeed_disabled'] = 'Das Newsfeed ist deaktiviert. Klicke das Editier-Icon, um zu den Einstellungen zu gelangen.'; // Added in Froxlfor 0.9.32 $lng['logger']['reseller'] = "Reseller"; @@ -1529,8 +1531,9 @@ $lng['serversettings']['system_cron_allowautoupdate']['description'] = 'Leerlassen um das offizielle Froxlor Newsfeed zu verwenden."; $lng['serversettings']['dns_createhostnameentry'] = "Erstelle bind-Zone/Konfiguration für den System-Hostnamen"; $lng['serversettings']['panel_password_alpha_lower']['title'] = 'Kleinbuchstaben'; $lng['serversettings']['panel_password_alpha_lower']['description'] = 'Das Passwort muss mindestens einen Kleinbuchstaben (a-z) enthalten.'; diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index e541fe03..6d204111 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -182,6 +182,18 @@ $header +|
+ |