From fa9dbfcd30dfbe7b9a45230be4a83237d60ef920 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 19 May 2012 18:17:30 +0100 Subject: [PATCH 1/2] Fixed wrong path when loading CSS files --- libraries/Theme.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 3f2df364f6..ccb1a46010 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -331,7 +331,7 @@ class PMA_Theme foreach ($this->_cssFiles as $file) { $path = $this->getPath() . "/css/$file.css.php"; - $fallback = PMA_Theme_Manager::FALLBACK_THEME . "/css/$file.css.php"; + $fallback = "./themes/" . PMA_Theme_Manager::FALLBACK_THEME . "/css/$file.css.php"; if (is_readable($path)) { echo "\n/* FILE: $file.css.php */\n"; From abe49f0d608164a544c828daf978d7f40237f9da Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 19 May 2012 18:17:54 +0100 Subject: [PATCH 2/2] Fixed conflict when loading CSS sprites --- libraries/Theme.class.php | 7 +-- themes/sprites.css.php | 99 ++++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 55 deletions(-) diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index ccb1a46010..814fb75cec 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -344,12 +344,7 @@ class PMA_Theme } } - $_sprites_data_file = $this->getPath() . '/sprites.lib.php'; - $_sprites_css_file = './themes/sprites.css.php'; - if (is_readable($_sprites_data_file)) { - include $_sprites_data_file; - include $_sprites_css_file; - } + include './themes/sprites.css.php'; return $success; } diff --git a/themes/sprites.css.php b/themes/sprites.css.php index 0657c3349c..e51e1a557a 100644 --- a/themes/sprites.css.php +++ b/themes/sprites.css.php @@ -7,11 +7,14 @@ */ // unplanned execution path -if (!defined('PMA_MINIMUM_COMMON')) { +if (! defined('PMA_MINIMUM_COMMON')) { exit(); } $bg = $_SESSION['PMA_Theme']->getImgPath() . 'sprites.png'; +/* Check if there is a valid data file for sprites */ +if (is_readable($_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php')) { + ?> /* Icon sprites */ .icon, .footnotemarker { @@ -23,59 +26,57 @@ $bg = $_SESSION['PMA_Theme']->getImgPath() . 'sprites.png'; background-repeat: no-repeat !important; background-position: top left !important; } - getPath() . '/sprites.lib.php')) { - include_once $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php'; - $sprites = array(); - if (function_exists('PMA_sprites')) { - $sprites = PMA_sprites(); + + include_once $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php'; + $sprites = array(); + if (function_exists('PMA_sprites')) { + $sprites = PMA_sprites(); + } + $template = ".ic_%s { background-position: 0 -%upx !important;%s%s }\n"; + foreach ($sprites as $name => $data) { + // generate the CSS code for each icon + $width = ''; + $height = ''; + // if either the height or width of an icon is 16px, + // then it's pointless to set this as a parameter, + //since it will be inherited from the "icon" class + if ($data['width'] != 16) { + $width = " width: " . $data['width'] . "px;"; } - $template = ".ic_%s { background-position: 0 -%upx !important;%s%s }\n"; - foreach ($sprites as $name => $data) { - // generate the CSS code for each icon - $width = ''; - $height = ''; - // if either the height or width of an icon is 16px, - // then it's pointless to set this as a parameter, - //since it will be inherited from the "icon" class - if ($data['width'] != 16) { - $width = " width: " . $data['width'] . "px;"; - } - if ($data['height'] != 16) { - $height = " height: " . $data['height'] . "px;"; - } + if ($data['height'] != 16) { + $height = " height: " . $data['height'] . "px;"; + } + printf( + $template, + $name, + ($data['position'] * 16), + $width, + $height + ); + } + // Here we map some of the classes that we + // defined above to other CSS selectors. + // The indexes of the array correspond to + // already defined classes and the values + // are the selectors that we want to map to. + $elements = array( + 's_sortable' => 'img.sortableIcon', + 's_asc' => 'th.headerSortUp img.sortableIcon', + 's_desc' => 'th.headerSortDown img.sortableIcon' + ); + $template = "%s { background-position: 0 -%upx; " + . "height: %upx; width: %upx; }\n"; + foreach ($elements as $key => $value) { + if (isset($sprites[$key])) { // If the CSS class has been defined printf( $template, - $name, - ($data['position'] * 16), - $width, - $height + $value, + ($sprites[$key]['position'] * 16), + $sprites[$key]['height'], + $sprites[$key]['width'] ); } - // Here we map some of the classes that we - // defined above to other CSS selectors. - // The indexes of the array correspond to - // already defined classes and the values - // are the selectors that we want to map to. - $elements = array( - 's_sortable' => 'img.sortableIcon', - 's_asc' => 'th.headerSortUp img.sortableIcon', - 's_desc' => 'th.headerSortDown img.sortableIcon' - ); - $template = "%s { background-position: 0 -%upx; " - . "height: %upx; width: %upx; }\n"; - foreach ($elements as $key => $value) { - if (isset($sprites[$key])) { // If the CSS class has been defined - printf( - $template, - $value, - ($sprites[$key]['position'] * 16), - $sprites[$key]['height'], - $sprites[$key]['width'] - ); - } - } } +} ?>