From 3db535a5124f860992f84231783aaf08a9539d81 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Aug 2010 19:44:52 +0000 Subject: [PATCH] Enhances themes to manage toolbars. --- htdocs/theme/auguria/style.css.php | 3 ++- htdocs/theme/eldy/style.css.php | 22 +++++++++++++++++++++- htdocs/theme/freelug/style.css.php | 3 ++- htdocs/theme/yellow/style.css.php | 3 ++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 0cca470373a..46a1b484350 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -49,7 +49,8 @@ else header('Cache-Control: no-cache'); // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1. if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); } -if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If language was forced on URL by the main.inc.php +if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If language was forced on URL +if (! empty($_GET["theme"])) $conf->theme=$_GET["theme"]; // If theme was forced on URL $langs->load("main",0,1); $right=($langs->direction=='rtl'?'left':'right'); $left=($langs->direction=='rtl'?'right':'left'); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index eca05d12f1d..5260e33b741 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -49,7 +49,8 @@ else header('Cache-Control: no-cache'); // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1. if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); } -if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If language was forced on URL by the main.inc.php +if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If language was forced on URL +if (! empty($_GET["theme"])) $conf->theme=$_GET["theme"]; // If theme was forced on URL $langs->load("main",0,1); $right=($langs->direction=='rtl'?'left':'right'); $left=($langs->direction=='rtl'?'right':'left'); @@ -564,6 +565,25 @@ td.photo { } +/* ============================================================================== */ +/* Toolbar for ECM or Filemanager */ +/* ============================================================================== */ + +.toolbar { + background-image: url(theme.'/img/tmenu2.png' ?>) !important; + background-repeat: repeat-x !important; +} + +.toolbarbutton { + margin-top: 2px; + margin-left: 4px; +/* border: solid 1px #AAAAAA; + width: 34px;*/ + height: 34px; +/* background: #FFFFFF;*/ +} + + /* ============================================================================== */ /* Onglets */ diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index e3012e3a541..3290c263b62 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -48,7 +48,8 @@ else header('Cache-Control: no-cache'); // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1. if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); } -if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If language was forced on URL by the main.inc.php +if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If language was forced on URL +if (! empty($_GET["theme"])) $conf->theme=$_GET["theme"]; // If theme was forced on URL $langs->load("main",0,1); $right=($langs->direction=='rtl'?'left':'right'); $left=($langs->direction=='rtl'?'right':'left'); diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index f95b270a566..0bf1ca16de5 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -48,7 +48,8 @@ else header('Cache-Control: no-cache'); // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1. if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); } -if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If language was forced on URL by the main.inc.php +if (! empty($_GET["lang"])) $langs->setDefaultLang($_GET["lang"]); // If language was forced on URL +if (! empty($_GET["theme"])) $conf->theme=$_GET["theme"]; // If theme was forced on URL $langs->load("main",0,1); $right=($langs->direction=='rtl'?'left':'right'); $left=($langs->direction=='rtl'?'right':'left');