From 919bfd664643212e963f9bad039f8f8f5352c6f8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 18 Jun 2004 20:02:27 +0000 Subject: [PATCH] redesign phase 4 --- ChangeLog | 7 ++ db_details_structure.php | 5 +- libraries/common.lib.php | 8 +- libraries/display_export.lib.php | 4 +- tbl_select.php | 144 +++++++++++++++++------- themes/original/css/theme_right.css.php | 6 +- themes/original/img/item_ltr.png | Bin 189 -> 136 bytes themes/original/img/item_rtl.png | Bin 187 -> 136 bytes 8 files changed, 123 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1453384b..bed97571a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-06-18 Marc Delisle + * themes/original/img/item*.png, themes/original/css/theme_right.css.php, + libraries/common.lib.php, libraries/display_export.lib.php, + db_details_structure.php, tbl_select.php: + fix IE font size problem, redesign search and export pages, + thanks to Michael Keck (mkkeck) + 2004-06-17 Alexander M. Turek * libraries/dbi/mysql.dbi.php: Removed debug code. * libraries/dbi/mysqli.dbi.php: If connecting fails, we don't know the diff --git a/db_details_structure.php b/db_details_structure.php index a76b3fc20..1ec5a2bff 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -750,7 +750,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) { . PMA_generate_common_hidden_inputs($db, $table, 3) . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, FALSE, 3) . ' ' - . '  ' . "\n" + . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n\n"; @@ -758,7 +758,8 @@ if (PMA_MYSQL_INT_VERSION >= 40101) { if ($num_tables > 0 && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == FALSE) { - echo '
' . $strError . '
' + echo '' + . '
' . $strError . '
' . '' . sprintf(wordwrap($strRelationNotWorking,65,'
'), '', '') . ''; diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 5b09ecf8d..d41316ebb 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -312,7 +312,7 @@ if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){ include($tmp_color_file); } } else { - $pmaThemeImage = './images/'; + $pmaThemeImage = './' . $cfg['ThemePath'] . '/original/img/'; } } else { $GLOBALS['theme'] = $_COOKIE['pma_theme']; @@ -323,7 +323,7 @@ if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){ } } if (!is_dir($pmaThemeImage)) { - $pmaThemeImage = './images/'; + $pmaThemeImage = './' . $cfg['ThemePath'] . '/original/img/'; } // end theme manager @@ -811,9 +811,9 @@ function PMA_setFontSizes() { global $font_size, $font_biggest, $font_bigger, $font_smaller, $font_smallest; - // IE (<6)/Opera (<7) for win case: needs smaller fonts than anyone else + // IE (<7)/Opera (<7) for win case: needs smaller fonts than anyone else if (PMA_USR_OS == 'Win' - && ((PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 6) + && ((PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 7) || (PMA_USR_BROWSER_AGENT == 'OPERA' && PMA_USR_BROWSER_VER < 7))) { $font_size = 'x-small'; $font_biggest = 'large'; diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index f350315d2..b94a6aa72 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -541,8 +541,10 @@ if (!$hide_structure) { ?> if (isset($table) && !empty($table) && !isset($num_tables)) { ?> - + +
' , '') . "\n"; ?> +
-

-
- ' . htmlspecialchars($fields_list[$i]) . '' . "\n"; + echo ' ' + . '' . "\n"; } ?> -
-

-
    -
  • - - -
    • -
  • -
    -   - -

    - ' . $strOr . ' ' . $strDoAQuery; ?>
    + + + + + + + + +   + + + + + + + + + + + + + + + + + +
    + : +
    + +
     
    + +
    +
    + +
    + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
     
    + + +
    + + + +
     
    + ' . $strOr . ' ' . $strDoAQuery; ?> +
    @@ -159,7 +235,7 @@ function PMA_tbl_select_operator(f, index, multiple) { $bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?> - + = 40100 ? '' . "\n" : ''; ?>
    ' . $fields_collation[$i] . ' @@ -245,29 +321,15 @@ function PMA_tbl_select_operator(f, index, multiple) { echo "\n"; ?>
    - -
  • -
    - - -   - - -
    • - - -      - - +
    + + +
    - background-image: url(../images/s_error.png); + background-image: url(../themes/original/img/s_error.png); background-repeat: no-repeat; background-position: 5px 50%; padding: 0px 0px 0px 25px; @@ -264,7 +264,7 @@ div.tblWarn { margin: 0px 1px 0px 2px; } .serverinfo div{ - background-image: url(../images/item_ltr.png); + background-image: url(../themes/original/img/item_ltr.png); background-repeat: no-repeat; background-position: 50% 50%; width: 20px; diff --git a/themes/original/img/item_ltr.png b/themes/original/img/item_ltr.png index 53b4cfc4fbc87f6efe5a9660552773ac460adbd1..5d56d8518c526e157447a3dfe1bb838e7a6fe609 100644 GIT binary patch delta 119 zcmdnX*ugkKqJW8+fq`MC&3*?41_qu0pAgq8SFW)zvHbb>T&mJ1_lPkk|4ie z28U-i(m;13=Aykj=qiz4C_yrvv$2?U|^6eag8Vm&QB{TPb^Ah za7@WhN>%X8O-xS>N=;0uEIgTN!@$767T^=&`hO+^0|Ud{t>H-w3=B*qL4Lvi8J=!8 z@M2(K(D!t445_%4l#sx}+`y2;z$Cyc;K0KpAm+ee=)kDvz;N&f10&01b`Ax$6;%xk Z%nVF>7$g^EKD!Ju(bLt>Wt~$(697>T&mJ1_lPkk|4ie z28U-i(m;13=Aykj=qiz4C_yrvv$2?U|^6eag8Vm&QB{TPb^Ah za7@WhN>%X8O-xS>N=;0uEIgTN!@$767T^=&`hO+^0|Ud{t>H-w3=B*qL4Lvi8J=!8 z@M2(K(Dih245_%4l)%Ew*1(X|FoB1G@d$&WBm)yi8v~OH$1!#eg&8&u42BL@nOP(l Zn7%Mb+A&P3Vqjok@O1TaS?83{1OWW?FSY;x