diff --git a/ChangeLog b/ChangeLog index 195981713..ba380db83 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-06-06 Garvin Hicking + * 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 , not + . Adjusted CSS to not change visual display of those. + * (same files): Optimized unneccessary preg_replace. + 2004-06-04 Michal Čihař * libraries/read_dump.lib.php: Do not strip comments here. * libraries/sqlparser.lib.php: Handle correctly all MySQL comments (-- can diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 3e54e8061..c0921d139 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -112,6 +112,7 @@ h1 {font-family: ; font-size: ; font-size: ; font-weight: bold; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px} td {font-family: ; font-size: ; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px} +th.td {font-weight: normal;} } th {font-family: ; font-size: ; font-weight: bold; color: #000000; background-color: } +th.td {font-weight: normal; color: inherit; background-color: inherit; ?>} td {font-family: ; font-size: } form {font-family: ; font-size: } input {font-family: ; font-size: } @@ -392,7 +394,7 @@ hr{ color: #666699; background-color: #6666cc; border: 0; height: 1px; } /* Calendar */ table.calendar { - width: 100%; + width: 100%; } table.calendar td { diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d062c1ae6..135d0e689 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -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; if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { ?> - + <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> - + @@ -642,10 +642,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ echo "\n"; ?> - + <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> - + - align="center"> + align="center"> <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> - + ' . "\n" + $vertical_display['textbtn'] = ' ' . "\n" . ' ' . "\n" . ' ' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '' . "\n" - . ' ' . "\n"; + . ' ' . "\n"; } // end vertical mode } @@ -876,17 +876,17 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { echo "\n"; ?> - align="center"> + align="center"> <?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?> - + ' . "\n" + $vertical_display['textbtn'] = ' ' . "\n" . ' ' . "\n" . ' ' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '' . "\n" - . ' ' . "\n"; + . ' ' . "\n"; } // end vertical mode } @@ -1022,7 +1022,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) echo '' . "\n"; for ($foo_i = 0; $foo_i < $vertical_display['emptypre']; $foo_i++) { - echo '  ' . "\n"; + echo '  ' . "\n"; } 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++) { - echo '  ' . "\n"; + echo '  ' . "\n"; } echo '' . "\n"; @@ -1477,10 +1477,9 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { $vertical_display['row_delete'][$row_no] .= ' ' . "\n" -// . ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n"; } else { @@ -1540,11 +1539,10 @@ function PMA_displayVerticalTable() $foo_counter = 0; foreach ($vertical_display['row_delete'] AS $key => $val) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { - echo ' ' . "\n"; + echo ' ' . "\n"; } - // echo $val; // - echo preg_replace("/%s/","",$val); + echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '', $val); $foo_counter++; } // end while echo '' . "\n"; @@ -1559,7 +1557,7 @@ function PMA_displayVerticalTable() $foo_counter = 0; foreach ($vertical_display['edit'] AS $key => $val) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { - echo '  ' . "\n"; + echo '  ' . "\n"; } echo $val; @@ -1577,7 +1575,7 @@ function PMA_displayVerticalTable() $foo_counter = 0; foreach ($vertical_display['delete'] AS $key => $val) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { - echo ' ' . "\n"; + echo ' ' . "\n"; } echo $val; @@ -1620,11 +1618,10 @@ function PMA_displayVerticalTable() $foo_counter = 0; foreach ($vertical_display['row_delete'] AS $key => $val) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { - echo ' ' . "\n"; + echo ' ' . "\n"; } - // echo $val; // - echo preg_replace("/%s/","r",$val); + echo str_replace('[%_PMA_CHECKBOX_DIR_%]', 'r', $val); $foo_counter++; } // end while echo '' . "\n"; @@ -1639,7 +1636,7 @@ function PMA_displayVerticalTable() $foo_counter = 0; foreach ($vertical_display['edit'] AS $key => $val) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { - echo ' ' . "\n"; + echo ' ' . "\n"; } echo $val; @@ -1657,7 +1654,7 @@ function PMA_displayVerticalTable() $foo_counter = 0; foreach ($vertical_display['delete'] AS $key => $val) { if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) { - echo ' ' . "\n"; + echo ' ' . "\n"; } echo $val; diff --git a/libraries/functions.js b/libraries/functions.js index 65411f6b1..ea1520347 100644 --- a/libraries/functions.js +++ b/libraries/functions.js @@ -601,6 +601,7 @@ function setVerticalPointer(theRow, theColNum, theAction, theDefaultColor1, theD } // end 4 // 5 ... with DOM compatible browsers except Opera + for (c = 0; c < rowCnt; c++) { if (tagSwitch == 'tag') { Cells = theRows[c].getElementsByTagName('td'); @@ -608,11 +609,7 @@ function setVerticalPointer(theRow, theColNum, theAction, theDefaultColor1, theD Cells = theRows[c].cells; } - if (c == 0) { - Cell = Cells[theColNum + 1]; - } else { - Cell = Cells[theColNum]; - } + Cell = Cells[theColNum]; // 5.1 Sets the new color... if (newColor) {