From 1940764c61dc21eba8e53a43bf84da24ef7b0280 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 22 Dec 2001 16:34:44 +0000 Subject: [PATCH] Short doc --- ChangeLog | 5 +++++ config.inc.php3 | 1 + libraries/common.lib.php3 | 17 +++++++++++++++++ main.php3 | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 247ae84a2..ca4a3b155 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-12-22 Marc Delisle + * start new MySQL short documentation structure: + - config.inc.php3 $cfgManualBaseShort + - libraries/common.lib.php3 PMA_showDocuShort() + 2001-12-21 Marc Delisle * test and merge patch from Loïc for bug 495112: - libraries/common.lib.php3 diff --git a/config.inc.php3 b/config.inc.php3 index d145985eb..c167df68b 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -141,6 +141,7 @@ $cfgBZipDump = TRUE; // dump files * Be sure to include no trailing slash on the path */ $cfgManualBase = 'http://www.mysql.com/documentation/mysql/bychapter'; +$cfgManualBaseShort = 'http://www.mysql.com/doc'; /** diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index dcff02282..46d10b7d2 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -892,6 +892,23 @@ window.parent.frames['nav'].location.replace(''); } // end of the 'PMA_showDocu()' function + /** + * Displays a link to the official MySQL documentation (short) + * + * @param string an anchor to move to + * + * @return string the html link + * + * @access public + */ + function PMA_showDocuShort($link) + { + if (!empty($GLOBALS['cfgManualBaseShort'])) { + return '[' . $GLOBALS['strDocu'] . ']'; + } + } // end of the 'PMA_showDocuShort()' function + + /** * Formats $value to byte view * diff --git a/main.php3 b/main.php3 index 376c1b239..2e18ac198 100755 --- a/main.php3 +++ b/main.php3 @@ -252,7 +252,7 @@ if ($server > 0) {   - +