diff --git a/ChangeLog b/ChangeLog index 587b5286c..b08e0c30b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-07-12 Marc Delisle + * all themes/colors.inc.php, libraries/common.lib.php, + config.inc.php, Documentation.html: rename colors.inc.php to + layout.inc.php, thanks to Garvin for the suggestion + 2004-07-10 Marc Delisle * lang/catalan update, thanks to Xavier Navarro (xavin). * lang/galician: Updated, thanks to Xosé Calvo. diff --git a/Documentation.html b/Documentation.html index 1136053f7..4b052467d 100755 --- a/Documentation.html +++ b/Documentation.html @@ -338,7 +338,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; Configuration note: Almost all configurable data is placed in config.inc.php. The parameters which relate to design (like colors) are placed in - themes/themename/colors.inc.php. You + themes/themename/layout.inc.php. You might also want to modify config.footer.inc.php and config.header.inc.php files to add your site specific code to be included on start and end of each page. @@ -1508,7 +1508,7 @@ Defaults to FALSE (drop-down).
$cfg['LeftWidth'] integer
- Left frame width in pixel. See themes/themename/colors.inc.php. + Left frame width in pixel. See themes/themename/layout.inc.php.

@@ -1518,7 +1518,7 @@ Defaults to FALSE (drop-down).
The background colors (HTML) used for both the frames. - See themes/themename/colors.inc.php. + See themes/themename/layout.inc.php.

@@ -1527,13 +1527,13 @@ Defaults to FALSE (drop-down).
The URI of the background image used for the right frame. It must be - an absolute URI. See themes/themename/colors.inc.php. + an absolute URI. See themes/themename/layout.inc.php.
$cfg['LeftPointerColor'] string [HTML color]
The color (HTML) used for the pointer in the left frame (does not work - with Netscape 4). See themes/themename/colors.inc.php. + with Netscape 4). See themes/themename/layout.inc.php.

@@ -1545,25 +1545,25 @@ Defaults to FALSE (drop-down).
$cfg['Border'] integer
- The size of a table's border. See themes/themename/colors.inc.php. + The size of a table's border. See themes/themename/layout.inc.php.

$cfg['ThBgcolor'] string [HTML color]
- The color (HTML) used for table headers. See themes/themename/colors.inc.php. + The color (HTML) used for table headers. See themes/themename/layout.inc.php.

$cfg['BgcolorOne'] string [HTML color]
- The color (HTML) #1 for table rows. See themes/themename/colors.inc.php. + The color (HTML) #1 for table rows. See themes/themename/layout.inc.php.

$cfg['BgcolorTwo'] string [HTML color]
- The color (HTML) #2 for table rows. See themes/themename/colors.inc.php. + The color (HTML) #2 for table rows. See themes/themename/layout.inc.php.

@@ -1577,7 +1577,7 @@ Defaults to FALSE (drop-down).
The former feature highlights the row over which your mouse is passing and the latter lets you visually mark/unmark rows by clicking on them.
- See themes/themename/colors.inc.php. + See themes/themename/layout.inc.php.

diff --git a/config.inc.php b/config.inc.php index afb5932d9..1ccff996a 100644 --- a/config.inc.php +++ b/config.inc.php @@ -457,21 +457,21 @@ $cfg['AvailableCharsets'] = array( /** * Customization & design * - * The graphical settings are now located in themes/themename/colors.inc.php + * The graphical settings are now located in themes/themename/layout.inc.php */ $cfg['LeftPointerEnable'] = TRUE; // enable the left panel pointer // (used when LeftFrameLight is FALSE) // see also LeftPointerColor - // in colors.inc.php + // in layout.inc.php $cfg['BrowsePointerEnable'] = TRUE; // enable the browse pointer // see also BrowsePointerColor - // in colors.inc.php + // in layout.inc.php $cfg['BrowseMarkerEnable'] = TRUE; // enable the browse marker // see also BrowseMarkerColor - // in colors.inc.php + // in layout.inc.php $cfg['TextareaCols'] = 40; // textarea size (columns) in edit mode // (this value will be emphasized (*2) for sql @@ -599,7 +599,7 @@ $cfg['GD2Available'] = 'auto'; // Is GD >= 2 available? Set to yes/ $cfg['SQP']['fmtType'] = 'html'; // Pretty-printing style to use on queries (html, text, none) $cfg['SQP']['fmtInd'] = '1'; // Amount to indent each level (floats ok) $cfg['SQP']['fmtIndUnit'] = 'em'; // Units for indenting each level (CSS Types - {em,px,pt}) -// The graphical settings are now located in themes/themename/colors.inc.php +// The graphical settings are now located in themes/themename/layout.inc.php /** * If you wish to use the SQL Validator service, you should be diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 990664814..804f974bd 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -313,9 +313,9 @@ if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){ } if ($ThemeDefaultOk == TRUE){ $pmaThemeImage = './' . $cfg['ThemePath'] . '/' . $cfg['ThemeDefault'] . '/img/'; - $tmp_color_file = './' . $cfg['ThemePath'] . '/' . $cfg['ThemeDefault'] . '/colors.inc.php'; - if (@file_exists($tmp_color_file)) { - include($tmp_color_file); + $tmp_layout_file = './' . $cfg['ThemePath'] . '/' . $cfg['ThemeDefault'] . '/layout.inc.php'; + if (@file_exists($tmp_layout_file)) { + include($tmp_layout_file); } } else { $pmaThemeImage = './' . $cfg['ThemePath'] . '/original/img/'; @@ -323,9 +323,9 @@ if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){ } else { $GLOBALS['theme'] = $_COOKIE['pma_theme']; $pmaThemeImage = './' . $cfg['ThemePath'] . '/' . $_COOKIE['pma_theme'] . '/img/'; - $tmp_color_file = './' . $cfg['ThemePath'] . '/' . PMA_securePath($_COOKIE['pma_theme']) . '/colors.inc.php'; - if (@file_exists($tmp_color_file)) { - include($tmp_color_file); + $tmp_layout_file = './' . $cfg['ThemePath'] . '/' . PMA_securePath($_COOKIE['pma_theme']) . '/layout.inc.php'; + if (@file_exists($tmp_layout_file)) { + include($tmp_layout_file); } } if (!is_dir($pmaThemeImage)) { diff --git a/themes/darkblue_orange/colors.inc.php b/themes/darkblue_orange/layout.inc.php similarity index 100% rename from themes/darkblue_orange/colors.inc.php rename to themes/darkblue_orange/layout.inc.php diff --git a/themes/original/colors.inc.php b/themes/original/layout.inc.php similarity index 100% rename from themes/original/colors.inc.php rename to themes/original/layout.inc.php