[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10614-g634db1c
Marc Delisle
lem9 at users.sourceforge.net
Fri Oct 15 19:21:37 CEST 2010
The branch, master has been updated
via 634db1c81de4545f7d63ff92b66f076b2e329f13 (commit)
from 3859b65affc4d8a8b2522c6b91f31356baf17153 (commit)
- Log -----------------------------------------------------------------
commit 634db1c81de4545f7d63ff92b66f076b2e329f13
Author: Marc Delisle <marc at infomarc.info>
Date: Fri Oct 15 13:21:27 2010 -0400
Inline edit in vertical mode
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 1be9960..2acf368 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1107,12 +1107,14 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
echo '</tr>' . "\n";
} // end if
+ $alternating_color_class = ($odd_row ? 'odd' : 'even');
+ $odd_row = ! $odd_row;
+
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
// pointer code part
- echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
+ echo '<tr class="' . $alternating_color_class . '">';
}
- $odd_row = ! $odd_row;
// 1. Prepares the row
@@ -1222,7 +1224,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$is_field_truncated = false;
//If the previous column had blob data, we need to reset the class
// to $data_inline_edit_class
- $class = $data_inline_edit_class;
+ $class = $data_inline_edit_class . ' ' . $alternating_color_class;
// See if this column should get highlight because it's used in the
// where-query.
@@ -1454,7 +1456,7 @@ 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] .= ' <td align="center" class="' . $class . '" ' . $column_style_vertical . '>' . "\n"
+ $vertical_display['row_delete'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . '" ' . $column_style_vertical . '>' . "\n"
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '[%_PMA_CHECKBOX_DIR_%]" name="rows_to_delete[' . $where_clause_html . ']"'
. ' onclick="' . $column_marker_vertical . 'copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'[%_PMA_CHECKBOX_DIR_%]\');"'
. ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
@@ -1464,7 +1466,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
}
if (isset($edit_url)) {
- $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n"
+ $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, array(), false)
. ' </td>' . "\n";
} else {
@@ -1472,7 +1474,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
}
if (isset($del_url)) {
- $vertical_display['delete'][$row_no] .= ' <td align="center" class="' . $class . '" ' . $column_style_vertical . '>' . "\n"
+ $vertical_display['delete'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . '" ' . $column_style_vertical . '>' . "\n"
. PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), false)
. ' </td>' . "\n";
} else {
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list