Skip to content

Commit

Permalink
Replaced td[align] with td[class] due to HTML5
Browse files Browse the repository at this point in the history
  • Loading branch information
@mynetx
mynetx committed Mar 18, 2012
1 parent 9842f01 commit c36a911
Show file tree
Hide file tree
Showing 23 changed files with 166 additions and 142 deletions.
26 changes: 13 additions & 13 deletions db_printview.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@

if (isset($sts_data['TABLE_ROWS'])) {
?>
<td align="right">
<td class="right">
<?php
if ($merged_size) {
echo '<i>' . PMA_formatNumber($sts_data['TABLE_ROWS'], 0) . '</i>' . "\n";
Expand All @@ -148,14 +148,14 @@
$sum_size += $tblsize;
list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, 1);
?>
<td align="right" nowrap="nowrap">
<td class="right" nowrap="nowrap">
<?php echo $formated_size . ' ' . $unit; ?>
</td>
<?php
} // end if
} else {
?>
<td colspan="3" align="center">
<td colspan="3" class="center">
<?php echo __('in use'); ?>
</td>
<?php
Expand All @@ -181,26 +181,26 @@
if (! empty($sts_data['Create_time'])) {
?>
<tr>
<td align="right"><?php echo __('Creation') . ': '; ?></td>
<td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Create_time'])); ?></td>
<td class="right"><?php echo __('Creation') . ': '; ?></td>
<td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Create_time'])); ?></td>
</tr>
<?php
}

if (! empty($sts_data['Update_time'])) {
?>
<tr>
<td align="right"><?php echo __('Last update') . ': '; ?></td>
<td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Update_time'])); ?></td>
<td class="right"><?php echo __('Last update') . ': '; ?></td>
<td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Update_time'])); ?></td>
</tr>
<?php
}

if (! empty($sts_data['Check_time'])) {
?>
<tr>
<td align="right"><?php echo __('Last check') . ': '; ?></td>
<td align="right"><?php echo PMA_localisedDate(strtotime($sts_data['Check_time'])); ?></td>
<td class="right"><?php echo __('Last check') . ': '; ?></td>
<td class="right"><?php echo PMA_localisedDate(strtotime($sts_data['Check_time'])); ?></td>
</tr>
<?php
}
Expand All @@ -215,20 +215,20 @@
}
?>
<tr>
<th align="center">
<th class="center">
<?php echo sprintf(_ngettext('%s table', '%s tables', $num_tables), PMA_formatNumber($num_tables, 0)); ?>
</th>
<th align="right" nowrap="nowrap">
<th class="right" nowrap="nowrap">
<?php echo PMA_formatNumber($sum_entries, 0); ?>
</th>
<th align="center">
<th class="center">
--
</th>
<?php
if ($cfg['ShowStats']) {
list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1);
?>
<th align="right" nowrap="nowrap">
<th class="right" nowrap="nowrap">
<?php echo $sum_formated . ' ' . $unit; ?>
</th>
<?php
Expand Down
26 changes: 13 additions & 13 deletions db_qbe.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
function showColumnSelectCell($columns, $column_number, $selected = '')
{
?>
<td align="center">
<td class="center">
<select name="Field[<?php echo $column_number; ?>]" size="1">
<option value="">&nbsp;</option>
<?php
Expand Down Expand Up @@ -225,7 +225,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?>
<td align="center">
<td class="center">
<select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
<option value="">&nbsp;</option>
<option value="ASC"><?php echo __('Ascending'); ?></option>
Expand All @@ -241,7 +241,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
continue;
}
?>
<td align="center">
<td class="center">
<select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
<option value="">&nbsp;</option>
<?php
Expand Down Expand Up @@ -289,7 +289,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?>
<td align="center">
<td class="center">
<input type="checkbox" name="Show[<?php echo $z; ?>]" />
</td>
<?php
Expand All @@ -307,7 +307,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
$checked = '';
}
?>
<td align="center">
<td class="center">
<input type="checkbox" name="Show[<?php echo $z; ?>]"<?php echo $checked; ?> />
</td>
<?php
Expand All @@ -325,7 +325,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
for ($x = 0; $x < $col; $x++) {
if (!empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
?>
<td align="center">
<td class="center">
<input type="text" name="criteria[<?php echo $z; ?>]" value="" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
Expand All @@ -346,7 +346,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
$curCriteria[$z] = $prev_criteria[$x];
}
?>
<td align="center">
<td class="center">
<input type="hidden" name="prev_criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($curCriteria[$z]); ?>" />
<input type="text" name="criteria[<?php echo $z; ?>]" value="<?php echo htmlspecialchars($tmp_criteria); ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
Expand Down Expand Up @@ -405,7 +405,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
echo "\n";
$or = 'Or' . $w . '[' . $z . ']';
?>
<td align="center">
<td class="center">
<input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
Expand All @@ -418,7 +418,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
echo "\n";
$or = 'Or' . $w . '[' . $z . ']';
?>
<td align="center">
<td class="center">
<input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
Expand Down Expand Up @@ -485,7 +485,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
echo "\n";
$or = 'Or' . $w . '[' . $z . ']';
?>
<td align="center">
<td class="center">
<input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
Expand All @@ -506,7 +506,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
$tmp_or = '';
}
?>
<td align="center">
<td class="center">
<input type="text" name="Or<?php echo $w . '[' . $z . ']'; ?>" value="<?php echo htmlspecialchars($tmp_or); ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" />
</td>
<?php
Expand Down Expand Up @@ -540,7 +540,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
$chk['or'] = '';
}
?>
<td align="center">
<td class="center">
<strong><?php echo __('Or'); ?>:</strong>
<input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp;&nbsp;<strong><?php echo __('And'); ?>:</strong>
Expand Down Expand Up @@ -571,7 +571,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
$chk['or'] = '';
}
?>
<td align="center">
<td class="center">
<strong><?php echo __('Or'); ?>:</strong>
<input type="radio" name="and_or_col[<?php echo $z; ?>]" value="or"<?php echo $chk['or']; ?> />
&nbsp;&nbsp;<strong><?php echo __('And'); ?>:</strong>
Expand Down
8 changes: 4 additions & 4 deletions db_search.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function PMA_getSearchSqls($table, $field, $search_str, $search_option)
<td><input type="text" name="search_str" size="60"
value="<?php echo $searched; ?>" /></td>
</tr>
<tr><td align="right" valign="top">
<tr><td class="right" valign="top">
<?php echo __('Find:'); ?></td>
<td><?php

Expand All @@ -296,7 +296,7 @@ function PMA_getSearchSqls($table, $field, $search_str, $search_option)
?>
</td>
</tr>
<tr><td align="right" valign="top">
<tr><td class="right" valign="top">
<?php echo __('Inside tables:'); ?></td>
<td rowspan="2">
<?php
Expand All @@ -323,10 +323,10 @@ function PMA_getSearchSqls($table, $field, $search_str, $search_option)
?>
</td>
</tr>
<tr><td align="right" valign="bottom">
<tr><td class="right" valign="bottom">
<?php echo $alter_select; ?></td>
</tr>
<tr><td align="right">
<tr><td class="right">
<?php echo __('Inside column:'); ?></td>
<td><input type="text" name="field_str" size="60"
value="<?php echo ! empty($field_str) ? htmlspecialchars($field_str) : ''; ?>" /></td>
Expand Down
26 changes: 13 additions & 13 deletions db_structure.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,31 +408,31 @@
}
?>
<tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
<td align="center">
<td class="center">
<input type="checkbox" name="selected_tbl[]"
value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>"
id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td>
<th><?php echo $browse_table_label; ?>
<?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?>
</th>
<?php if ($server_slave_status) { ?><td align="center"><?php
<?php if ($server_slave_status) { ?><td class="center"><?php
echo $ignored
? PMA_getImage('s_cancel.png', 'NOT REPLICATED')
: ''.
$do
? PMA_getImage('s_success.png', 'REPLICATED')
: ''; ?></td><?php } ?>
<td align="center"><?php echo $browse_table; ?></td>
<td align="center">
<td class="center"><?php echo $browse_table; ?></td>
<td class="center">
<a href="tbl_structure.php?<?php echo $tbl_url_query; ?>">
<?php echo $titles['Structure']; ?></a></td>
<td align="center"><?php echo $search_table; ?></td>
<td class="center"><?php echo $search_table; ?></td>
<?php if (! $db_is_information_schema) { ?>
<td align="center" class="insert_table">
<td class="insert_table center">
<a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="ajax"' : ''); ?> href="tbl_change.php?<?php echo $tbl_url_query; ?>">
<?php echo $titles['Insert']; ?></a></td>
<td align="center"><?php echo $empty_table; ?></td>
<td align="center">
<td class="center"><?php echo $empty_table; ?></td>
<td class="center">
<a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="drop_table_anchor"' : ''); ?> href="sql.php?<?php echo $tbl_url_query;
?>&amp;reload=1&amp;purge=1&amp;sql_query=<?php
echo urlencode($drop_query); ?>&amp;message_to_show=<?php
Expand Down Expand Up @@ -497,7 +497,7 @@
<?php } ?>
<?php } else { ?>
<td colspan="<?php echo ($colspan_for_structure - ($db_is_information_schema ? 5 : 8)) ?>"
align="center">
class="center">
<?php echo __('in use'); ?></td>
<?php } // end if (isset($each_table['TABLE_ROWS'])) else ?>
</tr>
Expand All @@ -514,7 +514,7 @@
</tbody>
<tbody id="tbl_summary_row">
<tr><th></th>
<th align="center" nowrap="nowrap" class="tbl_num">
<th nowrap="nowrap" class="tbl_num center">
<?php
echo sprintf(
_ngettext('%s table', '%s tables', $num_tables),
Expand All @@ -527,18 +527,18 @@
echo ' <th>' . __('Replication') . '</th>' . "\n";
}
?>
<th colspan="<?php echo ($db_is_information_schema ? 3 : 6) ?>" align="center">
<th colspan="<?php echo ($db_is_information_schema ? 3 : 6) ?>" class="center">
<?php echo __('Sum'); ?></th>
<th class="value tbl_rows"><?php echo $sum_row_count_pre . PMA_formatNumber($sum_entries, 0); ?></th>
<?php
if (!($cfg['PropertiesNumColumns'] > 1)) {
$default_engine = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1);
echo ' <th align="center">' . "\n"
echo ' <th class="center">' . "\n"
. ' <dfn title="'
. sprintf(__('%s is the default storage engine on this MySQL server.'), $default_engine)
. '">' .$default_engine . '</dfn></th>' . "\n";
// we got a case where $db_collation was empty
echo ' <th align="center">' . "\n";
echo ' <th class="center">' . "\n";
if (! empty($db_collation)) {
echo ' <dfn title="'
. PMA_getCollationDescr($db_collation) . ' (' . __('Default') . ')">' . $db_collation
Expand Down
6 changes: 3 additions & 3 deletions js/pmd/history.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ function display(init,finit)
else {
str +='<img src="' + pmaThemeImage + 'pmd/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>';
}
str +='<td style="padding-left: 5px;" align="right">' + PMA_getImage('b_sbrowse.png', 'column name') + '</td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
str +='<td style="padding-left: 5px;" class="right">' + PMA_getImage('b_sbrowse.png', 'column name') + '</td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {
str += '</td><td align="center">' + PMA_getImage('b_info.png', detail(i)) + '<td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')>' + PMA_getImage('b_drop.png', 'Delete') + '</td></tr></thead>';
str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '<td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')>' + PMA_getImage('b_drop.png', 'Delete') + '</td></tr></thead>';
}
else {
str += '</td><td align="center">' + PMA_getImage('b_info.png', detail(i)) + '</td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')>' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + '</td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '</td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')>' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + '</td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
}
i++;
if(i >= history_array.length) {
Expand Down
4 changes: 2 additions & 2 deletions js/server_status_monitor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,7 @@ $(function() {
$('div#logTable table tfoot tr')
.html('<th colspan="' + (runtime.logDataCols.length - 1) + '">' +
PMA_messages['strSumRows'] + ' ' + rowSum + '<span style="float:right">' +
PMA_messages['strTotal'] + '</span></th><th align="right">' + totalSum + '</th>');
PMA_messages['strTotal'] + '</span></th><th class="right">' + totalSum + '</th>');
}
}

Expand Down Expand Up @@ -1658,7 +1658,7 @@ $(function() {
$table.append('<tfoot>' +
'<tr><th colspan="' + (cols.length - 1) + '">' + PMA_messages['strSumRows'] +
' ' + data.numRows + '<span style="float:right">' + PMA_messages['strTotal'] +
'</span></th><th align="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
'</span></th><th class="right">' + data.sum.TOTAL + '</th></tr></tfoot>');

// Append a tooltip to the count column, if there exist one
if ($('#logTable th:last').html() == '#') {
Expand Down
2 changes: 1 addition & 1 deletion libraries/auth/config.auth.lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function PMA_auth_fails()
<h1><?php echo sprintf(__('Welcome to %s'), ' phpMyAdmin '); ?></h1>
</center>
<br />
<table cellpadding="0" cellspacing="3" align="center" width="80%">
<table cellpadding="0" cellspacing="3" style="margin: 0 auto" width="80%">
<tr>
<td>

Expand Down
Loading

0 comments on commit c36a911

Please sign in to comment.