diff --git a/notifications/inc/hook_settings.inc.php b/notifications/inc/hook_settings.inc.php index f4e92e7633..8553e9df1a 100644 --- a/notifications/inc/hook_settings.inc.php +++ b/notifications/inc/hook_settings.inc.php @@ -26,7 +26,7 @@ $GLOBALS['settings'] = array( 'help' => 'Choose a notification-chain. You will be notified over the backends included in the chain.
' .'Note: If a notification-chain is marked as "disabled", your Administrator does not allow one or' .' more of the backends included in the chain and notifications falls back to "E-Mail" while notifying you.', - 'default'=> 'popup_or_email', + 'default'=> 'popup_and_email', 'xmlrpc' => True, 'admin' => False ), diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php index 957ac4d5e7..357b06aa1f 100644 --- a/preferences/inc/class.preferences_hooks.inc.php +++ b/preferences/inc/class.preferences_hooks.inc.php @@ -339,7 +339,8 @@ class preferences_hooks 'values' => egw_ckeditor_config::$font_options, 'help' => 'Automatically start with this font', 'xmlrpc' => True, - 'admin' => false + 'admin' => false, + 'default' => 'arial, helvetica, sans-serif' ), 'rte_font_unit' => array( 'type' => 'select', @@ -349,7 +350,8 @@ class preferences_hooks 'help' => 'Unit of displayed font sizes: either "px" as used eg. for web-pages or "pt" as used in text processing.', 'default'=> 'pt', 'xmlrpc' => True, - 'admin' => false + 'admin' => false, + 'default' => 'pt' ), 'rte_font_size' => array( 'type' => 'select', @@ -358,7 +360,8 @@ class preferences_hooks 'values' => egw_ckeditor_config::$font_size_options, 'help' => 'Automatically start with this font size', 'xmlrpc' => True, - 'admin' => false + 'admin' => false, + 'default' => '10' ), 'spellchecker_lang' => array( 'type' => 'select', @@ -388,7 +391,7 @@ class preferences_hooks 'help' => 'Select the theme (visualization) of the rich text editor.', 'xmlrpc' => True, 'admin' => False, - 'forced' => 'office2003', + 'forced' => 'moono', ), 'rte_features' => array( 'type' => 'select',