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

renamed colors.inc.php to layout.inc.php

Browse Source
This commit is contained in:
Marc Delisle
2004-07-12 15:20:55 +00:00
parent 22824995f9
commit ed3eaa7449
6 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-07-12 Marc Delisle <lem9@users.sourceforge.net>
* 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 <lem9@users.sourceforge.net>
* lang/catalan update, thanks to Xavier Navarro (xavin).
* lang/galician: Updated, thanks to Xosé Calvo.

20
Documentation.html
View File

@@ -338,7 +338,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
<span class="important">Configuration note:</span>
Almost all configurable data is placed in <i>config.inc.php</i>. The
parameters which relate to design (like colors) are placed in
<tt>themes/themename/colors.inc.php</tt>. You
<tt>themes/themename/layout.inc.php</tt>. You
might also want to modify <i>config.footer.inc.php</i> and
<i>config.header.inc.php</i> 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). <br />
<dt><b>$cfg['LeftWidth'] </b>integer</dt>
<dd>
Left frame width in pixel. See <tt>themes/themename/colors.inc.php</tt>.
Left frame width in pixel. See <tt>themes/themename/layout.inc.php</tt>.
<br /><br />
</dd>
@@ -1518,7 +1518,7 @@ Defaults to FALSE (drop-down). <br />
</dt>
<dd>
The background colors (HTML) used for both the frames.
See <tt>themes/themename/colors.inc.php</tt>.
See <tt>themes/themename/layout.inc.php</tt>.
<br /><br />
</dd>
@@ -1527,13 +1527,13 @@ Defaults to FALSE (drop-down). <br />
</dt>
<dd>
The URI of the background image used for the right frame. It must be
an absolute URI. See <tt>themes/themename/colors.inc.php</tt>.
an absolute URI. See <tt>themes/themename/layout.inc.php</tt>.
</dd>
<dt><b>$cfg['LeftPointerColor'] </b>string [HTML color]</dt>
<dd>
The color (HTML) used for the pointer in the left frame (does not work
with Netscape 4). See <tt>themes/themename/colors.inc.php</tt>.
with Netscape 4). See <tt>themes/themename/layout.inc.php</tt>.
<br /><br />
</dd>
@@ -1545,25 +1545,25 @@ Defaults to FALSE (drop-down). <br />
<dt><b>$cfg['Border'] </b>integer</dt>
<dd>
The size of a table's border. See <tt>themes/themename/colors.inc.php</tt>.
The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>.
<br /><br />
</dd>
<dt><b>$cfg['ThBgcolor'] </b>string [HTML color]</dt>
<dd>
The color (HTML) used for table headers. See <tt>themes/themename/colors.inc.php</tt>.
The color (HTML) used for table headers. See <tt>themes/themename/layout.inc.php</tt>.
<br /><br />
</dd>
<dt><b>$cfg['BgcolorOne'] </b>string [HTML color]</dt>
<dd>
The color (HTML) #1 for table rows. See <tt>themes/themename/colors.inc.php</tt>.
The color (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</tt>.
<br /><br />
</dd>
<dt><b>$cfg['BgcolorTwo'] </b>string [HTML color]</dt>
<dd>
The color (HTML) #2 for table rows. See <tt>themes/themename/colors.inc.php</tt>.
The color (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</tt>.
<br /><br />
</dd>
@@ -1577,7 +1577,7 @@ Defaults to FALSE (drop-down). <br />
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.<br />
See <tt>themes/themename/colors.inc.php</tt>.
See <tt>themes/themename/layout.inc.php</tt>.
<br /><br />
</dd>

10
config.inc.php
View File

@@ -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

12
libraries/common.lib.php
View File

@@ -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)) {

0
themes/darkblue_orange/colors.inc.php → themes/darkblue_orange/layout.inc.php
View File

0
themes/original/colors.inc.php → themes/original/layout.inc.php
View File