diff --git a/ChangeLog b/ChangeLog index e640b8088e..52860b0300 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - bug #4626 Ctrl + click on a column not in sort triggers a server call to erroneous url - bug #4625 "Insufficient space to save the file" on export SQL to file on server - bug #4627 "file_get_contents(examples/create_tables.sql): failed to open stream" after update +- bug #4617 UI issues with sortable tables 4.3.0.0 (2014-12-05) + rfe #1502 Smart sorting for int keys diff --git a/js/server_status_sorter.js b/js/server_status_sorter.js index 53330402e2..357fb72205 100644 --- a/js/server_status_sorter.js +++ b/js/server_status_sorter.js @@ -13,16 +13,6 @@ function initTableSorter(tabid) { } }; break; - case 'statustabs_allvars': - $table = $('#serverstatusvariables'); - opts = { - sortList: [[0, 0]], - widgets: ['fast-zebra'], - headers: { - 1: { sorter: 'withinSpanNumber' } - } - }; - break; } $table.tablesorter(opts); $table.find('tr:first th') diff --git a/js/server_status_variables.js b/js/server_status_variables.js index 410d8cd06e..8616ba9024 100644 --- a/js/server_status_variables.js +++ b/js/server_status_variables.js @@ -22,7 +22,6 @@ AJAX.registerOnload('server_status_variables.js', function () { 'th', PMA_messages.strSortHint ); - initTableSorter('statustabs_allvars'); // Filters for status variables var textFilter = null; diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index 792f0c383c..3b76702007 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -626,19 +626,19 @@ function PMA_getCentralColumnsTableHeader($class='', $title='', $actionCount=0) . $action . '' . '' - . __('Name') . '' + . __('Name') . '
' . '' - . __('Type') . '' + . __('Type') . '
' . '' - . __('Length/Values') . '' + . __('Length/Values') . '
' . '' . __('Collation') . '' + . '>' . __('Collation') . '
' . '' - . __('Null') . '' + . __('Null') . '
' . '' - . __('Extra') . '' + . __('Extra') . '
' . '' - . __('Default') . '' + . __('Default') . '
' . ''; $tableheader .= ''; return $tableheader; diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php index 87366319ba..b6f9c72313 100644 --- a/libraries/server_status_queries.lib.php +++ b/libraries/server_status_queries.lib.php @@ -90,13 +90,14 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData) $retval .= ''; $retval .= ''; $retval .= ''; - $retval .= '' . __('Statements') . ''; + $retval .= '' . __('Statements') . '
'; $retval .= ''; /* l10n: # = Amount of queries */ $retval .= __('#'); - $retval .= ''; - $retval .= 'ø ' . __('per hour') . ''; - $retval .= '%'; + $retval .= '
'; + $retval .= 'ø ' . __('per hour') + . '
'; + $retval .= '%
'; $retval .= ''; $retval .= ''; $retval .= ''; diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php index 98ee527e57..29e4ba914e 100644 --- a/libraries/server_status_variables.lib.php +++ b/libraries/server_status_variables.lib.php @@ -210,7 +210,7 @@ function PMA_getHtmlForVariablesList($ServerStatusData) */ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatus) { - $retval = ''; + $retval = '
'; $retval .= ''; $retval .= ''; $retval .= ''; diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 7999708bd8..6aff4b73ed 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -1183,29 +1183,6 @@ div#profilingchart { left: 11px; bottom:24px; } - -#profilesummarytable th.header, #profiletable th.header{ - cursor: pointer; -} - -#profilesummarytable th.header .sorticon, #profiletable th.header .sorticon{ - width: 16px; - height: 16px; - background-repeat: no-repeat; - background-position: right center; - display: inline-block; - vertical-align: middle; - float: right; -} - -#profilesummarytable th.headerSortUp .sorticon, #profiletable th.headerSortUp .sorticon{ - background-image: url(getImgPath('s_desc.png');?>); -} - -#profilesummarytable th.headerSortDown .sorticon, #profiletable th.headerSortDown .sorticon{ - background-image: url(getImgPath('s_asc.png');?>); -} - /* end profiling */ /* querybox */ @@ -3090,3 +3067,32 @@ span.drag_icon { .topmargin { margin-top: 1em; } + +/* styles for sortable tables created with tablesorter jquery plugin */ +th.header { + cursor: pointer; + color: #0000FF; +} + +th.header:hover { + text-decoration: underline; +} + +th.header .sorticon { + width: 16px; + height: 16px; + background-repeat: no-repeat; + background-position: right center; + display: inline-table; + vertical-align: middle; + float: right; +} + +th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon { + background-image: url(getImgPath('s_desc.png');?>); +} + +th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon { + background-image: url(getImgPath('s_asc.png');?>); +} +/* end of styles of sortable tables */ \ No newline at end of file diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index b8ee12ea7a..a02886ba50 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -1563,29 +1563,6 @@ div#profilingchart { left: 11px; bottom:24px; } - -#profilesummarytable th.header, #profiletable th.header{ - cursor: pointer; -} - -#profilesummarytable th.header .sorticon, #profiletable th.header .sorticon{ - width: 16px; - height: 16px; - background-repeat: no-repeat; - background-position: right center; - display: inline-block; - vertical-align: middle; - float: right; -} - -#profilesummarytable th.headerSortUp .sorticon, #profiletable th.headerSortUp .sorticon{ - background-image: url(getImgPath('s_desc.png');?>); -} - -#profilesummarytable th.headerSortDown .sorticon, #profiletable th.headerSortDown .sorticon{ - background-image: url(getImgPath('s_asc.png');?>); -} - /* end profiling */ /* table charting */ @@ -3410,4 +3387,33 @@ span.drag_icon { .topmargin { margin-top: 1em; -} \ No newline at end of file +} + +/* styles for sortable tables created with tablesorter jquery plugin */ +th.header { + cursor: pointer; + color: #235a81; +} + +th.header:hover { + text-decoration: underline; +} + +th.header .sorticon { + width: 16px; + height: 16px; + background-repeat: no-repeat; + background-position: right center; + display: inline-table; + vertical-align: middle; + float: right; +} + +th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon { + background-image: url(getImgPath('s_desc.png');?>); +} + +th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon { + background-image: url(getImgPath('s_asc.png');?>); +} +/* end of styles of sortable tables */ \ No newline at end of file