From 7ae10444a4ea3d466fe76d1219ad49b22e6f0957 Mon Sep 17 00:00:00 2001 From: Jo Michael Date: Sat, 31 Mar 2012 00:23:21 +0200 Subject: [PATCH 1/4] Replaced with in Doc.html for HTML5 validity --- Documentation.html | 18 +++++++++--------- docs.css | 5 +---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Documentation.html b/Documentation.html index 976944b72c..c67057d52c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -180,14 +180,14 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78

- Warning for Mac users:
- if you are on a Mac + Warning for Mac users:
+ if you are on a Mac OS version before OS X, StuffIt unstuffs with - Mac formats.
+ Mac formats.
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 - Mac-style end of lines character + Mac-style end of lines character ("\r").

Quick Install

@@ -565,9 +565,9 @@ since this link provides funding for phpMyAdmin.

Configuration

-

Warning for Mac +

Warning for Mac users: PHP does not seem to like - Mac end of lines character + Mac end of lines character ("\r"). So ensure you choose the option that allows to use the *nix end of line character ("\n") in your text editor before saving a script you have modified.

@@ -3833,7 +3833,7 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array( recent versions of the most browsers.

- 5.12 Mac OS X: Safari browser changes special characters to + 5.12 Mac OS X: Safari browser changes special characters to "?".

This issue has been reported by a OS X user, who adds that Chimera, @@ -5115,7 +5115,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".

  • Mac (Apple Macintosh) - line of personal computers is designed, developed, manufactured, and marketed by Apple Computer.
    • -
  • Mac OS X +
  • Mac OS X - the operating system which is included with all currently shipping Apple Macintosh computers in the consumer and professional markets.
  • MCrypt @@ -5136,7 +5136,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".
  • OpenDocument - open standard for office documents.
  • OS X - - look at Mac OS X.
    • + - look at Mac OS X.
  • PDF (Portable Document Format) - a file format developed by Adobe Systems for representing two diff --git a/docs.css b/docs.css index 7e15537419..a2c57665f1 100644 --- a/docs.css +++ b/docs.css @@ -63,11 +63,8 @@ ul#footer { color: #c19e66; } -abbr, acronym { +abbr { border-bottom: 1px dotted; -} - -abbr, acronym { cursor: help; } From bc432a0b9a70161b96ac191ece7a2f45c3df0c61 Mon Sep 17 00:00:00 2001 From: Jo Michael Date: Sat, 31 Mar 2012 16:25:46 +0200 Subject: [PATCH 2/4] Replaced with in docs for HTML5 validity --- Documentation.html | 8 ++++---- docs.css | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index c67057d52c..a3fdfca790 100644 --- a/Documentation.html +++ b/Documentation.html @@ -118,7 +118,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 title="International Electrotechnical Commission">IEC 26300 - OpenDocument Text and Spreadsheet, Word, - and LATEX formats + and LATEX formats
  • import data and MySQL structures from OpenDocument spreadsheets, as well as XML, CSV, and SQL files
  • administer multiple servers
    • @@ -4274,10 +4274,10 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); positioned "/**/" comments.

    - 6.19 How can I create simple LATEX document to + 6.19 How can I create simple LATEX document to include exported table?

    -

    You can simply include table in your LATEX documents, minimal sample +

    You can simply include table in your LATEX documents, minimal sample document should look like following one (assuming you have table exported in file table.tex):

    @@ -5110,7 +5110,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai". photographic images.
  • JPG - look at JPEG.
  • Key - look at index.
    • -
  • LATEX +
  • LATEX - a document preparation system for the TEX typesetting program.
  • Mac (Apple Macintosh) - line of personal computers is designed, developed, manufactured, and diff --git a/docs.css b/docs.css index a2c57665f1..9760e9b8c9 100644 --- a/docs.css +++ b/docs.css @@ -208,3 +208,8 @@ p.footnote { p.footnote:first-line { margin-left: -2%; } + +em.big { + font-style: normal; + font-size: 1.2em; +} From fc7a1339fc850291c54e7baaabce415b043e5e07 Mon Sep 17 00:00:00 2001 From: Jo Michael Date: Sat, 31 Mar 2012 16:30:42 +0200 Subject: [PATCH 3/4] Cleanup for print CSS --- themes/original/css/theme_print.css.php | 18 ++++++++---------- themes/pmahomme/css/theme_print.css.php | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php index 4cf8e338d0..41ab35eac3 100644 --- a/themes/original/css/theme_print.css.php +++ b/themes/original/css/theme_print.css.php @@ -9,8 +9,8 @@ ?> /* For printview */ body, table, th, td { - color: #000000; - background-color: #ffffff; + color: #000; + background: #fff; } img { @@ -18,23 +18,21 @@ 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 { - font-weight: bold; - background-color: #e5e5e5; + font-weight: bold; + background: #e5e5e5; } .hide { diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php index ac70630acf..a105636a4f 100644 --- a/themes/pmahomme/css/theme_print.css.php +++ b/themes/pmahomme/css/theme_print.css.php @@ -10,7 +10,7 @@ /* For printview */ body, table, th, td { color: #000; - background-color: #fff; + background: #fff; } img { @@ -32,7 +32,7 @@ th, td { th { font-weight: bold; - background-color: #e5e5e5; + background: #e5e5e5; } .hide { From 20ddd10911d6d3918ea870db3d62558759a1bbeb Mon Sep 17 00:00:00 2001 From: Jo Michael Date: Sat, 31 Mar 2012 16:50:33 +0200 Subject: [PATCH 4/4] Replaced HTML nowrap attribute with CSS for HTML5 validity --- browse_foreigners.php | 4 +- db_datadict.php | 4 +- db_printview.php | 8 +-- db_qbe.php | 16 ++--- db_structure.php | 6 +- pmd_general.php | 78 ++++++++++++------------- server_variables.php | 2 +- tbl_change.php | 10 ++-- tbl_create.php | 2 +- tbl_structure.php | 14 ++--- tbl_tracking.php | 4 +- themes/original/css/theme_print.css.php | 12 ++++ themes/original/css/theme_right.css.php | 8 +++ themes/pmahomme/css/theme_print.css.php | 12 ++++ themes/pmahomme/css/theme_right.css.php | 8 +++ 15 files changed, 114 insertions(+), 74 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 9579edcb44..a125ff6199 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -249,7 +249,7 @@ if (is_array($foreignData['disp_row'])) { ?> - + ' : '') .'' . $val_ordered_current_val . '' . ($val_ordered_current_equals_data ? '' : ''); ?> - + ' : '') . ' - + ' . htmlspecialchars($field_name) . ''; diff --git a/db_printview.php b/db_printview.php index 70beda080a..a76ee380e2 100644 --- a/db_printview.php +++ b/db_printview.php @@ -139,7 +139,7 @@ if ($num_tables == 0) { } ?> - + - + - + @@ -228,7 +228,7 @@ if ($num_tables == 0) { if ($cfg['ShowStats']) { list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1); ?> - + - + - @@ -384,7 +384,7 @@ for ($y = 0; $y <= $row; $y++) { - @@ -449,11 +449,11 @@ for ($y = 0; $y <= $row; $y++) { echo "\n"; ?> -
    + :
    + :
    + - @@ -465,7 +465,7 @@ for ($y = 0; $y <= $row; $y++) { - @@ -602,7 +602,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
    + :
    + :
    - - 1)) { ?> - + - + @@ -514,7 +514,7 @@ if ($is_show_stats) { -
    + :  : + :
    + ');"> - @@ -291,7 +291,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { }?> "> -
    +
    @@ -357,15 +357,15 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - + - + - + - + -
    FOREIGN KEYFOREIGN KEY
    on deleteon delete
    on updateon update
    + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + @@ -594,7 +594,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - - + - + - + - + - - + - + - - + - + - + - - + - $vrow) {
    +
    WHERE
    WHERE
    /
    		/
    GROUP BYGROUP BY
    ORDER BYORDER BY
    HAVING
    HAVING
    /
    		/
    +
    +
    HAVINGHAVING
    /
    		/
    +
    +
    WHEREWHERE
    /
    		/
    + $value) { $row_class = ($odd_row ? 'odd' : 'even') . ' ' . ($has_session_value ? 'diffSession' : ''); ?>
    $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) { > +
    - - ' . "\n"; - $new_table_string .= '' . "\n"; + $new_table_string .= '' . "\n"; $new_table_string .= '' . "\n"; diff --git a/tbl_structure.php b/tbl_structure.php index e62b1bd987..b827e798be 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -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) { - + > - + - - + diff --git a/tbl_tracking.php b/tbl_tracking.php index e3b63efa10..e207b710e6 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -494,7 +494,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { - + - +
    + + ' . $tbl_stats['Rows'] . '' . $tbl_stats['Engine'] . '' . $tbl_stats['Engine'] . ' '. $tbl_stats['Collation'] .' ' . $field_charset . ''); ?> ' . _pgettext('None for default', 'None') . ''; } ?> @@ -444,7 +444,7 @@ foreach ($fields as $row) { && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) { echo "\n"; ?> - + @@ -453,7 +453,7 @@ foreach ($fields as $row) { } else { echo "\n"; ?> - +