From c36a9113e0122bf022f823d3db917a855762ecbb Mon Sep 17 00:00:00 2001 From: Jo Michael Date: Sun, 18 Mar 2012 19:53:43 +0100 Subject: [PATCH] Replaced td[align] with td[class] due to HTML5 --- db_printview.php | 26 +++++------ db_qbe.php | 26 +++++------ db_search.php | 8 ++-- db_structure.php | 26 +++++------ js/pmd/history.js | 6 +-- js/server_status_monitor.js | 4 +- libraries/auth/config.auth.lib.php | 2 +- libraries/display_tbl.lib.php | 26 +++++------ libraries/relation.lib.php | 8 ++-- libraries/tbl_properties.inc.php | 4 +- pmd_general.php | 62 ++++++++++++------------- server_binlog.php | 8 ++-- server_collations.php | 2 +- server_export.php | 2 +- server_privileges.php | 4 +- sql.php | 2 +- tbl_change.php | 14 +++--- tbl_create.php | 2 +- tbl_printview.php | 26 +++++------ tbl_relation.php | 2 +- tbl_structure.php | 24 +++++----- themes/original/css/theme_right.css.php | 12 +++++ themes/pmahomme/css/theme_right.css.php | 12 +++++ 23 files changed, 166 insertions(+), 142 deletions(-) diff --git a/db_printview.php b/db_printview.php index 328a900576..70beda080a 100644 --- a/db_printview.php +++ b/db_printview.php @@ -130,7 +130,7 @@ if ($num_tables == 0) { if (isset($sts_data['TABLE_ROWS'])) { ?> - + ' . PMA_formatNumber($sts_data['TABLE_ROWS'], 0) . '' . "\n"; @@ -148,14 +148,14 @@ if ($num_tables == 0) { $sum_size += $tblsize; list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, 1); ?> - + - + - - + + - - + + - - + + - + - + - + -- - + - + @@ -241,7 +241,7 @@ for ($x = 0; $x < $col; $x++) { continue; } ?> - + - + /> - + - + @@ -405,7 +405,7 @@ for ($y = 0; $y <= $row; $y++) { echo "\n"; $or = 'Or' . $w . '[' . $z . ']'; ?> - + - + - + - + - + : />   : @@ -571,7 +571,7 @@ for ($x = 0; $x < $col; $x++) { $chk['or'] = ''; } ?> - + : />   : diff --git a/db_search.php b/db_search.php index a669591b8a..c395425c86 100644 --- a/db_search.php +++ b/db_search.php @@ -278,7 +278,7 @@ if ($GLOBALS['is_ajax_request'] == true) { - + - + - + - + diff --git a/db_structure.php b/db_structure.php index d1198eb9ca..a34e0282af 100644 --- a/db_structure.php +++ b/db_structure.php @@ -408,31 +408,31 @@ foreach ($tables as $keyname => $each_table) { } ?> - + /> - - - + + - + - + href="tbl_change.php?"> - - + + href="sql.php?&reload=1&purge=1&sql_query=&message_to_show= $each_table) { + class="center"> @@ -514,7 +514,7 @@ if ($is_show_stats) { - + ' . __('Replication') . '' . "\n"; } ?> - + 1)) { $default_engine = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1); - echo ' ' . "\n" + echo ' ' . "\n" . ' ' .$default_engine . '' . "\n"; // we got a case where $db_collation was empty - echo ' ' . "\n"; + echo ' ' . "\n"; if (! empty($db_collation)) { echo ' ' . $db_collation diff --git a/js/pmd/history.js b/js/pmd/history.js index edace46c56..844cddbba9 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -73,12 +73,12 @@ function display(init,finit) else { str +=''; } - str +='' + PMA_getImage('b_sbrowse.png', 'column name') + '' + history_array[i].get_column_name(); + str +='' + PMA_getImage('b_sbrowse.png', 'column name') + '' + history_array[i].get_column_name(); if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") { - str += '' + PMA_getImage('b_info.png', detail(i)) + '' + history_array[i].get_type() + '' + PMA_getImage('b_drop.png', 'Delete') + ''; + str += '' + PMA_getImage('b_info.png', detail(i)) + '' + history_array[i].get_type() + '' + PMA_getImage('b_drop.png', 'Delete') + ''; } else { - str += '' + PMA_getImage('b_info.png', detail(i)) + '' + history_array[i]. get_type() + '' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + ''; + str += '' + PMA_getImage('b_info.png', detail(i)) + '' + history_array[i]. get_type() + '' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + ''; } i++; if(i >= history_array.length) { diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 15af4d1a27..56044f0744 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1581,7 +1581,7 @@ $(function() { $('div#logTable table tfoot tr') .html('' + PMA_messages['strSumRows'] + ' ' + rowSum + '' + - PMA_messages['strTotal'] + '' + totalSum + ''); + PMA_messages['strTotal'] + '' + totalSum + ''); } } @@ -1658,7 +1658,7 @@ $(function() { $table.append('' + '' + PMA_messages['strSumRows'] + ' ' + data.numRows + '' + PMA_messages['strTotal'] + - '' + data.sum.TOTAL + ''); + '' + data.sum.TOTAL + ''); // Append a tooltip to the count column, if there exist one if ($('#logTable th:last').html() == '#') { diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index dcf9a15bb1..162d93f728 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -86,7 +86,7 @@ function PMA_auth_fails()


- +
'; + return ''; } /** @@ -1556,15 +1556,15 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // so use the $pointer if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"'); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay('right '.$class, $condition_field, $meta, ''); } elseif ($row[$i] != '') { $nowrap = ' nowrap'; $where_comparison = ' = ' . $row[$i]; - $vertical_display['data'][$row_no][$i] = ''; } @@ -2963,11 +2963,11 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { $ret = ''; if (! empty($del_url)) { - $ret .= ''; } diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 14e3f1087f..35c8381b5c 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -116,7 +116,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) PMA_printDiagMessageForFeature(__('Browser transformation'), 'mimework', $messages); if ($cfgRelation['commwork'] && ! $cfgRelation['mimework']) { - echo '' . "\n"; + echo '' . "\n"; } PMA_printDiagMessageForParameter('bookmarktable', isset($cfgRelation['bookmark']), $messages, 'bookmark'); @@ -170,7 +170,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) */ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $messages, $skip_line=true) { - echo ' ' . "\n"; if ($skip_line) { @@ -190,8 +190,8 @@ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $mes */ function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $messages, $doc_anchor) { - echo ' ' . "\n"; } diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 9a20ce5406..8a30f2ef32 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -605,7 +605,7 @@ if (is_array($content_cells) && is_array($header_cells)) { if (is_array($content_row)) { foreach ($content_row as $content_row_val) { ?> - + ' . $content_row_val . ''; + $new_field .= ''; } ?>
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 73fbc1a373..98d9fe8943 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1146,7 +1146,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ */ function PMA_buildValueDisplay($class, $condition_field, $value) { - return '' . $value . '' . $value . '' @@ -2902,7 +2902,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher { $ret = ''; if (! empty($edit_url)) { - $ret .= '' + $ret .= '' . PMA_linkOrButton($edit_url, $edit_str, array(), false); /* * Where clause for selecting this row uniquely is provided as @@ -2931,18 +2931,18 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause { $ret = ''; if (! empty($copy_url)) { - $ret .= '' + $ret .= 'center" ' . ' >' . PMA_linkOrButton($copy_url, $copy_str, array(), false); /* * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling grid editing */ if (! empty($where_clause)) { - $ret .= ''; + $ret .= ''; } $ret .= '' + $ret .= 'center" ' . ' >' . PMA_linkOrButton($del_url, $del_str, $js_conf, false) . '
' . __('Please see the documentation on how to update your column_comments table') . '
' . __('Please see the documentation on how to update your column_comments table') . '
' . $feature_name . ': ' + echo '
' . $feature_name . ': ' . ($GLOBALS['cfgRelation'][$relation_parameter] ? $messages['enabled'] : $messages['disabled']) . '
'; - echo '$cfg[\'Servers\'][$i][\'' . $parameter . '\'] ... '; + echo '
'; + echo '$cfg[\'Servers\'][$i][\'' . $parameter . '\'] ... '; echo ($relation_parameter_set ? $messages['ok'] : sprintf($messages['error'], $doc_anchor)) . '
' . $content_row_val . '