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

table name should be displayed on top

Browse Source
This commit is contained in:
Marc Delisle
2010-08-30 13:28:51 -04:00
parent fe868a5bf2
commit c5ab6175cd
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
libraries/header.inc.php
View File

@@ -127,51 +127,52 @@ if (!$GLOBALS['is_ajax_request']) {
// if the table is being dropped, $_REQUEST['purge'] is set // if the table is being dropped, $_REQUEST['purge'] is set
// (it always contains "1") // (it always contains "1")
// so do not display the table name in upper div // so do not display the table name in upper div
} elseif (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) {
require_once './libraries/tbl_info.inc.php'; require_once './libraries/tbl_info.inc.php';
echo $separator; echo $separator;
printf($item, printf($item,
$GLOBALS['cfg']['DefaultTabTable'], $GLOBALS['cfg']['DefaultTabTable'],
PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']), PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']),
str_replace(' ', ' ', htmlspecialchars($GLOBALS['table'])), str_replace(' ', ' ', htmlspecialchars($GLOBALS['table'])),
(isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')), (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')),
(isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png'); (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png');
/**
* Displays table comment
* @uses $show_comment from libraries/tbl_info.inc.php
* @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
*/
if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) {
if (strstr($show_comment, '; InnoDB free')) {
$show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
}
echo '<span class="table_comment" id="span_table_comment">'
.'&quot;' . htmlspecialchars($show_comment)
.'&quot;</span>' . "\n";
} // end if
} else {
// no table selected, display database comment if present
/**
* Settings for relations stuff
*/
require_once './libraries/relation.lib.php';
$cfgRelation = PMA_getRelationsParam();
// Get additional information about tables for tooltip is done
// in libraries/db_info.inc.php only once
if ($cfgRelation['commwork']) {
$comment = PMA_getDbComment($GLOBALS['db']);
/** /**
* Displays table comment * Displays table comment
* @uses $show_comment from libraries/tbl_info.inc.php
* @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
*/ */
if (! empty($comment)) { if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) {
echo '<span class="table_comment"' if (strstr($show_comment, '; InnoDB free')) {
. ' id="span_table_comment">&quot;' $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
. htmlspecialchars($comment) }
. '&quot;</span>' . "\n"; echo '<span class="table_comment" id="span_table_comment">'
.'&quot;' . htmlspecialchars($show_comment)
.'&quot;</span>' . "\n";
} // end if } // end if
} else {
// no table selected, display database comment if present
/**
* Settings for relations stuff
*/
require_once './libraries/relation.lib.php';
$cfgRelation = PMA_getRelationsParam();
// Get additional information about tables for tooltip is done
// in libraries/db_info.inc.php only once
if ($cfgRelation['commwork']) {
$comment = PMA_getDbComment($GLOBALS['db']);
/**
* Displays table comment
*/
if (! empty($comment)) {
echo '<span class="table_comment"'
. ' id="span_table_comment">&quot;'
. htmlspecialchars($comment)
. '&quot;</span>' . "\n";
} // end if
}
} }
} }
} }