css improvements (design should not be changed by this, just the way how it is done)

2004-06-03 09:31:39 +00:00
parent 7192ed534c
commit a32dc0b397
7 changed files with 103 additions and 90 deletions
--- a/6
+++ b/6
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$

+2004-06-03 Michal Čihař  <michal@cihar.com>
+    * db_details_links.php, header.inc.php, server_links.inc.php,
+      tbl_properties_links.php, css/phpmyadmin.css.php: Use classes for
+      heading (RFE #965542).
+    * libraries/common.lib.php: Add drop class also to td (RFE #946540).
+
 2004-06-02 Alexander M. Turek  <happybirthdaytome@derrabus.de>
    * db_details_db_info.php, tbl_properties_tbl_info.php: Table type is called
      "Engine" in MySQL 4.1.2 (bug #964011).
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -177,6 +177,11 @@ td.tab          {
    border-radius: 2px;
    -moz-border-radius: 2px;
 }
+
+div.tabs {
+    clear: both;
+}
+
 table.tabs      {
    border-top: none;
    border-right: none;
@@ -475,3 +480,47 @@ textarea {
    margin: 0px;
    padding: 0px;
 }
+
+/* Heading */
+
+h1 div {
+    display: block;
+    float: left;
+    padding: 2px 2px 5px 2px;
+    margin: 0px;
+    font-family: <?php echo $right_font_family; ?>;
+    font-size: <?php echo $font_size; ?>;
+    font-weight: normal;
+}
+
+h1 div a {
+<?php if ($cfg['ErrorIconic']) { ?>
+    background-repeat: no-repeat;
+    background-position: 2px 50%;
+    padding-left: 20px;
+<?php } ?>
+}
+
+h1 div a {
+    font-weight: bolder;
+}
+
+<?php if ($cfg['ErrorIconic']) { ?>
+h1 div.server a {
+    background-image: url(../images/s_host.png);
+}
+
+h1 div.database a {
+    background-image: url(../images/s_db.png);
+}
+
+h1 div.table a {
+    background-image: url(../images/s_tbl.png);
+}
+<?php } ?>
+
+div.database:before , div.table:before {
+    content: '>';
+    padding-left: 5px;
+    padding-right: 5px;
+}
--- a/db_details_links.php
+++ b/db_details_links.php
@@ -59,6 +59,7 @@ else {
 * Displays tab links
 */

+echo '<div class="tabs">';
 if ($cfg['LightTabs']) {
    echo '&nbsp;';
 } else {
@@ -84,5 +85,6 @@ if (!$cfg['LightTabs']) {
 } else {
    echo '<br />';
 }
+echo '</div>';
 ?>
 <br />
--- a/header.inc.php
+++ b/header.inc.php
@@ -147,10 +147,13 @@ if (empty($GLOBALS['is_header_sent'])) {
    if (!defined('PMA_DISPLAY_HEADING')) {
        define('PMA_DISPLAY_HEADING', 1);
    }
-    /* replaced 2004-05-05 by mkkeck
+
+    /**
+     * Display heading if needed. Design can be set in css file.
+     */
    if (PMA_DISPLAY_HEADING) {
+        echo "<h1>\n\n";
        $header_url_qry = '?' . PMA_generate_common_url();
-        echo '<h1>' . "\n";
        $server_info = (!empty($cfg['Server']['verbose'])
                        ? $cfg['Server']['verbose']
                        : $server_info = $cfg['Server']['host'] . (empty($cfg['Server']['port'])
@@ -158,88 +161,28 @@ if (empty($GLOBALS['is_header_sent'])) {
                                                                   : ':' . $cfg['Server']['port']
                                                                  )
                       );
-        if (isset($GLOBALS['db'])) {
-            echo '    ' . $GLOBALS['strDatabase'] . ' <i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '">' . htmlspecialchars($GLOBALS['db']) . '</a></i>' . "\n";
+        echo '<div class="server">' . sprintf($GLOBALS['strServer'],'') . "\n"
+            . '<a href="' . $GLOBALS['cfg']['DefaultTabServer'] . '?' . PMA_generate_common_url() . '">' 
+            . htmlspecialchars($server_info) . '</a>' . "\n"
+            . '</div>' . "\n\n";
+
+        if (!empty($GLOBALS['db'])) {
+            echo '<div class="database">' . $GLOBALS['strDatabase'] . "\n"
+                . '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($GLOBALS['db']) . '">'
+                . htmlspecialchars($GLOBALS['db']) . '</a>' . "\n"
+                . '</div>' . "\n\n";
+               
            if (!empty($GLOBALS['table'])) {
-                echo '    - ' . $GLOBALS['strTable'] . ' <i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabTable'] . $header_url_qry . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '">' . htmlspecialchars($GLOBALS['table']) . '</a></i>' . "\n";
+                echo '<div class="table">' . $GLOBALS['strTable'] . "\n"
+                    . '<a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']) . '">' 
+                    . htmlspecialchars($GLOBALS['table']) . '</a>' . "\n"
+                    . '</div>' . "\n\n";
            }
-            echo '    ' . sprintf($GLOBALS['strRunning'], '<i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">' . htmlspecialchars($server_info) . '</a></i>');
-        } else {
-            echo '    ' . sprintf($GLOBALS['strServer'], '<i><a class="h1" href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">' . htmlspecialchars($server_info) . '</a></i>');
        }
-        echo "\n" . '</h1>' . "\n";
+        echo '</h1>';
    }
-    /**/
-    /* 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" />';
-            } else {
-                $host_icon_img = '';
-            }
-            echo '<td nowrap="nowrap">' . sprintf($GLOBALS['strServer'],'') . ':&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" />';
-            } else {
-              $db_icon_img = '';
-            }
-            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" />';
-              } else {
-                $tbl_icon_img = '';
-              }
-              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" />';
-            } else {
-                $host_icon_img = '';
-            }
-            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";

-
    /**
     * Sets a variable to remember headers have been sent
     */
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1732,15 +1732,18 @@ if (typeof(document.getElementById) != 'undefined'
        global $PHP_SELF, $cfg;
        global $db_details_links_count_tabs;

-        if (!empty($class)) $class = ' class="' . $class . '"';
+        if (!empty($class)) {
+            $class = ' class="' . $class . '"';
+            $addclass = ' ' . $class;
+        } else {
+            $addclass = '';
+        }

        if (((!isset($GLOBALS['active_page']) && basename($PHP_SELF) == $link) ||
                $active ||
                (isset($GLOBALS['active_page']) && $GLOBALS['active_page'] == $link)
            ) && ($text != $GLOBALS['strEmpty'] && $text != $GLOBALS['strDrop'])) {
-            $addclass = ' activetab';
-        } else {
-            $addclass = '';
+            $addclass .= ' activetab';
        }

        $db_details_links_count_tabs++;
--- a/server_links.inc.php
+++ b/server_links.inc.php
@@ -41,11 +41,15 @@ if (!empty($message)) {
 /**
 * Displays tab links
 */
-?>
-<table border="0" cellspacing="0" cellpadding="3" width="100%" class="tabs">
-    <tr>
-        <td width="8">&nbsp;</td>
-<?php
+echo '<div class="tabs">';
+if ($cfg['LightTabs']) {
+    echo '&nbsp;';
+} else {
+    echo '<table border="0" cellspacing="0" cellpadding="3" width="100%" class="tabs">' . "\n"
+       . '    <tr>' . "\n"
+       . '        <td width="8">&nbsp;</td>';
+}
+
 echo PMA_printTab($strDatabases, 'server_databases.php', $url_query);
 if ($cfg['ShowMysqlInfo']) {
    echo PMA_printTab($strStatus, 'server_status.php', $url_query);
@@ -61,7 +65,11 @@ if ($is_superuser) {
 }
 echo PMA_printTab($strServerTabProcesslist, 'server_processlist.php', $url_query);
 echo PMA_printTab($strExport, 'server_export.php', $url_query);
+
+if (!$cfg['LightTabs']) {
+    echo '</tr></table>';
+} else {
+    echo '<br />';
+}
+echo '</div>';
 ?>
-    </tr>
-</table>
-<br />
--- a/tbl_properties_links.php
+++ b/tbl_properties_links.php
@@ -65,6 +65,7 @@ $class7 = 'drop';
 * Displays links
 */

+echo '<div class="tabs">';
 if ($cfg['LightTabs']) {
    echo '&nbsp;';
 } else {
@@ -89,5 +90,6 @@ if (!$cfg['LightTabs']) {
 } else {
    echo '<br />';
 }
+echo '</div>';

 ?><br />