gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-05-19 19:18:16 +02:00
commit b51c04818a
2 changed files with 52 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/Theme.class.php
View File

@ -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";
@ -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;
}

99
themes/sprites.css.php
View File

@ -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;
}
<?php
/* Check if there is a valid data file for sprites */
if (is_readable($_SESSION['PMA_Theme']->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']
);
}
}
}
}
?>