diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php
index 9a8859d9..7e9dbb40 100644
--- a/actions/admin/settings/100.panel.php
+++ b/actions/admin/settings/100.panel.php
@@ -194,6 +194,14 @@ return array(
'default' => false,
'save_method' => 'storeSettingField',
),
+ 'admin_show_news_feed' => array(
+ 'label' => $lng['admin']['show_news_feed'],
+ 'settinggroup' => 'admin',
+ 'varname' => 'show_news_feed',
+ 'type' => 'bool',
+ 'default' => false,
+ 'save_method' => 'storeSettingField',
+ ),
'panel_allow_domain_change_admin' => array(
'label' => $lng['serversettings']['panel_allow_domain_change_admin'],
'settinggroup' => 'panel',
diff --git a/install/froxlor.sql b/install/froxlor.sql
index ee12dd34..b80c508f 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -376,6 +376,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('dkim', 'dkimrestart_command', '/etc/init.d/dkim-filter restart'),
('autoresponder', 'autoresponder_active', '0'),
('autoresponder', 'last_autoresponder_run', '0'),
+ ('admin', 'show_news_feed', '1'),
('admin', 'show_version_login', '0'),
('admin', 'show_version_footer', '0'),
('aps', 'items_per_page', '20'),
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index 567106a9..89d403c4 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -2519,3 +2519,17 @@ if (isFroxlorVersion('0.9.31-dev6')) {
lastStepStatus(0);
updateToVersion('0.9.31-rc1');
}
+
+if (isFroxlorVersion('0.9.31-rc1')) {
+ showUpdateStep("Updating from 0.9.31-rc1 to 0.9.31-rc2");
+ lastStepStatus(0);
+
+ $update_admin_news_feed = isset($_POST['update_admin_news_feed']) ? (int)$_POST['update_admin_news_feed'] : '1';
+ showUpdateStep("Adding new news-feed option");
+ $ins_stmt = Database::prepare("
+ INSERT INTO `".TABLE_PANEL_SETTINGS."` SET `settinggroup` = 'admin', `varname` = 'show_news_feed', `value` = :value
+ ");
+ Database::pexecute($ins_stmt, array('value' => $update_admin_news_feed));
+
+ updateToVersion('0.9.31-rc2');
+}
diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
index 6d9d3221..cf59e47c 100644
--- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php
+++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
@@ -601,4 +601,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
$question.= makeyesno('update_error_report_customer', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
+
+ if (versionInUpdate($current_version, '0.9.31-rc2')) {
+ $has_preconfig = true;
+ $description = 'You can enable/disable the display/usage of the news-feed for admins
';
+ $question = 'Do you want to enable the news-feed for admins? (default: yes): ';
+ $question.= makeyesno('update_admin_news_feed', '1', '0', '1').'
';
+ eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+ }
+
}
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 372f06b3..1c986c5b 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -2001,3 +2001,4 @@ $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';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 61e64fd6..1f04bebf 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1727,3 +1727,4 @@ $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 News-Feed im Admin-Dashboard';
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl
index 36e0e4ff..2bb5453c 100644
--- a/templates/Sparkle/admin/index/index.tpl
+++ b/templates/Sparkle/admin/index/index.tpl
@@ -195,7 +195,8 @@ $header
-
+
+
@@ -204,7 +205,8 @@ $header
-
+
+