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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-03-18 08:44:13 +01:00
commit 392ee68b83
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_central_columns.php
View File

@ -130,7 +130,7 @@ $tableheader = PMA_getCentralColumnsTableHeader(
);
$response->addHTML($tableheader);
$result = PMA_getColumnsList($db, $pos, $max_rows);
$odd_row = false;
$odd_row = true;
$row_num=0;
foreach ($result as $row) {
$tableHtmlRow = PMA_getHTMLforCentralColumnsTableRow(

1
js/db_central_columns.js
View File

@ -23,7 +23,6 @@ AJAX.registerTeardown('db_central_columns.js', function () {
$(".del_row").unbind('click');
$(document).off("keyup", ".filter_rows");
$('.edit_cancel_form').unbind('click');
$('.column_heading').unbind('mouseenter');
$('#table-select').unbind('change');
$('#column-select').unbind('change');
$("#add_col_div>a").unbind('click');

2
js/sql.js
View File

@ -582,7 +582,7 @@ function PMA_changeClassForColumn($this_th, newclass, isAddClass)
{
// index 0 is the th containing the big T
var th_index = $this_th.index();
var has_big_t = !$this_th.closest('tr').children(':first').hasClass('column_heading');
var has_big_t = $this_th.closest('tr').children(':first').hasClass('column_action');
// .eq() is zero-based
if (has_big_t) {
th_index--;

8
libraries/DisplayResults.class.php
View File

@ -1429,7 +1429,7 @@ class PMA_DisplayResults
= (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
$button_html .= '<th ' . $colspan . '>'
$button_html .= '<th class="column_action" ' . $colspan . '>'
. $full_or_partial_text_link . '</th>';
} elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
@ -1448,7 +1448,7 @@ class PMA_DisplayResults
} elseif (($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_NONE)) {
// ... elseif display an empty column if the actions links are
// disabled to match the rest of the table
$button_html .= '<th></th>';
$button_html .= '<th class="column_action"></th>';
}
$this->__set('vertical_display', $vertical_display);
@ -2203,7 +2203,7 @@ class PMA_DisplayResults
* column header's alignment right
*
* @param array $fields_meta set of field properties
* @param array &$th_class array containing classes
* @param array &$th_class array containing classes
*
* @return void
*
@ -2348,7 +2348,7 @@ class PMA_DisplayResults
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
$right_column_html .= "\n"
. '<th ' . $colspan . '>' . $full_or_partial_text_link
. '<th class="column_action" ' . $colspan . '>' . $full_or_partial_text_link
. '</th>';
} elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)

3
libraries/central_columns.lib.php
View File

@ -682,7 +682,8 @@ function PMA_getCentralColumnsTableHeader($class='', $title='', $actionCount=0)
{
$action = '';
if ($actionCount > 0) {
$action .= '<th colspan="' . $actionCount . '">' . __('Action') . '</th>';
$action .= '<th class="column_action" colspan="' . $actionCount . '">'
. __('Action') . '</th>';
}
$tableheader = '<thead>';
$tableheader .= '<tr>'

8
libraries/server_privileges.lib.php
View File

@ -2293,8 +2293,12 @@ function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db)
. ($odd_row ? 'odd' : 'even') . '">';
$value = htmlspecialchars($current_user . '&amp;#27;' . $current_host);
$html_output .= '<td>'
. '<input type="checkbox" class="checkall" name="selected_usr[]" '
$html_output .= '<td';
if ($nbPrivileges > 1) {
$html_output .= ' rowspan="' . $nbPrivileges . '"';
}
$html_output .= '>';
$html_output .= '<input type="checkbox" class="checkall" name="selected_usr[]" '
. 'id="checkbox_sel_users_' . ($index_checkbox++) . '" '
. 'value="' . $value . '" /></td>' . "\n";