diff --git a/pixelegg/hook_settings.inc.php b/pixelegg/hook_settings.inc.php index 34aee53015..cb19b1555b 100644 --- a/pixelegg/hook_settings.inc.php +++ b/pixelegg/hook_settings.inc.php @@ -91,6 +91,7 @@ $GLOBALS['settings'] = array( 'xmlrpc' => True, 'admin' => False, ), + /* disabled until Pixelegg template supports it 'template_color' => array( 'type' => 'select', 'label' => 'Template color', @@ -110,7 +111,7 @@ $GLOBALS['settings'] = array( 'help' => lang('Use eg. %1 or %2','#FF0000','orange'), 'xmlrpc' => True, 'admin' => False, - ), + ),*/ 'navbar_format' => false, // not used in JDots (defined in common prefs) 'default_app' => false, // not used in JDots, as we can have multiple tabs open ... ); diff --git a/pixelegg/inc/class.pixelegg_framework.inc.php b/pixelegg/inc/class.pixelegg_framework.inc.php index a9e617f2ab..d8f624f342 100755 --- a/pixelegg/inc/class.pixelegg_framework.inc.php +++ b/pixelegg/inc/class.pixelegg_framework.inc.php @@ -57,4 +57,15 @@ class pixelegg_framework extends jdots_framework } return parent::header($extra); } + + /** + * Overwrite to NOT add customizable colors from jDots + * + * @see egw_framework::_get_css() + * @return array + */ + public function _get_css() + { + return egw_framework::_get_css(); + } }