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:
Michal Čihař 2012-03-31 16:50:56 +02:00
commit e68af2fd66
17 changed files with 143 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation.html
View File

@ -118,7 +118,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
title="International Electrotechnical Commission">IEC</abbr> 26300 -
OpenDocument Text and Spreadsheet,
<abbr title="Microsoft Word 2000">Word</abbr>,
and L<sup>A</sup>T<sub><big>E</big></sub>X formats
and L<sup>A</sup>T<sub><em class="big">E</em></sub>X formats
</li>
<li>import data and MySQL structures from OpenDocument spreadsheets, as well as <abbr title="Extensible Markup Language">XML</abbr>, <abbr title="Comma Separated Values">CSV</abbr>, and <abbr title="Server Query Language">SQL</abbr> files</li>
<li>administer multiple servers</li>
@ -180,14 +180,14 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
</p>
<p class="important">
Warning for <acronym title="Apple Macintosh">Mac</acronym> users:<br />
if you are on a <acronym title="Apple Macintosh">Mac</acronym>
Warning for <abbr title="Apple Macintosh">Mac</abbr> users:<br />
if you are on a <abbr title="Apple Macintosh">Mac</abbr>
<abbr title="operating system">OS</abbr> version before
<abbr title="operating system">OS</abbr> X, StuffIt unstuffs with
<acronym title="Apple Macintosh">Mac</acronym> formats.<br />
<abbr title="Apple Macintosh">Mac</abbr> formats.<br />
So you'll have to resave as in BBEdit to Unix style ALL phpMyAdmin scripts
before uploading them to your server, as PHP seems not to like
<acronym title="Apple Macintosh">Mac</acronym>-style end of lines character
<abbr title="Apple Macintosh">Mac</abbr>-style end of lines character
(&quot;<code>\r</code>&quot;).</p>
<h3 id="quick_install">Quick Install</h3>
@ -565,9 +565,9 @@ since this link provides funding for phpMyAdmin.
<!-- CONFIGURATION -->
<h2 id="config">Configuration</h2>
<p> <span class="important">Warning for <acronym title="Apple Macintosh">Mac</acronym>
<p> <span class="important">Warning for <abbr title="Apple Macintosh">Mac</abbr>
users:</span> PHP does not seem to like
<acronym title="Apple Macintosh">Mac</acronym> end of lines character
<abbr title="Apple Macintosh">Mac</abbr> end of lines character
(&quot;<code>\r</code>&quot;). So ensure you choose the option that allows to use
the *nix end of line character (&quot;<code>\n</code>&quot;) in your text editor
before saving a script you have modified.</p>
@ -3833,7 +3833,7 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
recent versions of the most browsers.</p>
<h4 id="faq5_12">
<a href="#faq5_12">5.12 <acronym title="Apple Macintosh">Mac</acronym> <abbr title="operating system">OS</abbr> X: Safari browser changes special characters to
<a href="#faq5_12">5.12 <abbr title="Apple Macintosh">Mac</abbr> <abbr title="operating system">OS</abbr> X: Safari browser changes special characters to
&quot;?&quot;.</a></h4>
<p> This issue has been reported by a <abbr title="operating system">OS</abbr> X user, who adds that Chimera,
@ -4274,10 +4274,10 @@ INSERT INTO REL_towns VALUES ('M', 'Montr&eacute;al');
positioned &quot;/**/&quot; comments.</p>
<h4 id="faq6_19">
<a href="#faq6_19">6.19 How can I create simple L<sup>A</sup>T<sub><big>E</big></sub>X document to
<a href="#faq6_19">6.19 How can I create simple L<sup>A</sup>T<sub><em class="big">E</em></sub>X document to
include exported table?</a></h4>
<p> You can simply include table in your L<sup>A</sup>T<sub><big>E</big></sub>X documents, minimal sample
<p> You can simply include table in your L<sup>A</sup>T<sub><em class="big">E</em></sub>X documents, minimal sample
document should look like following one (assuming you have table
exported in file <code>table.tex</code>):</p>
@ -5110,12 +5110,12 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, &quot;Manuzhai&quot;.
photographic images.</li>
<li>JPG - look at <a href="#jpeg">JPEG</a>.</li>
<li>Key - look at <a href="#glossar_index">index</a>.</li>
<li><a href="http://www.wikipedia.org/wiki/LaTeX">L<sup>A</sup>T<sub><big>E</big></sub>X</a>
<li><a href="http://www.wikipedia.org/wiki/LaTeX">L<sup>A</sup>T<sub><em class="big">E</em></sub>X</a>
- a document preparation system for the T<sub>E</sub>X typesetting program.</li>
<li><a href="http://www.wikipedia.org/wiki/Mac">Mac (Apple Macintosh)</a>
- line of personal computers is designed, developed, manufactured, and
marketed by Apple Computer.</li>
<li><a id="glossar_mac_os_x" href="http://www.wikipedia.org/wiki/Mac_OS_X"><acronym title="Apple Macintosh">Mac</acronym> <abbr title="operating system">OS</abbr> X</a>
<li><a id="glossar_mac_os_x" href="http://www.wikipedia.org/wiki/Mac_OS_X"><abbr title="Apple Macintosh">Mac</abbr> <abbr title="operating system">OS</abbr> X</a>
- the operating system which is included with all currently shipping Apple
Macintosh computers in the consumer and professional markets.</li>
<li><a href="http://www.wikipedia.org/wiki/MCrypt">MCrypt</a>
@ -5136,7 +5136,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, &quot;Manuzhai&quot;.
<li><a href="http://www.wikipedia.org/wiki/OpenDocument">OpenDocument</a>
- open standard for office documents.</li>
<li><a href="http://www.wikipedia.org/wiki/OS_X"><abbr title="operating system">OS</abbr> X</a>
- look at <a href="#glossar_mac_os_x"><acronym title="Apple Macintosh">Mac</acronym> <abbr title="operating system">OS</abbr> X</a>.</li>
- look at <a href="#glossar_mac_os_x"><abbr title="Apple Macintosh">Mac</abbr> <abbr title="operating system">OS</abbr> X</a>.</li>
<li><a href="http://www.wikipedia.org/wiki/Portable_Document_Format">PDF
(Portable Document Format)</a>
- a file format developed by Adobe Systems for representing two

4
browse_foreigners.php
View File

@ -249,7 +249,7 @@ if (is_array($foreignData['disp_row'])) {
?>
<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
<td nowrap="nowrap">
<td class="nowrap">
<?php
echo ($key_ordered_current_equals_data ? '<strong>' : '')
.'<a href="#" title="' . __('Use this value')
@ -278,7 +278,7 @@ if (is_array($foreignData['disp_row'])) {
. '\', \'' . PMA_jsFormat($val_ordered_current_key, false) . '\'); return false;">'
. $val_ordered_current_val . '</a>' . ($val_ordered_current_equals_data ? '</strong>' : '');
?></td>
<td nowrap="nowrap">
<td class="nowrap">
<?php
echo ($val_ordered_current_equals_data ? '<strong>' : '') . '<a href="#" title="'
. __('Use this value') . ($val_ordered_current_val_title != '' ? ': ' . $val_ordered_current_val_title : '')

4
db_datadict.php
View File

@ -189,7 +189,7 @@ foreach ($tables as $table) {
$type_nowrap = '';
} else {
$type_nowrap = ' nowrap="nowrap"';
$type_nowrap = ' class="nowrap"';
}
$type = htmlspecialchars($extracted_fieldspec['print_type']);
$attribute = $extracted_fieldspec['attribute'];
@ -219,7 +219,7 @@ foreach ($tables as $table) {
}
?>
<tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
<td nowrap="nowrap">
<td class="nowrap">
<?php
if (isset($pk_array[$row['Field']])) {
echo '<u>' . htmlspecialchars($field_name) . '</u>';

8
db_printview.php
View File

@ -139,7 +139,7 @@ if ($num_tables == 0) {
}
?>
</td>
<td nowrap="nowrap">
<td class="nowrap">
<?php echo $sts_data['ENGINE']; ?>
</td>
<?php
@ -148,7 +148,7 @@ if ($num_tables == 0) {
$sum_size += $tblsize;
list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, 1);
?>
<td class="right" nowrap="nowrap">
<td class="right nowrap">
<?php echo $formated_size . ' ' . $unit; ?>
</td>
<?php
@ -218,7 +218,7 @@ if ($num_tables == 0) {
<th class="center">
<?php echo sprintf(_ngettext('%s table', '%s tables', $num_tables), PMA_formatNumber($num_tables, 0)); ?>
</th>
<th class="right" nowrap="nowrap">
<th class="right nowrap">
<?php echo PMA_formatNumber($sum_entries, 0); ?>
</th>
<th class="center">
@ -228,7 +228,7 @@ if ($num_tables == 0) {
if ($cfg['ShowStats']) {
list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1);
?>
<th class="right" nowrap="nowrap">
<th class="right nowrap">
<?php echo $sum_formated . ' ' . $unit; ?>
</th>
<?php

16
db_qbe.php
View File

@ -367,11 +367,11 @@ for ($y = 0; $y <= $row; $y++) {
$chk['and'] = '';
?>
<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
<td class="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<td class="<?php echo $cell_align_right; ?> nowrap">
<!-- Row controls -->
<table cellpadding="0" cellspacing="0" border="0">
<tr>
<td class="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<td class="<?php echo $cell_align_right; ?> nowrap">
<small><?php echo __('Ins'); ?>:</small>
<input type="checkbox" name="ins_row[<?php echo $w; ?>]" />
</td>
@ -384,7 +384,7 @@ for ($y = 0; $y <= $row; $y++) {
</td>
</tr>
<tr>
<td class="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<td class="<?php echo $cell_align_right; ?> nowrap">
<small><?php echo __('Del'); ?>:</small>
<input type="checkbox" name="del_row[<?php echo $w; ?>]" />
</td>
@ -449,11 +449,11 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n";
?>
<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
<td class="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<td class="<?php echo $cell_align_right; ?> nowrap">
<!-- Row controls -->
<table cellpadding="0" cellspacing="0">
<tr>
<td class="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<td class="<?php echo $cell_align_right; ?> nowrap">
<small><?php echo __('Ins'); ?>:</small>
<input type="checkbox" name="ins_row[<?php echo $w; ?>]" />
</td>
@ -465,7 +465,7 @@ for ($y = 0; $y <= $row; $y++) {
</td>
</tr>
<tr>
<td class="<?php echo $cell_align_right; ?>" nowrap="nowrap">
<td class="<?php echo $cell_align_right; ?> nowrap">
<small><?php echo __('Del'); ?>:</small>
<input type="checkbox" name="del_row[<?php echo $w; ?>]" />
</td>
@ -602,7 +602,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
<fieldset class="tblFooters">
<table cellpadding="2" cellspacing="1">
<tr>
<td nowrap="nowrap">
<td class="nowrap">
<?php echo __('Add/Delete criteria rows'); ?>:
<select size="1" name="add_row">
<option value="-3">-3</option>
@ -615,7 +615,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
</select>
</td>
<td width="10">&nbsp;</td>
<td nowrap="nowrap"><?php echo __('Add/Delete columns'); ?>:
<td class="nowrap"><?php echo __('Add/Delete columns'); ?>:
<select size="1" name="add_col">
<option value="-3">-3</option>
<option value="-2">-2</option>

6
db_structure.php
View File

@ -475,9 +475,9 @@ foreach ($tables as $keyname => $each_table) {
?>
<td class="value tbl_rows"><?php echo $row_count_pre . PMA_formatNumber($each_table['TABLE_ROWS'], 0) . $show_superscript; ?></td>
<?php if (!($cfg['PropertiesNumColumns'] > 1)) { ?>
<td nowrap="nowrap"><?php echo ($table_is_view ? __('View') : $each_table['ENGINE']); ?></td>
<td class="nowrap"><?php echo ($table_is_view ? __('View') : $each_table['ENGINE']); ?></td>
<?php if (isset($collation)) { ?>
<td nowrap="nowrap"><?php echo $collation ?></td>
<td class="nowrap"><?php echo $collation ?></td>
<?php } ?>
<?php } ?>
@ -514,7 +514,7 @@ if ($is_show_stats) {
</tbody>
<tbody id="tbl_summary_row">
<tr><th></th>
<th nowrap="nowrap" class="tbl_num">
<th class="tbl_num nowrap">
<?php
echo sprintf(
_ngettext('%s table', '%s tables', $num_tables),

10
docs.css
View File

@ -63,11 +63,8 @@ ul#footer {
color: #c19e66;
}
abbr, acronym {
abbr {
border-bottom: 1px dotted;
}
abbr, acronym {
cursor: help;
}
@ -211,3 +208,8 @@ p.footnote {
p.footnote:first-line {
margin-left: -2%;
}
em.big {
font-style: normal;
font-size: 1.2em;
}

78
pmd_general.php
View File

@ -232,7 +232,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
onmouseout="this.className='small_tab_pref';"
onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');">
<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec_small.png" alt="" /></td>
<td nowrap="nowrap" id="id_zag_<?php echo $t_n_url ?>" class="tab_zag"
<td id="id_zag_<?php echo $t_n_url ?>" class="tab_zag nowrap"
onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');"/
onmouseover="Table_onover('<?php echo $t_n_url ?>',0,<?php echo (isset($_REQUEST['query'])? 1 : 0 )?> )"
onmouseout="Table_onover('<?php echo $t_n_url ?>',1,<?php echo (isset($_REQUEST['query']) ? 1 : 0 )?>)">
@ -291,7 +291,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
}?>
<td width="10px" colspan="3"
id="<?php echo $t_n_url.".".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>">
<div style="white-space:nowrap">
<div class="nowrap">
<?php
if (isset($tables_pk_or_unique_keys[$t_n.".".$tab_column[$t_n]["COLUMN_NAME"][$j]])) {
?>
@ -357,15 +357,15 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Create relation'); ?></strong></td>
<td colspan="2" class="center nowrap"><strong><?php echo __('Create relation'); ?></strong></td>
</tr>
</thead>
<tbody id="foreign_relation">
<tr>
<td colspan="2" class="center" nowrap="nowrap"><strong>FOREIGN KEY</strong></td>
<td colspan="2" class="center nowrap"><strong>FOREIGN KEY</strong></td>
</tr>
<tr>
<td width="58" nowrap="nowrap">on delete</td>
<td width="58" class="nowrap">on delete</td>
<td width="102"><select name="on_delete" id="on_delete">
<option value="nix" selected="selected">--</option>
<option value="CASCADE">CASCADE</option>
@ -376,7 +376,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</td>
</tr>
<tr>
<td nowrap="nowrap">on update</td>
<td class="nowrap">on update</td>
<td><select name="on_update" id="on_update">
<option value="nix" selected="selected">--</option>
<option value="CASCADE">CASCADE</option>
@ -389,7 +389,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" class="center" nowrap="nowrap">
<td colspan="2" class="center nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="New_relation()" />
<input type="button" class="butt" name="Button"
@ -423,10 +423,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<td class="input_tab">
<table width="100%" class="center" cellpadding="2" cellspacing="0">
<tr>
<td colspan="3" class="center" nowrap="nowrap"><strong><?php echo __('Delete relation'); ?></strong></td>
<td colspan="3" class="center nowrap"><strong><?php echo __('Delete relation'); ?></strong></td>
</tr>
<tr>
<td colspan="3" class="center" nowrap="nowrap">
<td colspan="3" class="center nowrap">
<input name="Button" type="button" class="butt"
onclick="Upd_relation()" value="<?php echo __('Delete'); ?>" />
<input type="button" class="butt" name="Button"
@ -459,13 +459,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" class="center"></td>
<td colspan="2" rowspan="2" id="option_col_name" class="center nowrap"></td>
</tr>
</thead>
<tbody id="where">
<tr><td class="center" nowrap="nowrap"><b>WHERE</b></td></tr>
<tr><td class="center nowrap"><b>WHERE</b></td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
<td width="58" class="nowrap"><?php echo __('Relation operator'); ?></td>
<td width="102"><select name="rel_opt" id="rel_opt">
<option value="--" selected="selected"> -- </option>
<option value="="> = </option>
@ -481,18 +481,18 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</td>
</tr>
<tr>
<td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td>
<td class="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td>
<td><textarea id="Query" value="" cols="18"></textarea>
</td>
</tr>
<tr><td class="center" nowrap="nowrap"><b><?php echo __('Rename to'); ?></b></td></tr>
<tr><td class="center nowrap"><b><?php echo __('Rename to'); ?></b></td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td>
<td width="58" class="nowrap"><?php echo __('New name'); ?></td>
<td width="102"><input type="text" value="" id="new_name"/></td>
</tr>
<tr><td class="center" nowrap="nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr>
<tr><td class="center nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="58" class="nowrap"><?php echo __('Operator'); ?></td>
<td width="102"><select name="operator" id="operator">
<option value="---" selected="selected">---</option>
<option value="sum" > SUM </option>
@ -503,16 +503,16 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</select>
</td></tr>
<tr>
<td nowrap="nowrap" width="58" class="center"><b>GROUP BY</b></td>
<td width="58" class="center nowrap"><b>GROUP BY</b></td>
<td><input type="checkbox" value="groupby" id="groupby"/></td>
</tr>
<tr>
<td nowrap="nowrap" width="58" class="center"><b>ORDER BY</b></td>
<td width="58" class="center nowrap"><b>ORDER BY</b></td>
<td><input type="checkbox" value="orderby" id="orderby"/></td>
</tr>
<tr><td class="center" nowrap="nowrap"><b>HAVING</b></td></tr>
<tr><td class="center nowrap"><b>HAVING</b></td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="58" class="nowrap"><?php echo __('Operator'); ?></td>
<td width="102"><select name="h_operator" id="h_operator">
<option value="---" selected="selected">---</option>
<option value="None" > <?php echo __('None'); ?> </option>
@ -524,7 +524,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</select>
</td></tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
<td width="58" class="nowrap"><?php echo __('Relation operator'); ?></td>
<td width="102"><select name="h_rel_opt" id="h_rel_opt">
<option value="--" selected="selected"> -- </option>
<option value="="> = </option>
@ -540,13 +540,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</td>
</tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Value'); ?>/<br/><?php echo __('subquery'); ?></td>
<td width="58" class="nowrap"><?php echo __('Value'); ?>/<br/><?php echo __('subquery'); ?></td>
<td width="102"><textarea id="having" value="" cols="18"></textarea></td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="2" class="center" nowrap="nowrap">
<td colspan="2" class="center nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="add_object()" />
<input type="button" class="butt" name="Button"
@ -581,12 +581,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Rename to'); ?></strong></td>
<td colspan="2" class="center nowrap"><strong><?php echo __('Rename to'); ?></strong></td>
</tr>
</thead>
<tbody id="rename_to">
<tr>
<td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td>
<td width="58" class="nowrap"><?php echo __('New name'); ?></td>
<td width="102">
<input type="text" value="" id="e_rename"/>
</td>
@ -594,7 +594,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" class="center" nowrap="nowrap">
<td colspan="2" class="center nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="edit('Rename')" />
<input type="button" class="butt" name="Button"
@ -629,12 +629,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="center" nowrap="nowrap"><strong>HAVING</strong></td>
<td colspan="2" class="center nowrap"><strong>HAVING</strong></td>
</tr>
</thead>
<tbody id="rename_to">
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="58" class="nowrap"><?php echo __('Operator'); ?></td>
<td width="102"><select name="hoperator" id="hoperator">
<option value="---" selected="selected">---</option>
<option value="None" > None </option>
@ -647,7 +647,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</td></tr>
<tr>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="58" class="nowrap"><?php echo __('Operator'); ?></td>
<td width="102"><select name="hrel_opt" id="hrel_opt">
<option value="--" selected="selected"> -- </option>
<option value="="> = </option>
@ -663,14 +663,14 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</td>
</tr>
<tr>
<td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td>
<td class="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td>
<td><textarea id="hQuery" value="" cols="18"></textarea>
</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="2" class="center" nowrap="nowrap">
<td colspan="2" class="center nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="edit('Having')" />
<input type="button" class="butt" name="Button"
@ -705,12 +705,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="center" nowrap="nowrap"><strong><?php echo __('Aggregate'); ?></strong></td>
<td colspan="2" class="center nowrap"><strong><?php echo __('Aggregate'); ?></strong></td>
</tr>
</thead>
<tbody>
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="58" class="nowrap"><?php echo __('Operator'); ?></td>
<td width="102">
<select name="operator" id="e_operator">
<option value="---" selected="selected">---</option>
@ -724,7 +724,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
<tbody>
<tr>
<td colspan="2" class="center" nowrap="nowrap">
<td colspan="2" class="center nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="edit('Aggregate')" />
<input type="button" class="butt" name="Button"
@ -759,12 +759,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<table width="168" class="center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="center" nowrap="nowrap"><strong>WHERE</strong></td>
<td colspan="2" class="center nowrap"><strong>WHERE</strong></td>
</tr>
</thead>
<tbody id="rename_to">
<tr>
<td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
<td width="58" class="nowrap"><?php echo __('Operator'); ?></td>
<td width="102"><select name="erel_opt" id="erel_opt">
<option value="--" selected="selected"> -- </option>
<option value="=" > = </option>
@ -780,14 +780,14 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</td>
</tr>
<tr>
<td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td>
<td class="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td>
<td><textarea id="eQuery" value="" cols="18"></textarea>
</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="2" class="center" nowrap="nowrap">
<td colspan="2" class="center nowrap">
<input type="button" class="butt" name="Button"
value="<?php echo __('OK'); ?>" onclick="edit('Where')" />
<input type="button" class="butt" name="Button"

2
server_variables.php
View File

@ -130,7 +130,7 @@ foreach ($serverVars as $name => $value) {
$row_class = ($odd_row ? 'odd' : 'even') . ' ' . ($has_session_value ? 'diffSession' : '');
?>
<tr class="<?php echo $row_class; ?>">
<th nowrap="nowrap"><?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th>
<th class="nowrap"><?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th>
<td class="value"><?php echo formatVariable($name, $value); ?></td>
<td class="value"><?php
// To display variable documentation link

10
tbl_change.php
View File

@ -470,12 +470,12 @@ foreach ($rows as $row_id => $vrow) {
$table_fields[$i]['first_timestamp'] = true;
}
$table_fields[$i]['pma_type'] = $table_fields[$i]['Type'];
$table_fields[$i]['wrap'] = ' nowrap="nowrap"';
$table_fields[$i]['wrap'] = ' nowrap';
break;
default:
$table_fields[$i]['pma_type'] = $table_fields[$i]['Type'];
$table_fields[$i]['wrap'] = ' nowrap="nowrap"';
$table_fields[$i]['wrap'] = ' nowrap';
break;
}
}
@ -513,7 +513,7 @@ foreach ($rows as $row_id => $vrow) {
<input type="hidden" name="fields_name<?php echo $field_name_appendix; ?>" value="<?php echo $field['Field_html']; ?>"/>
</td>
<?php if ($cfg['ShowFieldTypesInDataEditView']) { ?>
<td class="center"<?php echo $field['wrap']; ?>><span class="column_type"><?php echo $field['pma_type']; ?></span>
<td class="center<?php echo $field['wrap']; ?>"><span class="column_type"><?php echo $field['pma_type']; ?></span>
</td>
<?php } //End if
@ -1049,7 +1049,7 @@ foreach ($rows as $row_id => $vrow) {
<fieldset id="actions_panel">
<table cellpadding="5" cellspacing="0">
<tr>
<td valign="middle" nowrap="nowrap">
<td valign="middle" class="nowrap">
<select name="submit_type" class="control_at_footer" tabindex="<?php echo ($tabindex + $tabindex_for_value + 1); ?>">
<?php
if (isset($where_clause)) {
@ -1073,7 +1073,7 @@ if (! isset($after_insert)) {
<td valign="middle">
&nbsp;&nbsp;&nbsp;<strong><?php echo __('and then'); ?></strong>&nbsp;&nbsp;&nbsp;
</td>
<td valign="middle" nowrap="nowrap">
<td valign="middle" class="nowrap">
<select name="after_insert">
<option value="back" <?php echo ($after_insert == 'back' ? 'selected="selected"' : ''); ?>><?php echo __('Go back to previous page'); ?></option>
<option value="new_insert" <?php echo ($after_insert == 'new_insert' ? 'selected="selected"' : ''); ?>><?php echo __('Insert another new row'); ?></option>

2
tbl_create.php
View File

@ -305,7 +305,7 @@ if (isset($_REQUEST['do_save_data'])) {
$new_table_string .= '<td class="value">' . $tbl_stats['Rows'] . '</td>' . "\n";
$new_table_string .= '<td nowrap="nowrap">' . $tbl_stats['Engine'] . '</td>' . "\n";
$new_table_string .= '<td class="nowrap">' . $tbl_stats['Engine'] . '</td>' . "\n";
$new_table_string .= '<td> <dfn title="' . PMA_getCollationDescr($tbl_stats['Collation']) . '">'. $tbl_stats['Collation'] .'</dfn></td>' . "\n";

14
tbl_structure.php
View File

@ -251,7 +251,7 @@ foreach ($fields as $row) {
if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) {
$type_nowrap = '';
} else {
$type_nowrap = ' nowrap="nowrap"';
$type_nowrap = ' class="nowrap"';
}
$type = $extracted_fieldspec['print_type'];
if (empty($type)) {
@ -342,12 +342,12 @@ foreach ($fields as $row) {
<td class="right">
<?php echo $rownum; ?>
</td>
<th nowrap="nowrap"><label for="checkbox_row_<?php echo $rownum; ?>"><?php echo $displayed_field_name; ?></label></th>
<th class="nowrap"><label for="checkbox_row_<?php echo $rownum; ?>"><?php echo $displayed_field_name; ?></label></th>
<td<?php echo $type_nowrap; ?>><bdo dir="ltr" lang="en"><?php echo $type; echo $type_mime; ?></bdo></td>
<td><?php echo (empty($field_charset) ? '' : '<dfn title="' . PMA_getCollationDescr($field_charset) . '">' . $field_charset . '</dfn>'); ?></td>
<td nowrap="nowrap" class="column_attribute"><?php echo $attribute; ?></td>
<td class="column_attribute nowrap"><?php echo $attribute; ?></td>
<td><?php echo (($row['Null'] == 'YES') ? __('Yes') : __('No')); ?></td>
<td nowrap="nowrap"><?php
<td class="nowrap"><?php
if (isset($row['Default'])) {
if ($extracted_fieldspec['type'] == 'bit') {
// here, $row['Default'] contains something like b'010'
@ -358,7 +358,7 @@ foreach ($fields as $row) {
} else {
echo '<i>' . _pgettext('None for default', 'None') . '</i>';
} ?></td>
<td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td>
<td class="nowrap"><?php echo strtoupper($row['Extra']); ?></td>
<td class="replaced_by_more center">
<a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote(__('Rows')) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>">
<?php echo $titles['BrowseDistinctValues']; ?></a>
@ -444,7 +444,7 @@ foreach ($fields as $row) {
&& (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) {
echo "\n";
?>
<td nowrap="nowrap" class="replaced_by_more center">
<td class="replaced_by_more center nowrap">
<a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&amp;message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $titles['IdxFulltext']; ?></a>
<?php $fulltext_enabled = true; ?>
@ -453,7 +453,7 @@ foreach ($fields as $row) {
} else {
echo "\n";
?>
<td nowrap="nowrap" class="replaced_by_more center">
<td class="replaced_by_more center nowrap">
<?php echo $titles['NoIdxFulltext'] . "\n"; ?>
<?php $fulltext_enabled = false; ?>
</td>

4
tbl_tracking.php
View File

@ -494,7 +494,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
<td><small><?php echo htmlspecialchars($entry['date']);?></small></td>
<td><small><?php echo htmlspecialchars($entry['username']); ?></small></td>
<td><?php echo $statement; ?></td>
<td nowrap="nowrap"><a href="tbl_tracking.php?<?php echo $url_query;?>&amp;report=true&amp;version=<?php echo $version['version'];?>&amp;delete_ddlog=<?php echo $i-1; ?>"><?php echo $drop_image_or_text; ?></a></td>
<td class="nowrap"><a href="tbl_tracking.php?<?php echo $url_query;?>&amp;report=true&amp;version=<?php echo $version['version'];?>&amp;delete_ddlog=<?php echo $i-1; ?>"><?php echo $drop_image_or_text; ?></a></td>
</tr>
<?php
if ($style == 'even') {
@ -550,7 +550,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
<td><small><?php echo htmlspecialchars($entry['date']); ?></small></td>
<td><small><?php echo htmlspecialchars($entry['username']); ?></small></td>
<td><?php echo $statement; ?></td>
<td nowrap="nowrap"><a href="tbl_tracking.php?<?php echo $url_query;?>&amp;report=true&amp;version=<?php echo $version['version'];?>&amp;delete_dmlog=<?php echo $i-$ddlog_count; ?>"><?php echo $drop_image_or_text; ?></a></td>
<td class="nowrap"><a href="tbl_tracking.php?<?php echo $url_query;?>&amp;report=true&amp;version=<?php echo $version['version'];?>&amp;delete_dmlog=<?php echo $i-$ddlog_count; ?>"><?php echo $drop_image_or_text; ?></a></td>
</tr>
<?php
if ($style == 'even') {

30
themes/original/css/theme_print.css.php
View File

@ -9,8 +9,8 @@
?>
/* For printview */
body, table, th, td {
color: #000000;
background-color: #ffffff;
color: #000;
background: #fff;
}
img {
@ -18,23 +18,33 @@ img {
}
table, th, td {
border-width: 0.1em;
border-color: #000000;
border-style: solid;
border: .1em solid #000;
}
table {
border-collapse: collapse;
border-spacing: 0;
border-collapse: collapse;
border-spacing: 0;
}
th, td {
padding: 0.2em;
padding: .2em;
}
th.vtop, td.vtop {
vertical-align: top;
}
th.vbottom, td.vbottom {
vertical-align: bottom;
}
th {
font-weight: bold;
background-color: #e5e5e5;
font-weight: bold;
background: #e5e5e5;
}
.nowrap {
white-space: nowrap;
}
.hide {

8
themes/original/css/theme_right.css.php
View File

@ -167,6 +167,14 @@ th.right, td.right {
text-align: right;
}
th.vtop, td.vtop {
vertical-align: top;
}
th.vbottom, td.vbottom {
vertical-align: bottom;
}
.paddingtop {
padding-top: 1em;
}

16
themes/pmahomme/css/theme_print.css.php
View File

@ -10,7 +10,7 @@
/* For printview */
body, table, th, td {
color: #000;
background-color: #fff;
background: #fff;
}
img {
@ -30,9 +30,21 @@ th, td {
padding: .2em;
}
th.vtop, td.vtop {
vertical-align: top;
}
th.vbottom, td.vbottom {
vertical-align: bottom;
}
th {
font-weight: bold;
background-color: #e5e5e5;
background: #e5e5e5;
}
.nowrap {
white-space: nowrap;
}
.hide {

8
themes/pmahomme/css/theme_right.css.php
View File

@ -363,6 +363,14 @@ th.right, td.right {
text-align: right;
}
th.vtop, td.vtop {
vertical-align: top;
}
th.vbottom, td.vbottom {
vertical-align: bottom;
}
.paddingtop {
padding-top: 1em;
}