From 29b8092c48b96b098083d3f74fd740b65277f0b7 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 16 Nov 2010 23:29:26 -0700 Subject: [PATCH] Move CSS code out of Horde_Themes and into Horde_Themes_CSS --- ansel/lib/Ansel.php | 2 +- framework/Core/lib/Horde.php | 4 +- .../Horde/Core/Mime/Viewer/Syntaxhighlighter.php | 5 +- framework/Core/lib/Horde/Themes.php | 269 ------------------- framework/Core/lib/Horde/Themes/Css.php | 286 +++++++++++++++++++++ framework/Core/package.xml | 2 + horde/services/portal/index.php | 5 +- imp/view.php | 3 +- jonah/lib/View/StoryView.php | 5 +- mnemo/templates/common-header.inc | 2 +- nag/templates/common-header.inc | 2 +- trean/templates/common-header.inc | 2 +- 12 files changed, 305 insertions(+), 282 deletions(-) create mode 100644 framework/Core/lib/Horde/Themes/Css.php diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php index ffede222e..68ac64625 100644 --- a/ansel/lib/Ansel.php +++ b/ansel/lib/Ansel.php @@ -770,7 +770,7 @@ class Ansel /* Use Horde's stylesheet code if we aren't ouputting css directly */ if (!$custom_only) { foreach ($css as $f => $u) { - Horde_Themes::addStylesheet($f, $u); + $GLOBALS['injector']->getInstance('Horde_Themes_Css')->addStylesheet($f, $u); } Horde::includeStylesheetFiles(); diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php index 79242f11e..274d7c319 100644 --- a/framework/Core/lib/Horde.php +++ b/framework/Core/lib/Horde.php @@ -1428,11 +1428,11 @@ HTML; * Generate the stylesheet tags for the current application. * * @param array $opts Options to pass to - * Horde_Themes::getStylesheetUrls(). + * Horde_Themes_Css::getStylesheetUrls(). */ static public function includeStylesheetFiles(array $opts = array()) { - foreach (Horde_Themes::getStylesheetUrls($opts) as $val) { + foreach ($GLOBALS['injector']->getInstance('Horde_Themes_Css')->getStylesheetUrls($opts) as $val) { echo ''; } } diff --git a/framework/Core/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php b/framework/Core/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php index cfae08763..43487e7e5 100644 --- a/framework/Core/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php +++ b/framework/Core/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php @@ -41,8 +41,9 @@ class Horde_Core_Mime_Viewer_Syntaxhighlighter extends Horde_Mime_Viewer_Syntaxh $sh_js_fs = $this->getConfigParam('registry')->get('jsfs', 'horde') . '/syntaxhighlighter/styles/'; $sh_js_uri = Horde::url($this->getConfigParam('registry')->get('jsuri', 'horde'), false, -1) . '/syntaxhighlighter/styles/'; - Horde_Themes::addStylesheet($sh_js_fs . 'shCoreEclipse.css', $sh_js_uri . 'shCoreEclipse.css'); - Horde_Themes::addStylesheet($sh_js_fs . 'shThemeEclipse.css', $sh_js_uri . 'shThemeEclipse.css'); + $css = $GLOBALS['injector']->getInstance('Horde_Themes_Css'); + $css->addStylesheet($sh_js_fs . 'shCoreEclipse.css', $sh_js_uri . 'shCoreEclipse.css'); + $css->addStylesheet($sh_js_fs . 'shThemeEclipse.css', $sh_js_uri . 'shThemeEclipse.css'); } if (empty(self::$_shBrushes[$brush])) { diff --git a/framework/Core/lib/Horde/Themes.php b/framework/Core/lib/Horde/Themes.php index 3263ab91c..86021d5ee 100644 --- a/framework/Core/lib/Horde/Themes.php +++ b/framework/Core/lib/Horde/Themes.php @@ -14,275 +14,6 @@ class Horde_Themes { /** - * A list of additional stylesheet files to add to the output. - * - * @var array - */ - static protected $_cssFiles = array(); - - /** - * Adds an external stylesheet to the output. - * - * @param string $file - */ - static public function addStylesheet($file, $url) - { - self::$_cssFiles[$file] = $url; - } - - /** - * Generate the stylesheet URLs needed to display the current page. - * Honors configuration choices as to stylesheet caching. - * - * @param array $options Additional options: - * 
-     * 'nohorde' - (boolean) If true, don't load files from Horde.
-     * 'sub' - (string) A subdirectory containing additional CSS files to
-     *         load as an overlay to the base CSS files.
-     * 'subonly' - (boolean) If true, only load the files in 'sub', not
-     *             the default theme files.
-     * 'theme' - (string) Use this theme instead of the default.
-     * 'themeonly' - (boolean) If true, only load the theme files.
-     *
- * - * @return array The list of URLs to display. - */ - static public function getStylesheetUrls($options = array()) - { - global $conf, $prefs, $registry; - - $themesfs = $registry->get('themesfs'); - $themesuri = $registry->get('themesuri'); - - $css = self::getStylesheets(isset($options['theme']) ? $options['theme'] : $prefs->getValue('theme'), $options); - $css_out = array(); - - $cache_type = empty($conf['cachecss']) - ? 'none' - : $conf['cachecssparams']['driver']; - - if ($cache_type == 'none') { - $css_out = array(); - foreach ($css as $file) { - $css_out[] = $file['u']; - } - return $css_out; - } - - $mtime = array(0); - $out = ''; - - foreach ($css as $file) { - $mtime[] = filemtime($file['f']); - } - - $sig = hash('md5', serialize($css) . max($mtime)); - - switch ($cache_type) { - case 'filesystem': - $css_filename = '/static/' . $sig . '.css'; - $css_path = $registry->get('fileroot', 'horde') . $css_filename; - $css_url = $registry->get('webroot', 'horde') . $css_filename; - $exists = file_exists($css_path); - break; - - case 'horde_cache': - $cache = $GLOBALS['injector']->getInstance('Horde_Cache'); - - // Do lifetime checking here, not on cache display page. - $exists = $cache->exists($sig, empty($GLOBALS['conf']['cachecssparams']['lifetime']) ? 0 : $GLOBALS['conf']['cachecssparams']['lifetime']); - $css_url = Horde::getCacheUrl('css', array('cid' => $sig)); - break; - } - - if (!$exists) { - $out = $this->loadCssFiles($css); - - /* Use CSS tidy to clean up file. */ - if ($conf['cachecssparams']['compress'] == 'php') { - try { - $out = $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($out, 'csstidy'); - } catch (Horde_Exception $e) {} - } - - switch ($cache_type) { - case 'filesystem': - if (!file_put_contents($css_path, $out)) { - throw new Horde_Exception('Could not write cached CSS file to disk.'); - } - break; - - case 'horde_cache': - $cache->set($sig, $out); - break; - } - } - - return $css_url; - } - - /** - * Callback for getStylesheetUrls() to convert images to base64 data - * strings. - * - * @param array $matches The list of matches from preg_replace_callback. - * - * @return string The image string. - */ - static public function stylesheetCallback($matches) - { - /* Limit data to 16 KB in stylesheets. */ - return $matches[1] . Horde::base64ImgData($matches[2], 16384) . $matches[3]; - } - - /** - * Return the list of base stylesheets to display. - * - * @param mixed $theme The theme to use; specify an empty value to - * retrieve the theme from user preferences, and - * false for no theme. - * @param array $options Additional options: - * 
-     * 'app' - (string) The current application.
-     * 'nohorde' - (boolean) If true, don't load files from Horde.
-     * 'sub' - (string) A subdirectory containing additional CSS files to
-     *         load as an overlay to the base CSS files.
-     * 'subonly' - (boolean) If true, only load the files in 'sub', not
-     *             the default theme files.
-     * 'themeonly' - (boolean) If true, only load the theme files.
-     *
- * - * @return array TODO - */ - static public function getStylesheets($theme = '', $options = array()) - { - if (($theme === '') && isset($GLOBALS['prefs'])) { - $theme = $GLOBALS['prefs']->getValue('theme'); - } - - $css = array(); - - $css_list = array('screen'); - if (isset($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']])) { - $css_list[] = 'rtl'; - } - - /* Collect browser specific stylesheets if needed. */ - switch ($GLOBALS['browser']->getBrowser()) { - case 'msie': - $ie_major = $GLOBALS['browser']->getMajor(); - if ($ie_major == 8) { - $css_list[] = 'ie8'; - } elseif ($ie_major == 7) { - $css_list[] = 'ie7'; - } elseif ($ie_major < 7) { - $css_list[] = 'ie6_or_less'; - } - break; - - - case 'opera': - $css_list[] = 'opera'; - break; - - case 'mozilla': - $css_list[] = 'mozilla'; - break; - - case 'webkit': - $css_list[] = 'webkit'; - } - - $curr_app = empty($options['app']) - ? $GLOBALS['registry']->getApp() - : $options['app']; - if (empty($options['nohorde'])) { - $apps = array_unique(array('horde', $curr_app)); - } else { - $apps = ($curr_app == 'horde') ? array() : array($curr_app); - } - $sub = empty($options['sub']) ? null : $options['sub']; - - foreach ($apps as $app) { - $themes_fs = $GLOBALS['registry']->get('themesfs', $app) . '/'; - $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', $app), false, -1) . '/'; - - foreach ($css_list as $css_name) { - if (empty($options['subonly'])) { - $css[$themes_fs . $css_name . '.css'] = $themes_uri . $css_name . '.css'; - } - - if ($sub && ($app == $curr_app)) { - $css[$themes_fs . $sub . '/' . $css_name . '.css'] = $themes_uri . $sub . '/' . $css_name . '.css'; - } - - if (!empty($theme)) { - if (empty($options['subonly'])) { - $css[$themes_fs . $theme . '/' . $css_name . '.css'] = $themes_uri . $theme . '/' . $css_name . '.css'; - } - - if ($sub && ($app == $curr_app)) { - $css[$themes_fs . $theme . '/' . $sub . '/' . $css_name . '.css'] = $themes_uri . $theme . '/' . $sub . '/' . $css_name . '.css'; - } - } - } - } - - /* Add additional stylesheets added by code. */ - $css = array_merge($css, self::$_cssFiles); - - /* Add user-defined additional stylesheets. */ - try { - $css = array_merge($css, Horde::callHook('cssfiles', array($theme), 'horde')); - } catch (Horde_Exception_HookNotSet $e) {} - if ($curr_app != 'horde') { - try { - $css = array_merge($css, Horde::callHook('cssfiles', array($theme), $curr_app)); - } catch (Horde_Exception_HookNotSet $e) {} - } - - $css_out = array(); - foreach ($css as $f => $u) { - if (file_exists($f)) { - $css_out[] = array('f' => $f, 'u' => $u); - } - } - - return $css_out; - } - - /** - * Loads CSS files, cleans up the input, and concatenates to a string. - * - * @param array $files List of CSS files as returned from - * getStylesheets(). - * - * @return string CSS data. - */ - static public function loadCssFiles($files) - { - $flags = defined('FILE_IGNORE_NEW_LINES') - ? (FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) - : 0; - $out = ''; - - foreach ($files as $file) { - $path = substr($file['u'], 0, strrpos($file['u'], '/') + 1); - - // Fix relative URLs, convert graphics URLs to data URLs - // (if possible), remove multiple whitespaces, and strip - // comments. - $tmp = preg_replace(array('/(url\(["\']?)([^\/])/i', '/\s+/', '/\/\*.*?\*\//'), array('$1' . $path . '$2', ' ', ''), implode('', file($file['f'], $flags))); - if ($GLOBALS['browser']->hasFeature('dataurl')) { - $tmp = preg_replace_callback('/(background(?:-image)?:[^;}]*(?:url\(["\']?))(.*?)((?:["\']?\)))/i', array(__CLASS__, 'stylesheetCallback'), $tmp); - } - $out .= $tmp; - } - - return $out; - } - - /** * Return the path to an image, using the default image if the image does * not exist in the current theme. * diff --git a/framework/Core/lib/Horde/Themes/Css.php b/framework/Core/lib/Horde/Themes/Css.php new file mode 100644 index 000000000..0e7cdc2ec --- /dev/null +++ b/framework/Core/lib/Horde/Themes/Css.php @@ -0,0 +1,286 @@ + + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Core + */ +class Horde_Themes_Css +{ + /** + * A list of additional stylesheet files to add to the output. + * + * @var array + */ + protected $_cssFiles = array(); + + /** + * Adds an external stylesheet to the output. + * + * @param string $file + */ + public function addStylesheet($file, $url) + { + $this->_cssFiles[$file] = $url; + } + + /** + * Generate the stylesheet URLs needed to display the current page. + * Honors configuration choices as to stylesheet caching. + * + * @param array $options Additional options: + * 
+     * 'nohorde' - (boolean) If true, don't load files from Horde.
+     * 'sub' - (string) A subdirectory containing additional CSS files to
+     *         load as an overlay to the base CSS files.
+     * 'subonly' - (boolean) If true, only load the files in 'sub', not
+     *             the default theme files.
+     * 'theme' - (string) Use this theme instead of the default.
+     * 'themeonly' - (boolean) If true, only load the theme files.
+     *
+ * + * @return array The list of URLs to display. + */ + public function getStylesheetUrls($options = array()) + { + global $conf, $injector, $prefs, $registry; + + $themesfs = $registry->get('themesfs'); + $themesuri = $registry->get('themesuri'); + + $css = $this->getStylesheets(isset($options['theme']) ? $options['theme'] : $prefs->getValue('theme'), $options); + $css_out = array(); + + $cache_type = empty($conf['cachecss']) + ? 'none' + : $conf['cachecssparams']['driver']; + + if ($cache_type == 'none') { + $css_out = array(); + foreach ($css as $file) { + $css_out[] = $file['u']; + } + return $css_out; + } + + $mtime = array(0); + $out = ''; + + foreach ($css as $file) { + $mtime[] = filemtime($file['f']); + } + + $sig = hash('md5', serialize($css) . max($mtime)); + + switch ($cache_type) { + case 'filesystem': + $css_filename = '/static/' . $sig . '.css'; + $css_path = $registry->get('fileroot', 'horde') . $css_filename; + $css_url = $registry->get('webroot', 'horde') . $css_filename; + $exists = file_exists($css_path); + break; + + case 'horde_cache': + $cache = $injector->getInstance('Horde_Cache'); + + // Do lifetime checking here, not on cache display page. + $exists = $cache->exists($sig, empty($conf['cachecssparams']['lifetime']) ? 0 : $conf['cachecssparams']['lifetime']); + $css_url = Horde::getCacheUrl('css', array('cid' => $sig)); + break; + } + + if (!$exists) { + $out = $this->loadCssFiles($css); + + /* Use CSS tidy to clean up file. */ + if ($conf['cachecssparams']['compress'] == 'php') { + try { + $out = $injector->getInstance('Horde_Core_Factory_TextFilter')->filter($out, 'csstidy'); + } catch (Horde_Exception $e) {} + } + + switch ($cache_type) { + case 'filesystem': + if (!file_put_contents($css_path, $out)) { + throw new Horde_Exception('Could not write cached CSS file to disk.'); + } + break; + + case 'horde_cache': + $cache->set($sig, $out); + break; + } + } + + return $css_url; + } + + /** + * Return the list of base stylesheets to display. + * + * @param mixed $theme The theme to use; specify an empty value to + * retrieve the theme from user preferences, and + * false for no theme. + * @param array $options Additional options: + * 
+     * 'app' - (string) The current application.
+     * 'nohorde' - (boolean) If true, don't load files from Horde.
+     * 'sub' - (string) A subdirectory containing additional CSS files to
+     *         load as an overlay to the base CSS files.
+     * 'subonly' - (boolean) If true, only load the files in 'sub', not
+     *             the default theme files.
+     * 'themeonly' - (boolean) If true, only load the theme files.
+     *
+ * + * @return array TODO + */ + public function getStylesheets($theme = '', $options = array()) + { + if (($theme === '') && isset($GLOBALS['prefs'])) { + $theme = $GLOBALS['prefs']->getValue('theme'); + } + + $css = array(); + + $css_list = array('screen'); + if (isset($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']])) { + $css_list[] = 'rtl'; + } + + /* Collect browser specific stylesheets if needed. */ + switch ($GLOBALS['browser']->getBrowser()) { + case 'msie': + $ie_major = $GLOBALS['browser']->getMajor(); + if ($ie_major == 8) { + $css_list[] = 'ie8'; + } elseif ($ie_major == 7) { + $css_list[] = 'ie7'; + } elseif ($ie_major < 7) { + $css_list[] = 'ie6_or_less'; + } + break; + + + case 'opera': + $css_list[] = 'opera'; + break; + + case 'mozilla': + $css_list[] = 'mozilla'; + break; + + case 'webkit': + $css_list[] = 'webkit'; + } + + $curr_app = empty($options['app']) + ? $GLOBALS['registry']->getApp() + : $options['app']; + if (empty($options['nohorde'])) { + $apps = array_unique(array('horde', $curr_app)); + } else { + $apps = ($curr_app == 'horde') ? array() : array($curr_app); + } + $sub = empty($options['sub']) ? null : $options['sub']; + + foreach ($apps as $app) { + $themes_fs = $GLOBALS['registry']->get('themesfs', $app) . '/'; + $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', $app), false, -1) . '/'; + + foreach ($css_list as $css_name) { + if (empty($options['subonly'])) { + $css[$themes_fs . $css_name . '.css'] = $themes_uri . $css_name . '.css'; + } + + if ($sub && ($app == $curr_app)) { + $css[$themes_fs . $sub . '/' . $css_name . '.css'] = $themes_uri . $sub . '/' . $css_name . '.css'; + } + + if (!empty($theme)) { + if (empty($options['subonly'])) { + $css[$themes_fs . $theme . '/' . $css_name . '.css'] = $themes_uri . $theme . '/' . $css_name . '.css'; + } + + if ($sub && ($app == $curr_app)) { + $css[$themes_fs . $theme . '/' . $sub . '/' . $css_name . '.css'] = $themes_uri . $theme . '/' . $sub . '/' . $css_name . '.css'; + } + } + } + } + + /* Add additional stylesheets added by code. */ + $css = array_merge($css, $this->_cssFiles); + + /* Add user-defined additional stylesheets. */ + try { + $css = array_merge($css, Horde::callHook('cssfiles', array($theme), 'horde')); + } catch (Horde_Exception_HookNotSet $e) {} + if ($curr_app != 'horde') { + try { + $css = array_merge($css, Horde::callHook('cssfiles', array($theme), $curr_app)); + } catch (Horde_Exception_HookNotSet $e) {} + } + + $css_out = array(); + foreach ($css as $f => $u) { + if (file_exists($f)) { + $css_out[] = array('f' => $f, 'u' => $u); + } + } + + return $css_out; + } + + /** + * Loads CSS files, cleans up the input, and concatenates to a string. + * + * @param array $files List of CSS files as returned from + * getStylesheets(). + * + * @return string CSS data. + */ + public function loadCssFiles($files) + { + $dataurl = $GLOBALS['browser']->hasFeature('dataurl'); + $out = ''; + + foreach ($files as $file) { + $path = substr($file['u'], 0, strrpos($file['u'], '/') + 1); + + // Fix relative URLs, convert graphics URLs to data URLs + // (if possible), remove multiple whitespaces, and strip + // comments. + $tmp = preg_replace(array('/(url\(["\']?)([^\/])/i', '/\s+/', '/\/\*.*?\*\//'), array('$1' . $path . '$2', ' ', ''), implode('', file($file['f'], FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES))); + if ($dataurl) { + $tmp = preg_replace_callback('/(background(?:-image)?:[^;}]*(?:url\(["\']?))(.*?)((?:["\']?\)))/i', array($this, '_stylesheetCallback'), $tmp); + } + $out .= $tmp; + } + + return $out; + } + + /** + * Callback for loadCssFiles() to convert images to base64 data + * strings. + * + * @param array $matches The list of matches from preg_replace_callback. + * + * @return string The image string. + */ + protected function _stylesheetCallback($matches) + { + /* Limit data to 16 KB in stylesheets. */ + return $matches[1] . Horde::base64ImgData($matches[2], 16384) . $matches[3]; + } + + +} diff --git a/framework/Core/package.xml b/framework/Core/package.xml index 47c3b0b90..595694cb2 100644 --- a/framework/Core/package.xml +++ b/framework/Core/package.xml @@ -258,6 +258,7 @@ Application Framework. + @@ -827,6 +828,7 @@ Application Framework. + diff --git a/horde/services/portal/index.php b/horde/services/portal/index.php index 5fe6646dc..40b121eb1 100644 --- a/horde/services/portal/index.php +++ b/horde/services/portal/index.php @@ -51,9 +51,10 @@ $view = new Horde_Block_Layout_View( Horde::url('services/portal/index.php', true)); $layout_html = $view->toHtml(); +$css = $injector->getInstance('Horde_Themes_Css'); foreach ($view->getApplications() as $app) { - foreach (Horde_Themes::getStylesheets('', array('app' => $app)) as $f => $u) { - Horde_Themes::addStylesheet($f, $u); + foreach ($css->getStylesheets('', array('app' => $app)) as $f => $u) { + $css->addStylesheet($f, $u); } } diff --git a/imp/view.php b/imp/view.php index 83d5cf983..62354b95a 100644 --- a/imp/view.php +++ b/imp/view.php @@ -274,7 +274,8 @@ case 'print_attach': } } - if ($style = $injector->getInstance('Horde_Core_Factory_TextFilter')->filter(Horde_Themes::loadCssFiles(Horde_Themes::getStylesheets()), 'csstidy', array('ob' => true, 'preserve_css' => false))->filterBySelector($selectors)) { + $css = $injector->getInstance('Horde_Themes_Css'); + if ($style = $injector->getInstance('Horde_Core_Factory_TextFilter')->filter($css->loadCssFiles($css->getStylesheets()), 'csstidy', array('ob' => true, 'preserve_css' => false))->filterBySelector($selectors)) { $elt->setAttribute('style', ($elt->hasAttribute('style') ? rtrim($elt->getAttribute('style'), ' ;') . ';' : '') . $style); } } diff --git a/jonah/lib/View/StoryView.php b/jonah/lib/View/StoryView.php index 8ee615879..17906417b 100644 --- a/jonah/lib/View/StoryView.php +++ b/jonah/lib/View/StoryView.php @@ -66,8 +66,9 @@ EOT; $sh_js_fs = $GLOBALS['registry']->get('jsfs', 'horde') . '/syntaxhighlighter/styles/'; $sh_js_uri = Horde::url($GLOBALS['registry']->get('jsuri', 'horde'), false, -1) . '/syntaxhighlighter/styles/'; - Horde_Themes::addStylesheet($sh_js_fs . 'shCoreEclipse.css', $sh_js_uri . 'shCoreEclipse.css'); - Horde_Themes::addStylesheet($sh_js_fs . 'shThemeEclipse.css', $sh_js_uri . 'shThemeEclipse.css'); + $css = $GLOBALS['injector']->getInstance('Horde_Themes_Css'); + $css->addStylesheet($sh_js_fs . 'shCoreEclipse.css', $sh_js_uri . 'shCoreEclipse.css'); + $css->addStylesheet($sh_js_fs . 'shThemeEclipse.css', $sh_js_uri . 'shThemeEclipse.css'); $driver = $GLOBALS['injector']->getInstance('Jonah_Driver'); try { diff --git a/mnemo/templates/common-header.inc b/mnemo/templates/common-header.inc index 5e551bda2..38a167b1e 100644 --- a/mnemo/templates/common-header.inc +++ b/mnemo/templates/common-header.inc @@ -21,7 +21,7 @@ Horde::outputMetaTags(); Horde::includeScriptFiles(); Horde::includeFavicon(); -Horde_Themes::addStylesheet($registry->get('themesfs') . '/categoryCSS.php', $registry->get('themesuri') . '/categoryCSS.php'); +$injector->getInstance('Horde_Themes_Css')->addStylesheet($registry->get('themesfs') . '/categoryCSS.php', $registry->get('themesuri') . '/categoryCSS.php'); Horde::includeStylesheetFiles(); $bc = $prefs->getValue('show_panel') diff --git a/nag/templates/common-header.inc b/nag/templates/common-header.inc index e712cdf4b..c839b9a43 100644 --- a/nag/templates/common-header.inc +++ b/nag/templates/common-header.inc @@ -23,7 +23,7 @@ Horde::includeScriptFiles(); Horde::outputInlineScript(); Horde::includeFavicon(); -Horde_Themes::addStylesheet($registry->get('themesfs') . '/categoryCSS.php', $registry->get('themesuri') . '/categoryCSS.php'); +$injector->getInstance('Horde_Themes_Css')->addStylesheet($registry->get('themesfs') . '/categoryCSS.php', $registry->get('themesuri') . '/categoryCSS.php'); Horde::includeStylesheetFiles(); $bc = $prefs->getValue('show_panel') diff --git a/trean/templates/common-header.inc b/trean/templates/common-header.inc index d44effe66..af19b5f07 100644 --- a/trean/templates/common-header.inc +++ b/trean/templates/common-header.inc @@ -21,7 +21,7 @@ Horde::outputMetaTags(); Horde::includeScriptFiles(); Horde::includeFavicon(); -Horde_Themes::addStylesheet($registry->get('themesfs') . '/grids-min.css', $registry->get('themesuri') . '/grids-min.css'); +$injector->getInstance('Horde_Themes_Css')->addStylesheet($registry->get('themesfs') . '/grids-min.css', $registry->get('themesuri') . '/grids-min.css'); Horde::includeStylesheetFiles(); $rss = Horde::url('rss.php', true, -1); -- 2.11.0