The branch, master has been updated via 5b62968f47093deea0576eaf4c7c0d1d1b081a62 (commit) via c65c51d5eeed9ec7c564eea18ef8b3efe4b8e840 (commit) from 3c246d2fb318c06f43cb1a02efab8d5974b244d1 (commit)

- Log ----------------------------------------------------------------- commit 5b62968f47093deea0576eaf4c7c0d1d1b081a62 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Dec 17 23:28:12 2011 +0530

Swap odd, even in RTE

commit c65c51d5eeed9ec7c564eea18ef8b3efe4b8e840 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Dec 17 23:04:22 2011 +0530

Proper row styles

-----------------------------------------------------------------------

Summary of changes: js/rte/common.js | 4 ++-- libraries/rte/rte_list.lib.php | 2 +- server_privileges.php | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/js/rte/common.js b/js/rte/common.js index 781219d..e618151 100644 --- a/js/rte/common.js +++ b/js/rte/common.js @@ -185,7 +185,7 @@ $(document).ready(function () { */ var rowclass = ''; $('table.data').find('tr').has('td').each(function () { - rowclass = (ct % 2 === 0) ? 'even' : 'odd'; + rowclass = (ct % 2 === 0) ? 'odd' : 'even'; $(this).removeClass().addClass(rowclass); ct++; }); @@ -359,7 +359,7 @@ $(document).ready(function () { */ var rowclass = ''; $table.find('tr').has('td').each(function () { - rowclass = (ct % 2 === 0) ? 'even' : 'odd'; + rowclass = (ct % 2 === 0) ? 'odd' : 'even'; $(this).removeClass().addClass(rowclass); ct++; }); diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index f48c6ab..34556b4 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -75,7 +75,7 @@ function PMA_RTE_getList($type, $items) $retval .= " <!-- TABLE DATA -->\n"; $ct = 0; foreach ($items as $item) { - $rowclass = ($ct % 2 == 0) ? 'even' : 'odd'; + $rowclass = ($ct % 2 == 0) ? 'odd' : 'even'; if ($GLOBALS['is_ajax_request']) { $rowclass .= ' ajaxInsert hide'; } diff --git a/server_privileges.php b/server_privileges.php index 14ad7e6..5f2bfca 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2351,7 +2351,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_form .= ' rowspan="' . count($current_privileges) . '"'; } $user_form .= '>' . htmlspecialchars($current_host) . '</td>' . "\n"; - foreach ($current_privileges as $current) { + for ($i = 0; $i < count($current_privileges); $i++) { + $current = $current_privileges[$i]; $user_form .= ' <td>' . "\n" . ' '; if (! isset($current['Db']) || $current['Db'] == '*') { @@ -2381,6 +2382,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs ); $user_form .= '</td>' . "\n" . ' </tr>' . "\n"; + if (($i + 1) < count($current_privileges)) { + $user_form .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n"; + } } if (empty($row) && empty($row1) && empty($row2)) { break;

hooks/post-receive