patch #2596230 [XHTML] View table headers/footers completely
This commit is contained in:
@@ -25,6 +25,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
||||
thanks to Herman van Rink and Virsacer
|
||||
+ patch #2505255 [privileges] Cleanup, thanks to Virsacer - virsacer
|
||||
- bug #2414056 [auth] AllowNoPasswordRoot error message is too vague
|
||||
+ patch #2596230 [XHTML] View table headers/footers completely,
|
||||
thanks to Virsacer - virsacer
|
||||
|
||||
3.1.3.0 (not yet released)
|
||||
+ [lang] Turkish update, thanks to Burak Yavuz
|
||||
|
@@ -237,7 +237,7 @@ else {
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<th> </th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
@@ -92,7 +92,7 @@ function PMA_TableHeader($db_is_information_schema = false)
|
||||
|
||||
echo '<table class="data" style="float: left;">' . "\n"
|
||||
.'<thead>' . "\n"
|
||||
.'<tr><td></td>' . "\n"
|
||||
.'<tr><th></th>' . "\n"
|
||||
.' <th>' . PMA_SortableTableHeader($GLOBALS['strTable'], 'table') . '</th>' . "\n"
|
||||
.' <th colspan="' . $action_colspan . '">' . "\n"
|
||||
.' ' . $GLOBALS['strAction'] . "\n"
|
||||
@@ -513,7 +513,7 @@ if ($is_show_stats) {
|
||||
?>
|
||||
</tbody>
|
||||
<tbody>
|
||||
<tr><td></td>
|
||||
<tr><th></th>
|
||||
<th align="center" nowrap="nowrap">
|
||||
<?php
|
||||
// for blobstreaming - if the number of tables is 0, set tableReductionCount to 0
|
||||
|
@@ -1459,7 +1459,7 @@ function PMA_displayVerticalTable()
|
||||
$foo_counter = 0;
|
||||
foreach ($vertical_display['row_delete'] as $val) {
|
||||
if (($foo_counter != 0) && ($_SESSION['userconf']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['userconf']['repeat_cells'])) {
|
||||
echo '<th> </th>' . "\n";
|
||||
echo '<th></th>' . "\n";
|
||||
}
|
||||
|
||||
echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '', $val);
|
||||
@@ -1477,7 +1477,7 @@ function PMA_displayVerticalTable()
|
||||
$foo_counter = 0;
|
||||
foreach ($vertical_display['edit'] as $val) {
|
||||
if (($foo_counter != 0) && ($_SESSION['userconf']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['userconf']['repeat_cells'])) {
|
||||
echo ' <th> </th>' . "\n";
|
||||
echo ' <th></th>' . "\n";
|
||||
}
|
||||
|
||||
echo $val;
|
||||
@@ -1495,7 +1495,7 @@ function PMA_displayVerticalTable()
|
||||
$foo_counter = 0;
|
||||
foreach ($vertical_display['delete'] as $val) {
|
||||
if (($foo_counter != 0) && ($_SESSION['userconf']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['userconf']['repeat_cells'])) {
|
||||
echo '<th> </th>' . "\n";
|
||||
echo '<th></th>' . "\n";
|
||||
}
|
||||
|
||||
echo $val;
|
||||
@@ -1530,7 +1530,7 @@ function PMA_displayVerticalTable()
|
||||
$foo_counter = 0;
|
||||
foreach ($vertical_display['row_delete'] as $val) {
|
||||
if (($foo_counter != 0) && ($_SESSION['userconf']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['userconf']['repeat_cells'])) {
|
||||
echo '<th> </th>' . "\n";
|
||||
echo '<th></th>' . "\n";
|
||||
}
|
||||
|
||||
echo str_replace('[%_PMA_CHECKBOX_DIR_%]', 'r', $val);
|
||||
@@ -1548,7 +1548,7 @@ function PMA_displayVerticalTable()
|
||||
$foo_counter = 0;
|
||||
foreach ($vertical_display['edit'] as $val) {
|
||||
if (($foo_counter != 0) && ($_SESSION['userconf']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['userconf']['repeat_cells'])) {
|
||||
echo '<th> </th>' . "\n";
|
||||
echo '<th></th>' . "\n";
|
||||
}
|
||||
|
||||
echo $val;
|
||||
@@ -1566,7 +1566,7 @@ function PMA_displayVerticalTable()
|
||||
$foo_counter = 0;
|
||||
foreach ($vertical_display['delete'] as $val) {
|
||||
if (($foo_counter != 0) && ($_SESSION['userconf']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['userconf']['repeat_cells'])) {
|
||||
echo '<th> </th>' . "\n";
|
||||
echo '<th></th>' . "\n";
|
||||
}
|
||||
|
||||
echo $val;
|
||||
|
@@ -163,7 +163,7 @@ if ($databases_count > 0) {
|
||||
echo '<table id="tabledatabases" class="data">' . "\n"
|
||||
. '<thead>' . "\n"
|
||||
. '<tr>' . "\n"
|
||||
. ($is_superuser || $cfg['AllowUserDropDatabase'] ? ' <th> </th>' . "\n" : '')
|
||||
. ($is_superuser || $cfg['AllowUserDropDatabase'] ? ' <th></th>' . "\n" : '')
|
||||
. ' <th><a href="./server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
|
||||
. ' ' . $strDatabase . "\n"
|
||||
. ($sort_by == 'SCHEMA_NAME' ? ' <img class="icon" src="' . $pmaThemeImage . 's_' . $sort_order . '.png" width="11" height="9" alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
|
||||
@@ -188,7 +188,7 @@ if ($databases_count > 0) {
|
||||
}
|
||||
}
|
||||
if ($is_superuser) {
|
||||
echo ' <th>' . ($cfg['PropertiesIconic'] ? ' ' : $strAction) . "\n"
|
||||
echo ' <th>' . ($cfg['PropertiesIconic'] ? '' : $strAction) . "\n"
|
||||
. ' </th>' . "\n";
|
||||
}
|
||||
echo '</tr>' . "\n"
|
||||
@@ -268,7 +268,7 @@ if ($databases_count > 0) {
|
||||
|
||||
echo '<tr>' . "\n";
|
||||
if ($is_superuser || $cfg['AllowUserDropDatabase']) {
|
||||
echo ' <th> </th>' . "\n";
|
||||
echo ' <th></th>' . "\n";
|
||||
}
|
||||
echo ' <th>' . $strTotalUC . ': ' . $databases_count . '</th>' . "\n";
|
||||
foreach ($column_order as $stat_name => $stat) {
|
||||
@@ -295,7 +295,7 @@ if ($databases_count > 0) {
|
||||
}
|
||||
}
|
||||
if ($is_superuser) {
|
||||
echo ' <th> </th>' . "\n";
|
||||
echo ' <th></th>' . "\n";
|
||||
}
|
||||
echo '</tr>' . "\n";
|
||||
echo '</tbody>' . "\n"
|
||||
|
@@ -1472,14 +1472,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
|
||||
. PMA_generate_common_hidden_inputs('', '')
|
||||
. ' <table id="tableuserrights" class="data">' . "\n"
|
||||
. ' <thead>' . "\n"
|
||||
. ' <tr><td></td>' . "\n"
|
||||
. ' <tr><th></th>' . "\n"
|
||||
. ' <th>' . $GLOBALS['strUser'] . '</th>' . "\n"
|
||||
. ' <th>' . $GLOBALS['strHost'] . '</th>' . "\n"
|
||||
. ' <th>' . $GLOBALS['strPassword'] . '</th>' . "\n"
|
||||
. ' <th>' . $GLOBALS['strGlobalPrivileges'] . ' '
|
||||
. PMA_showHint($GLOBALS['strEnglishPrivileges']) . '</th>' . "\n"
|
||||
. ' <th>' . $GLOBALS['strGrantOption'] . '</th>' . "\n"
|
||||
. ' ' . ($GLOBALS['cfg']['PropertiesIconic'] ? '<td></td>' : '<th>' . $GLOBALS['strAction'] . '</th>') . "\n";
|
||||
. ' <th>' . ($GLOBALS['cfg']['PropertiesIconic'] ? '' : $GLOBALS['strAction']) . '</th>' . "\n";
|
||||
echo ' </tr>' . "\n";
|
||||
echo ' </thead>' . "\n";
|
||||
echo ' <tbody>' . "\n";
|
||||
|
Reference in New Issue
Block a user