patch #947190 (Redesign)

ChangeLog

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-05-08 Alexander M. Turek  <me@derrabus.de>
+    * 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  <me@derrabus.de>
     * calendar.php: Added missing CVS-ID-Tag.
 

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:
 

config.inc.php

@@ -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['ThBgcolor']           = '#CCCCFF';    // table header row colour
-$cfg['BgcolorOne']          = '#CCCCCC';    // table data row colour
+$cfg['BgcolorOne']          = '#E5E5E5';    // table data row colour
-$cfg['BgcolorTwo']          = '#DDDDDD';    // table data row colour, alternate
+$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

css/phpmyadmin.css.php

@@ -98,6 +98,7 @@ div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_
 body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
 input   {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
 select  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; background-color: #ffffff; color: #000000}
+hr{ color: #ffffff; background-color: #ffffff; border: 0; height: 1px; }
     <?php
 } elseif ($js_frame == 'print') {
 /************************************************************************************
@@ -219,6 +220,122 @@ button.mult_submit {
     border:           1px dashed #000000;
 }
 
+/* some new styles added 20047-05-05 by Michael Keck (mkkeck) */
+
+/* tables */
+.tblWarning {
+  border: 1px solid #cc0000;
+  background-color: #ffffff;
+		width: 100%;
+}
+.tblError {
+  border:           1px solid #cc0000;
+  background-color: #ffffcc;
+		width: 100%;
+}
+.tblHeaders {
+  background-color: #9999CC;
+  font-weight:      bold;
+  color:            #000000;
+}
+.tblFooters {
+  background-color: #9999CC;
+  font-weight:      normal;
+  color:            #000000;
+}
+.tblHeadError {
+  background-color: #cc0000;
+  font-weight:      bold;
+  color:            #ffffff;
+}
+.tblHeadWarn {
+  background-color: #ffcc00;
+  font-weight:      bold;
+  color:            #000000;
+}
+/* forbidden, no privilegs */
+.noPrivileges{
+  color:            #cc0000;
+  font-weight:      bold;
+}
+
+/* list elements */
+ul.mainRight {
+    margin: 0px;
+    padding-left:2em;
+    padding-right:2em;
+}
+
+ul.mainRight li {
+    white-space: nowrap;
+    padding-left:   0.5em;
+    padding-top: 0.1em;
+    padding-bottom: 0.1em;
+}
+ul.mainLeft {
+    margin: 0px;
+    padding-left:2em;
+    padding-right:2em;
+}
+
+ul.mainLeft li {
+    white-space: nowrap;
+    padding-left:   0.5em;
+    padding-top: 0.1em;
+    padding-bottom: 0.1em;
+}
+.lstPhpInfo {
+  list-style: url(../images/php_sym.png);
+}
+.lstPmaDocs {
+  list-style: url(../images/b_docs.png);
+}
+.lstPmaPage {
+  list-style: url(../images/b_home.png);
+}
+.lstPmaLang {
+  list-style: url(../images/s_lang.png);
+}
+.lstPmaChar {
+  list-style: url(../images/s_rights.png);
+}
+.lstNewdb {
+  list-style: url(../images/b_newdb.png);
+}
+.lstStatus {
+  list-style: url(../images/s_status.png);
+}
+.lstVars {
+  list-style: url(../images/s_vars.png);
+}
+.lstProcess {
+  list-style: url(../images/s_process.png);
+}
+.lstPrivileges {
+  list-style: url(../images/s_rights.png);
+}
+.lstCollations {
+  list-style: url(../images/s_asci.png);
+}.lstReload {
+  list-style: url(../images/s_reload.png);
+}
+.lstDatabases {
+  list-style: url(../images/s_db.png);
+}
+.lstExport {
+  list-style: url(../images/b_export.png);
+}
+.lstLogoff {
+  list-style: url(../images/s_loggoff.png);
+}
+.lstPasswd {
+  list-style: url(../images/s_passwd.png);
+}
+
+hr{ color: #666699; background-color: #6666cc; border: 0; height: 1px; }
+
+/* end of some new styles added 20047-05-05 by Michael Keck (mkkeck) */
+
 .print{font-family:arial;font-size:8pt;}
 
 /* MySQL Parser */
@@ -302,7 +419,7 @@ ul.main {
 }
 
 ul.main li {
-    list-style-image: url(../images/item_<?php echo $text_dir; ?>.png);
+    list-style-image: url(../images/dot_violet.png);
     padding-bottom: 0.1em;
 }
 

db_details_structure.php

@@ -112,7 +112,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) {
 
 // Display function
 function pma_TableHeader($alternate = FALSE) {
-    echo '            <table border="' . $GLOBALS['cfg']['Border'] . '">' . "\n"
+    echo '            <table border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="2" cellspacing="1">' . "\n"
        . '            <tr>' . "\n"
        . '                <td></td>' . "\n"
        . '                <th>' . "\n"
@@ -181,15 +181,15 @@ if ($cfg['PropertiesIconic'] == true) {
         $iconic_spacer = '';
     }
 
-    $titles['Browse']     = $iconic_spacer . '<img hspace="7" width="12" height="13" src="images/button_browse.png" alt="' . $strBrowse . '" title="' . $strBrowse . '" border="0" />';
+    $titles['Browse']     = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_browse.png" alt="' . $strBrowse . '" title="' . $strBrowse . '" border="0" />';
-    $titles['Search']     = $iconic_spacer . '<img hspace="7" width="14" height="13" src="images/button_select.png" alt="' . $strSearch . '" title="' . $strSearch . '" border="0" />';
+    $titles['Search']     = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_select.png" alt="' . $strSearch . '" title="' . $strSearch . '" border="0" />';
-    $titles['NoBrowse']   = $iconic_spacer . '<img hspace="7" width="12" height="13" src="images/button_nobrowse.png" alt="' . $strBrowse . '" title="' . $strBrowse . '" border="0" />';
+    $titles['NoBrowse']   = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/bd_browse.png" alt="' . $strBrowse . '" title="' . $strBrowse . '" border="0" />';
-    $titles['NoSearch']   = $iconic_spacer . '<img hspace="7" width="14" height="13" src="images/button_noselect.png" alt="' . $strSearch . '" title="' . $strSearch . '" border="0" />';
+    $titles['NoSearch']   = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/bd_select.png" alt="' . $strSearch . '" title="' . $strSearch . '" border="0" />';
-    $titles['Insert']     = $iconic_spacer . '<img hspace="7" width="13" height="13" src="images/button_insert.png" alt="' . $strInsert . '" title="' . $strInsert . '" border="0" />';
+    $titles['Insert']     = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_insrow.png" alt="' . $strInsert . '" title="' . $strInsert . '" border="0" />';
-    $titles['Properties'] = $iconic_spacer . '<img hspace="7" width="18" height="13" src="images/button_properties.png" alt="' . $strProperties . '" title="' . $strProperties . '" border="0" />';
+    $titles['Properties'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_props.png" alt="' . $strProperties . '" title="' . $strProperties . '" border="0" />';
-    $titles['Drop']       = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_drop.png" alt="' . $strDrop . '" title="' . $strDrop . '" border="0" />';
+    $titles['Drop']       = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_drop.png" alt="' . $strDrop . '" title="' . $strDrop . '" border="0" />';
-    $titles['Empty']      = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_empty.png" alt="' . $strEmpty . '" title="' . $strEmpty . '" border="0" />';
+    $titles['Empty']      = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_empty.png" alt="' . $strEmpty . '" title="' . $strEmpty . '" border="0" />';
-    $titles['NoEmpty']    = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_noempty.png" alt="' . $strEmpty . '" title="' . $strEmpty . '" border="0" />';
+    $titles['NoEmpty']    = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/bd_empty.png" alt="' . $strEmpty . '" title="' . $strEmpty . '" border="0" />';
 
     if ($propicon == 'both') {
         $titles['Browse']     .= '&nbsp;' . $strBrowse . '</div>';
@@ -308,7 +308,7 @@ else {
             </tr>
         </table>
     </td>
-    <td><img src="./images/spacer.gif" border="0" width="10" height="1" alt="" /></td>
+    <td><img src="./images/spacer.png" border="0" width="10" height="1" alt="" /></td>
     <td valign="top">
         <?php
             pma_TableHeader();
@@ -318,7 +318,7 @@ else {
                 <td align="center" bgcolor="<?php echo $bgcolor; ?>">
                     <input type="checkbox" name="selected_tbl[]" value="<?php echo $table_encoded; ?>" id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> />
                 </td>
-                <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap" <?php echo $click_mouse; ?>>
+                <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap" <?php //echo $click_mouse; ?>>
                     &nbsp;<b><label onclick="(document.getElementById('checkbox_tbl_<?php echo $i; ?>') ? return false : return true)" for="checkbox_tbl_<?php echo $i; ?>" title="<?php echo $alias; ?>"><?php echo $truename; ?></label>&nbsp;</b>&nbsp;
                 </td>
                 <td align="center" bgcolor="<?php echo $bgcolor; ?>">
@@ -564,7 +564,7 @@ else {
     ?>
             <tr>
                 <td colspan="<?php echo $basecolspan; ?>" valign="bottom">
-                    <img src="./images/arrow_<?php echo $text_dir; ?>.gif" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" />
+                    <img src="./images/arrow_<?php echo $text_dir; ?>.png" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" />
                     <a href="<?php echo $checkall_url; ?>&amp;checkall=1" onclick="setCheckboxes('tablesForm', true); return false;">
                         <?php echo $strCheckAll; ?></a>
                     &nbsp;/&nbsp;
@@ -576,7 +576,7 @@ else {
                         <?php echo $strCheckOverhead; ?></a>
                     <?php } ?>
                     &nbsp;&nbsp;&nbsp;
-                    <img src="./images/spacer.gif" border="0" width="38" height="1" alt="" />
+                    <img src="./images/spacer.png" border="0" width="38" height="1" alt="" />
                     <select name="submit_mult" dir="ltr" onchange="this.form.submit();">
     <?php
     echo "\n";
@@ -629,106 +629,178 @@ echo "\n";
 <?php
 /**
  * Work on the database
+    * redesigned 2004-05-08 by mkkeck
  */
 ?>
 <!-- DATABASE WORK -->
-<ul>
 
 <?php
 if ($num_tables > 0) {
     ?>
     <!-- Printable view of a table -->
-    <li>
+<table border="0" cellpadding="2" cellspacing="0">
-        <a href="db_printview.php?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a>
+                <tr><td nowrap="nowrap" colspan="3"><?php
-    </li>
+                  echo '<a href="db_printview.php?' . $url_query . '">';
-    <li>
+      if($cfg['PropertiesIconic']){
-        <a href="./db_datadict.php?<?php echo $url_query; ?>"><?php echo $strDataDict; ?></a>
+                          echo '<img src="./images/b_print.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
-    </li>
+                        }
+      echo $strPrintView . '</a>';
+    ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <?php
+                  echo '<a href="./db_datadict.php?' . $url_query . '">';
+                        if($cfg['PropertiesIconic']){
+                          echo '<img src="./images/b_tblanalyse.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+      }
+      echo $strDataDict . '</a>';
+?></td></tr>
+<tr><td colspan="3"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr></table>
     <?php
 } // end if
 ?>
+<table border="0" cellpadding="2" cellspacing="0">
+    <!-- Create a new table -->
+        <form method="post" action="tbl_create.php" onsubmit="return (emptyFormElements(this, 'table') && checkFormElementInRange(this, 'num_fields', 1))">
+     <tr>
+     <td class="tblHeaders" colspan="3" nowrap="nowrap"><?php
+        echo PMA_generate_common_hidden_inputs($db);
+        if($cfg['PropertiesIconic']){ echo '<img src="images/b_newtbl.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />'; }
+        // if you want navigation:
+        $strDBLink = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '">'
+                   . htmlspecialchars($GLOBALS['db']) . '</a>';
+        // else use
+        // $strDBLink = htmlspecialchars($db);
+echo '             ' . sprintf($strCreateNewTable, $strDBLink) . ':&nbsp;' . "\n";
+echo '     </td></tr>';
+echo '     <tr bgcolor="'.$cfg['BgcolorOne'].'"><td nowrap="nowrap">';
+echo '             ' . $strName . ':&nbsp;' . "\n";
+echo '     </td>';
+echo '     <td nowrap="nowrap">';
+echo '             ' . '<input type="text" name="table" maxlength="64" size="30" class="textfield" />';
+echo '     </td><td>&nbsp;</td></tr>';
+echo '     <tr bgcolor="'.$cfg['BgcolorOne'].'"><td nowrap="nowrap">';
+echo '             ' . $strFields . ':&nbsp;' . "\n";
+echo '     </td>';
+echo '     <td nowrap="nowrap">';
+echo '             ' . '<input type="text" name="num_fields" size="2" class="textfield" />' . "\n";
+echo '     </td>';
+echo '     <td align="right">';
+echo '             ' . '&nbsp;<input type="submit" value="' . $strGo . '" />' . "\n";
+?>
+     </td> </tr>
+        </form>
+
+
 
 <?php
 if ($cfgRelation['commwork']) {
 ?>
     <!-- Alter/Enter db-comment -->
-    <li>
+        <tr><td colspan="3"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>
+
+        <tr>
+        <td colspan="3" class="tblHeaders"><?php
+          if($cfg['PropertiesIconic']){
+                                          echo '<img src="images/b_comment.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+                                        }
+          echo $strDBComment;
+        ?></td></tr>
                                 <form method="post" action="db_details_structure.php">
-            <?php echo $strDBComment; ?>
+        <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
+                                  <td colspan="2" nowrap="nowrap">
             <input type="hidden" name="db_comment" value="true" />
             <?php echo PMA_generate_common_hidden_inputs($db); ?>
-            <input type="text" name="comment" class="textfield" value="<?php echo (isset($comment) && is_array($comment) ? htmlspecialchars(implode(' ', $comment)) : ''); ?>" />
+            <input type="text" name="comment" class="textfield" size="30" value="<?php echo (isset($comment) && is_array($comment) ? htmlspecialchars(implode(' ', $comment)) : ''); ?>" /></td><td align="right">
             <input type="submit" value="<?php echo $strGo; ?>" />
+         </td></tr>
         </form>
-    </li>
 <?php
 }
 ?>
-
-    <!-- Create a new table -->
-    <li>
-        <form method="post" action="tbl_create.php"
-            onsubmit="return (emptyFormElements(this, 'table') && checkFormElementInRange(this, 'num_fields', 1))">
-        <?php echo PMA_generate_common_hidden_inputs($db); ?>
-<?php
-echo '        ' . sprintf($strCreateNewTable, htmlspecialchars($db)) . '&nbsp;:<br />' . "\n";
-echo '        ' . $strName . '&nbsp;:&nbsp;' . "\n";
-echo '        ' . '<input type="text" name="table" maxlength="64" class="textfield" />' . "\n";
-echo '        ' . '<br />' . "\n";
-echo '        ' . $strFields . '&nbsp;:&nbsp;' . "\n";
-echo '        ' . '<input type="text" name="num_fields" size="2" class="textfield" />' . "\n";
-echo '        ' . '&nbsp;<input type="submit" value="' . $strGo . '" />' . "\n";
-?>
-        </form>
-    </li>
-
     <!-- Rename database -->
-    <li>
+        <tr><td colspan="3"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>
+        <tr><td colspan="3" class="tblHeaders"><?php
+          if($cfg['PropertiesIconic']){
+                                          echo '<img src="images/b_edit.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+                                        }
+          echo $strDBRename.':&nbsp;';
+          ?></td></tr>
         <form method="post" action="db_details_structure.php"
             onsubmit="return emptyFormElements(this, 'newname')">
-            <?php echo $strDBRename; ?>:
+                                        <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td colspan="2"><?php
-            <input type="hidden" name="db_rename" value="true" />
+          echo '<input type="hidden" name="db_rename" value="true" />'
-            <?php echo PMA_generate_common_hidden_inputs($db); ?>
+             . PMA_generate_common_hidden_inputs($db);
-            <input type="text" name="newname" class="textfield" value="" />
+          ?><input type="text" name="newname" size="30" class="textfield" value="" /></td>
-            <input type="submit" value="<?php echo $strGo; ?>" />
+            <td align="right"><input type="submit" value="<?php echo $strGo; ?>" /></td>
-        </form>
+        </form></tr>
-    </li>
+
 <?php
 
 if (PMA_MYSQL_INT_VERSION >= 40101) {
     // MySQL supports setting default charsets / collations for databases since
     // version 4.1.1.
     echo '    <!-- Change database charset -->' . "\n"
-       . '    <li>' . "\n"
+       . '    <tr><td colspan="3"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>' . "\n"
+       . '    <tr><td colspan="3" class="tblHeaders">';
+       if($cfg['PropertiesIconic']){
+         echo '<img src="./images/s_asci.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+       }
+    echo '      <label for="select_db_collation">' . $strCollation . '</label>:&nbsp;' . "\n"
+       . '    </td></tr>' . "\n"
        . '        <form method="post" action="./db_details_structure.php">' . "\n"
+       . '    <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td colspan="2" nowrap="nowrap">'
        . PMA_generate_common_hidden_inputs($db, $table, 3)
-       . '            <label for="select_db_collation">' . $strCollation . '</label>&nbsp;:&nbsp;' . "\n"
        . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, FALSE, 3)
+       . '    </td><td align="right">'
        . '            <input type="submit" name="submitcollation" value="' . $strGo . '" style="vertical-align: middle" />&nbsp;' . "\n"
+       . '    </td></tr>' . "\n"
        . '        </form>' . "\n"
-       . '    </li>' . "\n\n";
+       . '         ' . "\n\n";
 }
 
 if ($num_tables > 0
     && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == FALSE) {
-    echo '    <li>' . "\n";
+    echo '    <tr><td colspan="3"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>' . "\n"
-    echo '        <font color="red">' . $strError . '</font><br />' . "\n";
+       . '    <tr><td colspan="3" class="tblHeadError">';
+       if($cfg['PropertiesIconic']){
+         echo '<img src="./images/s_error.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+       }
+    echo '    ' . $strError . '' . "\n";
+    echo '</td><tr>';
+    echo '<td colspan="3" class="tblError">';
     $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">';
-    echo '        ' . sprintf($strRelationNotWorking, $url_to_goto, '</a>') . "\n";
+    echo '        ' . sprintf(wordwrap($strRelationNotWorking,60,'<br />'), $url_to_goto, '</a>') . "\n";
-    echo '    </li>' . "\n";
+    echo '    </td></tr>' . "\n";
 } // end if
-
+?>
+</table>
+<?php
 // is this OK to check for 'class' support?
 if ($num_tables > 0) {
     $takeaway = $url_query . '&amp;table=' . urlencode($table);
 }
+if (($cfgRelation['pdfwork'] && $num_tables > 0) ||
+($num_tables > 0
+    && $cfgRelation['relwork'] && $cfgRelation['commwork']
+    && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])
+    )
+) { ?><hr /><table border="0" cellpadding="2" cellspacing="0"><?php }
 
 if ($cfgRelation['pdfwork'] && $num_tables > 0) {
     ?>
     <!-- Work on PDF Pages -->
-    <li>
+      <tr><td colspan="3" class="tblHeaders">
-        <a href="pdf_pages.php?<?php echo $takeaway; ?>"><?php echo $strEditPDFPages; ?></a>
+      <?php
-    </li>
+        if($cfg['PropertiesIconic']){
+        echo '<img src="./images/b_pdfdoc.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+        }
+?>PDF</td></tr><tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
+        <td colspan="3"><?php
+        echo '<a href="pdf_pages.php?' . $takeaway . '">';
+        if($cfg['PropertiesIconic']){
+        echo '<img src="./images/b_edit.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+        }
+        echo ''. $strEditPDFPages . '</a>';
+     ?></td></tr>
 
     <!-- PDF schema -->
     <?php
@@ -740,10 +812,16 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
     if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) {
         echo "\n";
         ?>
-    <li>
         <form method="post" action="pdf_schema.php">
-            <?php echo PMA_generate_common_hidden_inputs($db); ?>
+         <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"><td colspan="3">
-            <?php echo $strDisplayPDF; ?>&nbsp;:<br />
+            <?php
+                  echo PMA_generate_common_hidden_inputs($db);
+                  if($cfg['PropertiesIconic']){
+                   echo '<img src="./images/b_view.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+                  }
+            ?>
+            <?php echo $strDisplayPDF; ?>:&nbsp;</td></tr>
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"><td width="20">&nbsp;</td><td colspan="2">
             <?php echo $strPageNumber; ?>&nbsp;
             <select name="pdf_page_number">
         <?php
@@ -755,22 +833,36 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
         unset($test_rs);
         echo "\n";
         ?>
-            </select><br />
+            </select></td></tr>
-            <input type="checkbox" name="show_grid" id="show_grid_opt" />
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
-            <label for="show_grid_opt"><?php echo $strShowGrid; ?></label><br />
+                                                  <td width="20">&nbsp;</td><td width="20" valign="top">
-            <input type="checkbox" name="show_color" id="show_color_opt" checked="checked" />
+            <input type="checkbox" name="show_grid" id="show_grid_opt" /></td><td>
-            <label for="show_color_opt"><?php echo $strShowColor; ?></label><br />
+            <label for="show_grid_opt"><?php echo $strShowGrid; ?></label></td></tr>
-            <input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" />
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
-            <label for="show_table_dim_opt"><?php echo $strShowTableDimension; ?></label><br />
+                                                  <td width="20">&nbsp;</td><td width="20" valign="top">
-            <input type="checkbox" name="all_tab_same_wide" id="all_tab_same_wide" />
+            <input type="checkbox" name="show_color" id="show_color_opt" checked="checked" /></td><td>
-            <label for="all_tab_same_wide"><?php echo $strAllTableSameWidth; ?></label> <br />
+            <label for="show_color_opt"><?php echo $strShowColor; ?></label></td></tr>
-            <input type="checkbox" name="with_doc" id="with_doc" checked="checked" />
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
-            <label for="with_doc"><?php echo $strDataDict; ?></label> <br />
+                                                  <td width="20">&nbsp;</td><td width="20" valign="top">
+            <input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" /></td><td>
+            <label for="show_table_dim_opt"><?php echo $strShowTableDimension; ?></label></td></tr>
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
+                                                  <td width="20">&nbsp;</td><td width="20" valign="top">
+            <input type="checkbox" name="all_tab_same_wide" id="all_tab_same_wide" /></td><td>
+            <label for="all_tab_same_wide"><?php echo wordwrap($strAllTableSameWidth,55,'<br />'); ?></label></td></tr>
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
+                                                  <td width="20">&nbsp;</td><td width="20" valign="top">
+            <input type="checkbox" name="with_doc" id="with_doc" checked="checked" /></td><td>
+            <label for="with_doc"><?php echo $strDataDict; ?></label></td></tr>
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
+                                                  <td width="20">&nbsp;</td><td colspan="2">
             <?php echo $strShowDatadictAs; ?>
             <select name="orientation">
                 <option value="L"><?php echo $strLandscape;?></option>
                 <option value="P"><?php echo $strPortrait;?></option>
-            </select><br />
+            </select></td></tr>
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
+                                                  <td width="20">&nbsp;</td><td colspan="2">
             <?php echo $strPaperSize; ?>
             <select name="paper">
             <?php
@@ -782,12 +874,17 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
                     echo ' >' . $val . '</option>' . "\n";
                 }
             ?>
-                </select><br />
+                </select></td></tr>
-                &nbsp;&nbsp;<input type="submit" value="<?php echo $strGo; ?>" />
+            <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
-            </form>
+                                                  <td width="20">&nbsp;</td><td colspan="3" align="right">
-    </li>
+                &nbsp;&nbsp;<input type="submit" value="<?php echo $strGo; ?>" /></td>
+            </form></tr>
+            <tr><td colspan="3"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>
         <?php
     }   // end if
+?>
+
+<?php
 } // end if
 
 if ($num_tables > 0
@@ -796,13 +893,23 @@ if ($num_tables > 0
     ) {
 ?>
     <!-- import docSQL files -->
-    <li>
+    <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td colspan="3"><?php
-        <a href="db_details_importdocsql.php?<?php echo $takeaway . '">' . $strImportDocSQL; ?></a>
+                   echo '<a href="db_details_importdocsql.php?' . $takeaway . '">';
-    </li>
+       if($cfg['PropertiesIconic']){
+         echo '<img src="./images/b_docsql.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
+       }
+       echo $strImportDocSQL . '</a>';
+    ?>
+    </td></tr>
     <?php
 }
-echo "\n" . '</ul>';
+echo "\n";
-
+if (($cfgRelation['pdfwork'] && $num_tables > 0) ||
+($num_tables > 0
+    && $cfgRelation['relwork'] && $cfgRelation['commwork']
+    && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])
+    )
+) { ?></table><?php }
 
 /**
  * Displays the footer

header.inc.php

@@ -22,7 +22,7 @@ if (empty($GLOBALS['is_header_sent'])) {
 
     require_once('./libraries/header_http.inc.php');
     require_once('./libraries/header_meta_style.inc.php');
-
+    /* replaced 2004-05-05 by Michael Keck (mkkeck)
     $title     = '';
     if (isset($GLOBALS['db'])) {
         $title .= str_replace('\'', '\\\'', $GLOBALS['db']);
@@ -35,6 +35,29 @@ if (empty($GLOBALS['is_header_sent'])) {
                . sprintf($GLOBALS['strRunning'], (empty($GLOBALS['cfg']['Server']['verbose']) ? str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']) : str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['verbose'])));
     }
     $title     .= (empty($title) ? '' : ' - ') . 'phpMyAdmin ' . PMA_VERSION;
+    */
+    /* the new one
+     * 2004-05-05: replaced by Michael Keck (mkkeck)
+     */
+    $title     = 'PMA | ';
+    if (!isset($cfg['SetHttpHostTitle']) || empty($cfg['SetHttpHostTitle'])){
+        if (isset($HTTP_HOST)){
+            $cfg['SetHttpHostTitle'] = $HTTP_HOST;
+        }
+    }
+    if ($cfg['ShowHttpHostTitle']) {
+        $title .= (empty($cfg['SetHttpHostTitle']) ? $HTTP_HOST : $cfg['SetHttpHostTitle']) . ' >> ';
+    }
+    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;
     ?>
     <script type="text/javascript" language="javascript">
     <!--
@@ -129,6 +152,7 @@ if (empty($GLOBALS['is_header_sent'])) {
     if (!defined('PMA_DISPLAY_HEADING')) {
         define('PMA_DISPLAY_HEADING', 1);
     }
+    /* replaced 2004-05-05 by mkkeck
     if (PMA_DISPLAY_HEADING) {
         $header_url_qry = '?' . PMA_generate_common_url();
         echo '<h1>' . "\n";
@@ -150,6 +174,66 @@ if (empty($GLOBALS['is_header_sent'])) {
         }
         echo "\n" . '</h1>' . "\n";
     }
+    /**/
+    /* the new one with Icons
+     * 2004-05-05 by Michael Keck (mkkeck)
+    */
+    if (PMA_DISPLAY_HEADING) {
+        $header_url_qry = '?' . PMA_generate_common_url();
+        echo '<table border="0" cellpadding="0" cellspacing="0"><tr>';
+        $server_info = (!empty($cfg['Server']['verbose'])
+                        ? $cfg['Server']['verbose']
+                        : $server_info = $cfg['Server']['host'] . (empty($cfg['Server']['port'])
+                                                                   ? ''
+                                                                   : ':' . $cfg['Server']['port']
+                                                                  )
+                       );
+        if (isset($GLOBALS['db'])) {
+            if($cfg['PropertiesIconic']){
+              $host_icon_img='<img src="./images/s_host.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+            }
+            echo '<td nowrap="nowrap">Server:&nbsp;</td>'
+               . '<td nowrap="nowrap"><b>'
+               . '<a href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">' . $host_icon_img . htmlspecialchars($server_info) . '</a>'
+               . '</b></td>';
+            if($cfg['PropertiesIconic']){
+              $db_icon_img='<img src="./images/s_db.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+            }
+            echo '<td nowrap="nowrap">&nbsp;&nbsp;&gt;&nbsp;&nbsp;</td>';
+            echo '<td nowrap="nowrap">' . $GLOBALS['strDatabase'] . ':&nbsp;</td>'
+               . '<td nowrap="nowrap"><b>'
+               . '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '">'
+               . $db_icon_img . htmlspecialchars($GLOBALS['db']) . '</a>'
+               . '</b></td>';
+            if (!empty($GLOBALS['table'])) {
+              if($cfg['PropertiesIconic']){
+                $tbl_icon_img='<img src="./images/s_tbl.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+              }
+              echo '<td nowrap="nowrap">&nbsp;&nbsp;&gt;&nbsp;&nbsp;</td>';
+              echo '<td nowrap="nowrap">' . $GLOBALS['strTable'] . ':&nbsp;</td>'
+                 . '<td nowrap="nowrap"><b><a href="'
+                 . $GLOBALS['cfg']['DefaultTabTable'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '">'
+                 . $tbl_icon_img . htmlspecialchars($GLOBALS['table'])
+                 . '</a></b></td>';
+            }
+
+        } else {
+           if($cfg['PropertiesIconic']){
+             $host_icon_img='<img src="./images/s_host.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+            }
+            echo '<tr><td nowrap="nowrap">Server:&nbsp;</td>'
+               . '<td nowrap="nowrap"><b><a href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">'
+               . $host_icon_img
+               . htmlspecialchars($server_info)
+               . '</a></b>&nbsp;</td>';
+        }
+        echo '</tr></table><br />';
+    }
+    /* end of replacement
+     *
+    */
+
+
     echo "\n";