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

last fix to broken vertical highlight: repeated headers. Repeated headers were not inside <th> but inside <td> cells.

Browse Source
This commit is contained in:
Garvin Hicking
2004-06-06 22:04:21 +00:00
parent e3ef7df162
commit 8c2512b3ba
4 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-06-06 Garvin Hicking <me@supergarv.de>
* libraries/display_tbl.lib.php, libraries/functions.js,
css/phpmyadmin.css.php: Further fixing of broken vertical
column highlighting; empty repeated header cells are now <th>, not
<td>. Adjusted CSS to not change visual display of those.
* (same files): Optimized unneccessary preg_replace.
2004-06-04 Michal Čihař <michal@cihar.com> 2004-06-04 Michal Čihař <michal@cihar.com>
* libraries/read_dump.lib.php: Do not strip comments here. * libraries/read_dump.lib.php: Do not strip comments here.
* libraries/sqlparser.lib.php: Handle correctly all MySQL comments (-- can * libraries/sqlparser.lib.php: Handle correctly all MySQL comments (-- can

4
css/phpmyadmin.css.php
View File

@@ -112,6 +112,7 @@ h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $fo
table {border-width:1px; border-color:#000000; border-style:solid; border-collapse:collapse; border-spacing:0} table {border-width:1px; border-color:#000000; border-style:solid; border-collapse:collapse; border-spacing:0}
th {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px} th {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px}
td {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px} td {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px}
th.td {font-weight: normal;}
<?php <?php
} else { } else {
/************************************************************************************ /************************************************************************************
@@ -138,6 +139,7 @@ body {
pre, tt {font-size: <?php echo $font_size; ?>} pre, tt {font-size: <?php echo $font_size; ?>}
th {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>} th {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>}
th.td {font-weight: normal; color: inherit; background-color: inherit; ?>}
td {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>} td {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
form {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>} form {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
input {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>} input {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
@@ -392,7 +394,7 @@ hr{ color: #666699; background-color: #6666cc; border: 0; height: 1px; }
/* Calendar */ /* Calendar */
table.calendar { table.calendar {
width: 100%; width: 100%;
} }
table.calendar td { table.calendar td {

53
libraries/display_tbl.lib.php
View File

@@ -629,10 +629,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 0; $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 0;
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
?> ?>
<td colspan="<?php echo $fields_cnt; ?>" align="center"> <th class="td" colspan="<?php echo $fields_cnt; ?>" align="center">
<a href="<?php echo $text_url; ?>"> <a href="<?php echo $text_url; ?>">
<img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a> <img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a>
</td> </th>
</tr> </tr>
<tr> <tr>
@@ -642,10 +642,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
<td colspan="<?php echo $num_rows + floor($num_rows/$repeat_cells) + 1; ?>" align="center"> <th class="td" colspan="<?php echo $num_rows + floor($num_rows/$repeat_cells) + 1; ?>" align="center">
<a href="<?php echo $text_url; ?>"> <a href="<?php echo $text_url; ?>">
<img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a> <img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a>
</td> </th>
</tr> </tr>
<?php <?php
} // end vertical mode } // end vertical mode
@@ -658,17 +658,17 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
echo "\n"; echo "\n";
?> ?>
<td<?php echo $colspan; ?> align="center"> <th class="td" <?php echo $colspan; ?> align="center">
<a href="<?php echo $text_url; ?>"> <a href="<?php echo $text_url; ?>">
<img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a> <img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a>
</td> </th>
<?php <?php
} // end horizontal/horizontalflipped mode } // end horizontal/horizontalflipped mode
else { else {
$vertical_display['textbtn'] = ' <td' . $rowspan . ' align="center" valign="middle">' . "\n" $vertical_display['textbtn'] = ' <th class="td" ' . $rowspan . ' align="center" valign="middle">' . "\n"
. ' <a href="' . $text_url . '">' . "\n" . ' <a href="' . $text_url . '">' . "\n"
. ' <img src="./images/s_' . (($dontlimitchars) ? 'partialtext' : 'fulltext') . '.png" border="0" width="50" height="20" alt="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" title="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" /></a>' . "\n" . ' <img src="./images/s_' . (($dontlimitchars) ? 'partialtext' : 'fulltext') . '.png" border="0" width="50" height="20" alt="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" title="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" /></a>' . "\n"
. ' </td>' . "\n"; . ' </th>' . "\n";
} // end vertical mode } // end vertical mode
} }
@@ -876,17 +876,17 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
echo "\n"; echo "\n";
?> ?>
<td<?php echo $colspan; ?> align="center"> <th class="td" <?php echo $colspan; ?> align="center">
<a href="<?php echo $text_url; ?>"> <a href="<?php echo $text_url; ?>">
<img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a> <img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a>
</td> </th>
<?php <?php
} // end horizontal/horizontalflipped mode } // end horizontal/horizontalflipped mode
else { else {
$vertical_display['textbtn'] = ' <td' . $rowspan . ' align="center" valign="middle">' . "\n" $vertical_display['textbtn'] = ' <th class="td" ' . $rowspan . ' align="center" valign="middle">' . "\n"
. ' <a href="' . $text_url . '">' . "\n" . ' <a href="' . $text_url . '">' . "\n"
. ' <img src="./images/s_' . (($dontlimitchars) ? 'partialtext' : 'fulltext') . '.png" border="0" width="50" height="20" alt="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" title="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" /></a>' . "\n" . ' <img src="./images/s_' . (($dontlimitchars) ? 'partialtext' : 'fulltext') . '.png" border="0" width="50" height="20" alt="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" title="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" /></a>' . "\n"
. ' </td>' . "\n"; . ' </th>' . "\n";
} // end vertical mode } // end vertical mode
} }
@@ -1022,7 +1022,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
echo '<tr>' . "\n"; echo '<tr>' . "\n";
for ($foo_i = 0; $foo_i < $vertical_display['emptypre']; $foo_i++) { for ($foo_i = 0; $foo_i < $vertical_display['emptypre']; $foo_i++) {
echo ' <td>&nbsp;</td>' . "\n"; echo ' <th class="td">&nbsp;</th>' . "\n";
} }
foreach ($vertical_display['desc'] AS $key => $val) { foreach ($vertical_display['desc'] AS $key => $val) {
@@ -1030,7 +1030,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
} }
for ($foo_i = 0; $foo_i < $vertical_display['emptyafter']; $foo_i++) { for ($foo_i = 0; $foo_i < $vertical_display['emptyafter']; $foo_i++) {
echo ' <td>&nbsp;</td>' . "\n"; echo ' <th class="td">&nbsp;</th>' . "\n";
} }
echo '</tr>' . "\n"; echo '</tr>' . "\n";
@@ -1477,10 +1477,9 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
$vertical_display['row_delete'][$row_no] .= ' <td align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['row_delete'][$row_no] .= ' <td align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
// . ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '%s" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n" . ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '[%_PMA_CHECKBOX_DIR_%]" name="rows_to_delete[' . $uva_condition . ']"'
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '%s" name="rows_to_delete[' . $uva_condition . ']"' . ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'[%_PMA_CHECKBOX_DIR_%]\');"'
. ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'%s\');"' . ' value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
. ' value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
} else { } else {
@@ -1540,11 +1539,10 @@ function PMA_displayVerticalTable()
$foo_counter = 0; $foo_counter = 0;
foreach ($vertical_display['row_delete'] AS $key => $val) { foreach ($vertical_display['row_delete'] AS $key => $val) {
if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
echo '<td>&nbsp;</td>' . "\n"; echo '<th class="td">&nbsp;</th>' . "\n";
} }
// echo $val; // echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '', $val);
echo preg_replace("/%s/","",$val);
$foo_counter++; $foo_counter++;
} // end while } // end while
echo '</tr>' . "\n"; echo '</tr>' . "\n";
@@ -1559,7 +1557,7 @@ function PMA_displayVerticalTable()
$foo_counter = 0; $foo_counter = 0;
foreach ($vertical_display['edit'] AS $key => $val) { foreach ($vertical_display['edit'] AS $key => $val) {
if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
echo ' <td>&nbsp;</td>' . "\n"; echo ' <th class="td">&nbsp;</th>' . "\n";
} }
echo $val; echo $val;
@@ -1577,7 +1575,7 @@ function PMA_displayVerticalTable()
$foo_counter = 0; $foo_counter = 0;
foreach ($vertical_display['delete'] AS $key => $val) { foreach ($vertical_display['delete'] AS $key => $val) {
if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
echo '<td>&nbsp;</td>' . "\n"; echo '<th class="td">&nbsp;</th>' . "\n";
} }
echo $val; echo $val;
@@ -1620,11 +1618,10 @@ function PMA_displayVerticalTable()
$foo_counter = 0; $foo_counter = 0;
foreach ($vertical_display['row_delete'] AS $key => $val) { foreach ($vertical_display['row_delete'] AS $key => $val) {
if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
echo '<td>&nbsp;</td>' . "\n"; echo '<th class="td">&nbsp;</th>' . "\n";
} }
// echo $val; // echo str_replace('[%_PMA_CHECKBOX_DIR_%]', 'r', $val);
echo preg_replace("/%s/","r",$val);
$foo_counter++; $foo_counter++;
} // end while } // end while
echo '</tr>' . "\n"; echo '</tr>' . "\n";
@@ -1639,7 +1636,7 @@ function PMA_displayVerticalTable()
$foo_counter = 0; $foo_counter = 0;
foreach ($vertical_display['edit'] AS $key => $val) { foreach ($vertical_display['edit'] AS $key => $val) {
if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
echo '<td>&nbsp;</td>' . "\n"; echo '<th class="td">&nbsp;</th>' . "\n";
} }
echo $val; echo $val;
@@ -1657,7 +1654,7 @@ function PMA_displayVerticalTable()
$foo_counter = 0; $foo_counter = 0;
foreach ($vertical_display['delete'] AS $key => $val) { foreach ($vertical_display['delete'] AS $key => $val) {
if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
echo '<td>&nbsp;</td>' . "\n"; echo '<th class="td">&nbsp;</th>' . "\n";
} }
echo $val; echo $val;

7
libraries/functions.js
View File

@@ -601,6 +601,7 @@ function setVerticalPointer(theRow, theColNum, theAction, theDefaultColor1, theD
} // end 4 } // end 4
// 5 ... with DOM compatible browsers except Opera // 5 ... with DOM compatible browsers except Opera
for (c = 0; c < rowCnt; c++) { for (c = 0; c < rowCnt; c++) {
if (tagSwitch == 'tag') { if (tagSwitch == 'tag') {
Cells = theRows[c].getElementsByTagName('td'); Cells = theRows[c].getElementsByTagName('td');
@@ -608,11 +609,7 @@ function setVerticalPointer(theRow, theColNum, theAction, theDefaultColor1, theD
Cells = theRows[c].cells; Cells = theRows[c].cells;
} }
if (c == 0) { Cell = Cells[theColNum];
Cell = Cells[theColNum + 1];
} else {
Cell = Cells[theColNum];
}
// 5.1 Sets the new color... // 5.1 Sets the new color...
if (newColor) { if (newColor) {