Restored original style to printVal() when a value contains new-lines, lots of space...

Hide Languages and Casts from tab bar when $conf['show_advanced'] == false.
Added Privileges tab to Schema tab bar.

diff --git a/classes/Misc.php b/classes/Misc.php
index b65eae6d7df88957d0bf13766b6bae1b10f70620..cfa183b4980694c45b798e536d507e86eaec5ab7 100644 (file)
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -2,7 +2,7 @@
        /**
         * Class to hold various commonly used functions
         *
-        * $Id: Misc.php,v 1.77 2004/07/15 15:45:48 jollytoad Exp $
+        * $Id: Misc.php,v 1.78 2004/07/19 08:06:02 jollytoad Exp $
         */
         
        class Misc {
@@ -181,6 +181,7 @@
                                        // the whole string then render within a pre-formatted element (<pre>).
                                        if (preg_match('/(^ |  |\t|\n )/m', $str)) {
                                                $tag = 'pre';
+                                               $class = 'data';
                                                $out = htmlspecialchars($str);
                                        } else {
                                                $out = nl2br(htmlspecialchars($str));
@@ -397,6 +398,7 @@
                        
                        $databasevar = isset($_REQUEST['database']) ? 'database=' . urlencode($_REQUEST['database']) : '';
                        $schemavar = isset($_REQUEST['schema']) ? '&schema=' . urlencode($_REQUEST['schema']) : '';
+                       $hide_advanced = ($conf['show_advanced'] === false);
                        
                        switch ($section) {
                                case 'server':
@@ -456,11 +458,12 @@
                                                'languages' => array (
                                                        'title' => $lang['strlanguages'],
                                                        'url'   => "languages.php?{$vars}",
+                                                       'hide'  => $hide_advanced,
                                                ),
                                                'casts' => array (
                                                        'title' => $lang['strcasts'],
                                                        'url'   => "casts.php?{$vars}",
-                                                       'hide'  => (!$data->hasCasts()),
+                                                       'hide'  => ($hide_advanced || !$data->hasCasts()),
                                                ),
                                                'export' => array (
                                                        'title' => $lang['strexport'],
@@ -471,7 +474,6 @@
 
                                case 'schema':
                                        $vars = $databasevar . $schemavar;
-                                       $hide_advanced = ($conf['show_advanced'] === false);
                                        return array (
                                                'tables' => array (
                                                        'title' => $lang['strtables'],
@@ -519,6 +521,11 @@
                                                        'url'   => "conversions.php?{$vars}",
                                                        'hide'  => ($hide_advanced || !$data->hasConversions()),
                                                ),
+                                               'privileges' => array (
+                                                       'title' => $lang['strprivileges'],
+                                                       'url'   => "privileges.php?{$vars}&type=schema&object=" . urlencode($_REQUEST['schema']),
+                                                       'hide'  => (!$data->hasSchemas()),
+                                               ),
                                        );
 
                                case 'table':

diff --git a/themes/default/global.css b/themes/default/global.css
index 8e566b706f0f685dca02257967bdba387d89971e..2e38ba86fa012e69cc3e13a09ad82122ccf6b47a 100644 (file)
--- a/themes/default/global.css
+++ b/themes/default/global.css
@@ -1,7 +1,7 @@
 /**
  * Default style sheet
  *
- * $Id: global.css,v 1.23 2004/07/15 15:45:48 jollytoad Exp $
+ * $Id: global.css,v 1.24 2004/07/19 08:06:03 jollytoad Exp $
  */
 
 /** ELEMENTS */
@@ -278,3 +278,8 @@ a.navlink:active, a.toplink:active
 {
        font-weight: bold;
 }
+
+pre.data
+{
+       font-family: arial, tahoma, verdana, helvetica, sans-serif, serif;
+}