diff --git a/ChangeLog b/ChangeLog index 85583f5d6..c85f52992 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-05-08 Alexander M. Turek + * config.inc.php, db_details_structure.php, Documentation.html, + header.inc.php, left.php, main.php, images/*, libraries/common.lib.php, + libraries/config_import.lib.php: + Patch #947190 (Redesign) - Part 1, thanks to Michael Keck (mkkeck). + 2004-05-07 Alexander M. Turek * calendar.php: Added missing CVS-ID-Tag. diff --git a/Documentation.html b/Documentation.html index c0412367b..dab5a3afe 100755 --- a/Documentation.html +++ b/Documentation.html @@ -3904,6 +3904,9 @@ CREDITS, in chronological order * mysqli support * many bugfixes and improvements +- Michael Keck <mkkeck_at_users.sourceforge.net> + * redesign for 2.6.0 + And also to the following people who have contributed minor changes, enhancements, bugfixes or support for a new language since version 2.1.0: diff --git a/config.inc.php b/config.inc.php index 4579373f2..3a450e8b9 100644 --- a/config.inc.php +++ b/config.inc.php @@ -260,7 +260,7 @@ $cfg['CharEditing'] = 'input'; // Which editor should be used for CHAR/VARCHAR fields: // input - allows limiting of input length // textarea - allows newlines in fields -$cfg['InsertRows'] = 2; // How many rows can be inserted at one time +$cfg['InsertRows'] = 2; // How many rows can be inserted at one time // For the export features... $cfg['ZipDump'] = TRUE; // Allow the use of zip/gzip/bzip @@ -452,7 +452,7 @@ $cfg['AvailableCharsets'] = array( /** * Customization & design */ -$cfg['LeftWidth'] = 150; // left frame width +$cfg['LeftWidth'] = 200; // left frame width $cfg['LeftBgColor'] = '#D0DCE0'; // background color for the left frame $cfg['RightBgColor'] = '#F5F5F5'; // background color for the right frame $cfg['RightBgImage'] = ''; // path to a background image for the right frame @@ -460,9 +460,9 @@ $cfg['RightBgImage'] = ''; // path to a background image for th $cfg['LeftPointerColor'] = '#CCFFCC'; // color of the pointer in left frame // (blank for no pointer) $cfg['Border'] = 0; // border width on tables -$cfg['ThBgcolor'] = '#D3DCE3'; // table header row colour -$cfg['BgcolorOne'] = '#CCCCCC'; // table data row colour -$cfg['BgcolorTwo'] = '#DDDDDD'; // table data row colour, alternate +$cfg['ThBgcolor'] = '#CCCCFF'; // table header row colour +$cfg['BgcolorOne'] = '#E5E5E5'; // table data row colour +$cfg['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate $cfg['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode // (blank for no pointer) $cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row @@ -514,6 +514,23 @@ $cfg['WYSIWYG-PDF'] = TRUE; // Utilize DHTML/JS capabilities to $cfg['NaturalOrder'] = TRUE; // Sort table and database in natural order + +//----------------------------------------------------------------------------- +// custom-setup by mkkeck: 2004-05-04 +// some specials for new icons and scrollings +// 2004-05-08 rabus: We need to rearrange these variables. + +$cfg['ShowHttpHostTitle'] = FALSE; // show HTTP host in browsers window title (true|false)? +$cfg['SetHttpHostTitle'] = ''; // if ShowHttpHostTitle=true, please set your host (server) + // or an other string, wich should be shown in browsers window title. + // If not set (or empty), the PMA will get your real host address. + +$cfg['ErrorIconic'] = TRUE; // show some icons for warnings, errors and informations? (true|false)? +$cfg['ReplaceHelpImg'] = TRUE; // show help button instead of strDocumentation (true|false)? + +//----------------------------------------------------------------------------- + + /** * Default queries. * %d will be replaced by database name diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 9eea58e2c..1ce54ec14 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -98,6 +98,7 @@ div {font-family: ; font-size: ; font-size: } input {font-family: ; font-size: } select {font-family: ; font-size: ; background-color: #ffffff; color: #000000} +hr{ color: #ffffff; background-color: #ffffff; border: 0; height: 1px; } .png); + list-style-image: url(../images/dot_violet.png); padding-bottom: 0.1em; } diff --git a/db_details_structure.php b/db_details_structure.php index c80bb943a..dc906c6cb 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -112,7 +112,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) { // Display function function pma_TableHeader($alternate = FALSE) { - echo ' ' . "\n" + echo '
' . "\n" . ' ' . "\n" . ' ' . "\n" . '
' . "\n" @@ -181,15 +181,15 @@ if ($cfg['PropertiesIconic'] == true) { $iconic_spacer = ''; } - $titles['Browse'] = $iconic_spacer . '' . $strBrowse . ''; - $titles['Search'] = $iconic_spacer . '' . $strSearch . ''; - $titles['NoBrowse'] = $iconic_spacer . '' . $strBrowse . ''; - $titles['NoSearch'] = $iconic_spacer . '' . $strSearch . ''; - $titles['Insert'] = $iconic_spacer . '' . $strInsert . ''; - $titles['Properties'] = $iconic_spacer . '' . $strProperties . ''; - $titles['Drop'] = $iconic_spacer . '' . $strDrop . ''; - $titles['Empty'] = $iconic_spacer . '' . $strEmpty . ''; - $titles['NoEmpty'] = $iconic_spacer . '' . $strEmpty . ''; + $titles['Browse'] = $iconic_spacer . '' . $strBrowse . ''; + $titles['Search'] = $iconic_spacer . '' . $strSearch . ''; + $titles['NoBrowse'] = $iconic_spacer . '' . $strBrowse . ''; + $titles['NoSearch'] = $iconic_spacer . '' . $strSearch . ''; + $titles['Insert'] = $iconic_spacer . '' . $strInsert . ''; + $titles['Properties'] = $iconic_spacer . '' . $strProperties . ''; + $titles['Drop'] = $iconic_spacer . '' . $strDrop . ''; + $titles['Empty'] = $iconic_spacer . '' . $strEmpty . ''; + $titles['NoEmpty'] = $iconic_spacer . '' . $strEmpty . ''; if ($propicon == 'both') { $titles['Browse'] .= ' ' . $strBrowse . ''; @@ -308,7 +308,7 @@ else {
- + "> /> - > + >     @@ -564,7 +564,7 @@ else { ?> - <?php echo $strWithChecked; ?> + <?php echo $strWithChecked; ?>  /  @@ -576,7 +576,7 @@ else {     - + '; +echo '  '; +echo ' '; +echo ' ' . $strFields . ': ' . "\n"; +echo ' '; +echo ' '; +echo ' ' . '' . "\n"; +echo ' '; +echo ' '; +echo ' ' . ' ' . "\n"; +?> + + + + -
  • -
    - + + + + '; + } + echo $strDBComment; + ?> + + + - + +
    -
    • - - -
  • -
    - -' . "\n"; -echo ' ' . $strName . ' : ' . "\n"; -echo ' ' . '' . "\n"; -echo ' ' . '
    ' . "\n"; -echo ' ' . $strFields . ' : ' . "\n"; -echo ' ' . '' . "\n"; -echo ' ' . ' ' . "\n"; -?> -
    -
    • - -
  • + + '; + } + echo $strDBRename.': '; + ?>
    - : - - - - -
    -
    • + ' + . PMA_generate_common_hidden_inputs($db); + ?> + + + = 40101) { // MySQL supports setting default charsets / collations for databases since // version 4.1.1. echo ' ' . "\n" - . '
  • ' . "\n" + . ' ' . "\n" + . ' '; + if($cfg['PropertiesIconic']){ + echo ''; + } + echo ' : ' . "\n" + . ' ' . "\n" . '
    ' . "\n" + . ' ' . PMA_generate_common_hidden_inputs($db, $table, 3) - . '  : ' . "\n" . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, FALSE, 3) + . ' ' . '  ' . "\n" + . ' ' . "\n" . '
    ' . "\n" - . '
    • ' . "\n\n"; + . ' ' . "\n\n"; } if ($num_tables > 0 && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == FALSE) { - echo '
  • ' . "\n"; - echo ' ' . $strError . '
    ' . "\n"; + echo ' ' . "\n" + . ' '; + if($cfg['PropertiesIconic']){ + echo ''; + } + echo ' ' . $strError . '' . "\n"; + echo ''; + echo ''; $url_to_goto = ''; - echo ' ' . sprintf($strRelationNotWorking, $url_to_goto, '') . "\n"; - echo '
    • ' . "\n"; + echo ' ' . sprintf(wordwrap($strRelationNotWorking,60,'
    '), $url_to_goto, '') . "\n"; + echo ' ' . "\n"; } // end if - +?> + + 0) { $takeaway = $url_query . '&table=' . urlencode($table); } +if (($cfgRelation['pdfwork'] && $num_tables > 0) || +($num_tables > 0 + && $cfgRelation['relwork'] && $cfgRelation['commwork'] + && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) + ) +) { ?>
    0) { ?> -
  • - -
    • + + 0) { if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { echo "\n"; ?> -
  • - -  :
    +
    • + + + + + + + + + + + + + + + + + + + + + 0 && $cfgRelation['relwork'] && $cfgRelation['commwork'] && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) ) { - ?> +?> -
  • - ' . $strImportDocSQL; ?> -
    • + '; - +echo "\n"; +if (($cfgRelation['pdfwork'] && $num_tables > 0) || +($num_tables > 0 + && $cfgRelation['relwork'] && $cfgRelation['commwork'] + && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) + ) +) { ?>
    + '; + } +?>PDF
    '; + if($cfg['PropertiesIconic']){ + echo ''; + } + echo ''. $strEditPDFPages . ''; + ?>
    + '; + } + ?> + : 
       
    - -
    - -
    - -
    - -
    - -
    +
      + +
      + +
      + +
      + +
      + +
     
    +
     
    -    - - +
      +   
    '; + if($cfg['PropertiesIconic']){ + echo ''; + } + echo $strImportDocSQL . ''; + ?> +
    > '; + } + if (!empty($GLOBALS['cfg']['Server']) && isset($GLOBALS['cfg']['Server']['host'])) { + $title.=str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']); + } + if (isset($GLOBALS['db'])) { + $title .= ' >> ' . str_replace('\'', '\\\'', $GLOBALS['db']); + } + if (isset($GLOBALS['table'])) { + $title .= (empty($title) ? '' : ' ') . ' >> ' . str_replace('\'', '\\\'', $GLOBALS['table']); + } + $title .= ' | phpMyAdmin ' . PMA_VERSION; ?>