Fixed title in display.php and now uses 'subject' req var.

Updated pages that link to display.php.
Fixed hacks in view browsing - now consistent with table browsing.
Fixed reports.php titles and now uses printTable.

diff --git a/browser.php b/browser.php
index 29991691d88e01028e485dafb816d6fbf7e65bdc..7d1c004b5439cb08db37fce2b1358334e09301ea 100644 (file)
--- a/browser.php
+++ b/browser.php
@@ -5,7 +5,7 @@
         * if you click on a database it shows a list of database objects in that
         * database.
         *
-        * $Id: browser.php,v 1.41 2004/07/16 16:01:06 soranzo Exp $
+        * $Id: browser.php,v 1.42 2004/09/02 13:53:56 jollytoad Exp $
         */
 
        // Include application functions
@@ -59,7 +59,7 @@
                                                        'expandedIcon' => "../../../images/themes/{$conf['theme']}/tables.png",
                                                        'expanded' => false,
                                                        'linkTarget' => 'detail',
-                                                       'iconLink' => addslashes(htmlspecialchars('display.php?table=' . urlencode($tables->f['relname']) . '&objtype=table&' . $querystr . "&return_url={$return_url}&return_desc=" . urlencode($lang['strback'])))
+                                                       'iconLink' => addslashes(htmlspecialchars('display.php?table=' . urlencode($tables->f['relname']) . '&subject=table&' . $querystr . "&return_url={$return_url}&return_desc=" . urlencode($lang['strback'])))
                                                        ));
                        // Add table folder to schema
                        $table_node->addItem($item_node);
@@ -90,7 +90,7 @@
                                                        'expanded' => false,
                                                        'linkTarget' => 'detail',
                                                        // XXX: FIX BROWSE
-                                                       'iconLink' => addslashes(htmlspecialchars('display.php?table='.urlencode($views->f['relname']).'&objtype=view&'.$querystr.
+                                                       'iconLink' => addslashes(htmlspecialchars('display.php?view='.urlencode($views->f['relname']).'&subject=view&'.$querystr.
                                                                "&return_url={$return_url}&return_desc=" . urlencode($lang['strback'])))
                                                        ));
                        // Add view folder to schema

diff --git a/display.php b/display.php
index 983a8b4ab9b9cc9bb369ff87baa99451afb425c8..065a9941222e561c7e67301f91a4cc4d708f6eda 100644 (file)
--- a/display.php
+++ b/display.php
@@ -9,7 +9,7 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.44 2004/09/02 09:01:16 jollytoad Exp $
+        * $Id: display.php,v 1.45 2004/09/02 13:53:56 jollytoad Exp $
         */
 
        // Include application functions
@@ -31,7 +31,8 @@
                $key = $_REQUEST['key'];
 
                if ($confirm) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ", $misc->printVal($_REQUEST['table']), ": {$lang['streditrow']}</h2>\n";
+                       $misc->printTrail($_REQUEST['subject']);
+                       $misc->printTitle($lang['streditrow']);
                        $misc->printMsg($msg);
 
                        $attrs = &$data->getTableAttributes($_REQUEST['table']);
@@ -114,8 +115,8 @@
                        echo $misc->form;
                        if (isset($_REQUEST['table']))
                                echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
-                       if (isset($_REQUEST['objtype']))
-                               echo "<input type=\"hidden\" name=\"objtype\" value=\"", htmlspecialchars($_REQUEST['objtype']), "\" />\n";
+                       if (isset($_REQUEST['subject']))
+                               echo "<input type=\"hidden\" name=\"subject\" value=\"", htmlspecialchars($_REQUEST['subject']), "\" />\n";
                        if (isset($_REQUEST['query']))
                                echo "<input type=\"hidden\" name=\"query\" value=\"", htmlspecialchars($_REQUEST['query']), "\" />\n";
                        if (isset($_REQUEST['count']))
@@ -158,8 +159,9 @@
                global $lang;
                global $PHP_SELF;
 
-               if ($confirm) { 
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ", $misc->printVal($_REQUEST['table']), ": {$lang['strdeleterow']}</h2>\n";
+               if ($confirm) {
+                       $misc->printTrail($_REQUEST['subject']);
+                       $misc->printTitle($lang['strdeleterow']);
 
                        echo "<p>{$lang['strconfdeleterow']}</p>\n";
                        
@@ -168,8 +170,8 @@
                        echo $misc->form;
                        if (isset($_REQUEST['table']))
                                echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
-                       if (isset($_REQUEST['objtype']))
-                               echo "<input type=\"hidden\" name=\"objtype\" value=\"", htmlspecialchars($_REQUEST['objtype']), "\" />\n";
+                       if (isset($_REQUEST['subject']))
+                               echo "<input type=\"hidden\" name=\"subject\" value=\"", htmlspecialchars($_REQUEST['subject']), "\" />\n";
                        if (isset($_REQUEST['query']))
                                echo "<input type=\"hidden\" name=\"query\" value=\"", htmlspecialchars($_REQUEST['query']), "\" />\n";
                        if (isset($_REQUEST['count']))
@@ -207,18 +209,24 @@
                
                // If current page is not set, default to first page
                if (!isset($_REQUEST['page'])) $_REQUEST['page'] = 1;
-       
-               // If 'table' is not set, default to '' and set type
-               if (isset($_REQUEST['table']) && isset($_REQUEST['query'])) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ", $misc->printVal($_REQUEST['table']), ": {$lang['strselect']}</h2>\n";
-                       $type = 'SELECT';
-               }
-               elseif (isset($_REQUEST['table'])) {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}: ", $misc->printVal($_REQUEST['table']), ": {$lang['strbrowse']}</h2>\n";
-                       $type = 'TABLE';
+               
+               if (isset($_REQUEST['subject'])) {
+                       $subject = $_REQUEST['subject'];
+                       if (isset($_REQUEST[$subject])) $object = $_REQUEST[$subject];
                }
-               else {
-                       echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strqueryresults']}</h2>\n";
+       
+               $misc->printTrail(isset($subject) ? $subject : 'database');
+               
+               if (isset($object)) {
+                       if (isset($_REQUEST['query'])) {
+                               $misc->printTitle($lang['strselect']);
+                               $type = 'SELECT';
+                       } else {
+                               $misc->printTitle($lang['strbrowse']);
+                               $type = 'TABLE';
+                       }
+               } else {
+                       $misc->printTitle($lang['strqueryresults']);
                        $type = 'QUERY';
                }
 
@@ -232,8 +240,8 @@
                if (!isset($_REQUEST['strings'])) $_REQUEST['strings'] = 'collapsed';
        
                // Fetch unique row identifier, if this is a table browse request.
-               if (isset($_REQUEST['table']))
-                       $key = $data->getRowIdentifier($_REQUEST['table']);
+               if (isset($object))
+                       $key = $data->getRowIdentifier($object);
                else
                        $key = array();
                
@@ -246,15 +254,15 @@
 
                // Retrieve page from query.  $max_pages is returned by reference.
                $rs = &$data->browseQuery($type, 
-                       isset($_REQUEST['table']) ? $_REQUEST['table'] : null, 
+                       isset($object) ? $object : null, 
                        isset($_REQUEST['query']) ? $_REQUEST['query'] : null, 
                        $_REQUEST['sortkey'], $_REQUEST['sortdir'], $_REQUEST['page'],
                        $conf['max_rows'], $max_pages);
        
                // Build strings for GETs
                $str =  $misc->href; // . "&amp;page=" . urlencode($_REQUEST['page']);
-               if (isset($_REQUEST['table'])) $str .= "&amp;table=" . urlencode($_REQUEST['table']);
-               if (isset($_REQUEST['objtype'])) $str .= "&amp;objtype=" . urlencode($_REQUEST['objtype']);
+               if (isset($object)) $str .= "&amp;" . urlencode($subject) . '=' . urlencode($object);
+               if (isset($subject)) $str .= "&amp;subject=" . urlencode($subject);
                if (isset($_REQUEST['query'])) $str .= "&amp;query=" . urlencode($_REQUEST['query']);
                if (isset($_REQUEST['count'])) $str .= "&amp;count=" . urlencode($_REQUEST['count']);
                if (isset($_REQUEST['return_url'])) $str .= "&amp;return_url=" . urlencode($_REQUEST['return_url']);
@@ -286,7 +294,7 @@
 
                        $j = 0;         
                        foreach ($rs->f as $k => $v) {
-                               if (isset($_REQUEST['table']) && $k == $data->id && !$conf['show_oids']) {
+                               if (isset($object) && $k == $data->id && !$conf['show_oids']) {
                                        $j++;
                                        continue;
                                }
@@ -391,9 +399,9 @@
                }
 
                // Insert
-               if ( isset($_REQUEST['table']) && ( isset($_REQUEST['objtype']) && $_REQUEST['objtype'] == 'table') ) {
+               if (isset($object) && (isset($subject) && $subject == 'table')) {
                        echo " | <a class=\"navlink\" href=\"tables.php?action=confinsertrow&amp;table=",
-                               urlencode($_REQUEST['table']), "&amp;{$misc->href}\">{$lang['strinsert']}</a>\n";
+                               urlencode($object), "&amp;{$misc->href}\">{$lang['strinsert']}</a>\n";
                }
 
                // Refresh
@@ -404,10 +412,11 @@
        }
        
        // If a table is specified, then set the title differently
-       if (isset($_REQUEST['table']))
+       if (isset($_REQUEST['subject']) && isset($_REQUEST[$_REQUEST['subject']]))
                $misc->printHeader($lang['strtables']);
        else    
                $misc->printHeader($lang['strqueryresults']);
+
        $misc->printBody();
 
        switch ($action) {

diff --git a/reports.php b/reports.php
index fcc2c3b13b6eccb1fd66529057bd3dcef222fd4a..df78fe6c00c60d9e78e381c351b6581c491d22fa 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -3,7 +3,7 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.18 2004/07/07 02:59:58 chriskl Exp $
+        * $Id: reports.php,v 1.19 2004/09/02 13:53:56 jollytoad Exp $
         */
 
        // Include application functions
@@ -31,7 +31,9 @@
                // Get a list of available databases
                $databases = &$data->getDatabases();
 
-               echo "<h2>{$lang['strreports']}: ", htmlspecialchars($report->f['report_name']), ": {$lang['stredit']}</h2>\n";
+               $_REQUEST['report'] = $report->f['report_name'];
+               $misc->printTrail('report');
+               $misc->printTitle($lang['stredit']);
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -96,7 +98,9 @@
 
                $report = $reportsdb->getReport($_REQUEST['report_id']);
 
-               echo "<h2>{$lang['strreports']}: ", htmlspecialchars($report->f['report_name']), "</h2>\n";
+               $_REQUEST['report'] = $report->f['report_name'];
+               $misc->printTrail('report');
+               $misc->printTitle($lang['strproperties']);
                $misc->printMsg($msg);
 
                if ($report->recordCount() == 1) {
@@ -131,7 +135,8 @@
 
                $databases = &$data->getDatabases();
 
-               echo "<h2>{$lang['strreports']}: {$lang['strcreatereport']}</h2>\n";
+               $misc->printTrail('server');
+               $misc->printTitle($lang['strcreatereport']);
                $misc->printMsg($msg);
 
                echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -198,7 +203,9 @@
                        // Fetch report from the database
                        $report = &$reportsdb->getReport($_REQUEST['report_id']);
 
-                       echo "<h2>{$lang['strreports']}: ", $misc->printVal($report->f['report_name']), ": {$lang['strdrop']}</h2>\n";
+                       $_REQUEST['report'] = $report->f['report_name'];
+                       $misc->printTrail('report');
+                       $misc->printTitle($lang['strdrop']);
 
                        echo "<p>", sprintf($lang['strconfdropreport'], $misc->printVal($report->f['report_name'])), "</p>\n";
 
@@ -226,42 +233,59 @@
                global $data, $misc, $reportsdb;
                global $PHP_SELF, $lang;
 
-               echo "<h2>{$lang['strreports']}</h2>\n";
+               $misc->printTrail('server');
+               $misc->printTitle($lang['strreports']);
                $misc->printMsg($msg);
-                       
+               
                $reports = &$reportsdb->getReports();
                
-               if ($reports->recordCount() > 0) {
-                       echo "<table>\n";
-                       echo "<tr><th class=\"data\">{$lang['strreport']}</th><th class=\"data\">{$lang['strdatabase']}</th><th class=\"data\">{$lang['strcreated']}</th><th colspan=\"4\" class=\"data\">{$lang['stractions']}</th>\n";
-                       $i = 0;
-                       while (!$reports->EOF) {
-                               // @@@@@@@@@ FIX THIS!!!!!
-                               $query = urlencode($reports->f['report_sql']);
-                               $return_url = urlencode('reports.php');
-                               $return_desc = urlencode($lang['strback']);
-                               $id = (($i % 2) == 0 ? '1' : '2');
-                               echo "<tr><td class=\"data{$id}\">", $misc->printVal($reports->f['report_name']), "</td>\n";
-                               echo "<td class=\"data{$id}\">", $misc->printVal($reports->f['db_name']), "</td>\n";
-                               echo "<td class=\"data{$id}\">", $misc->printVal($reports->f['date_created']), "</td>\n";
-                               echo "<td class=\"opbutton{$id}\"><a href=\"display.php?database=", urlencode($reports->f['db_name']),
-                                       "&amp;query={$query}&amp;return_url={$return_url}&amp;return_desc={$return_desc}\">{$lang['strrun']}</a></td>\n";
-                               echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&amp;report_id=",
-                                       $reports->f['report_id'], "\">{$lang['strproperties']}</a></td>\n";
-                               echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=edit&amp;report_id=",
-                                       $reports->f['report_id'], "\">{$lang['stredit']}</a></td>\n";
-                               echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&amp;report_id=",
-                                       $reports->f['report_id'], "\">{$lang['strdrop']}</a></td>\n";
-                               echo "</tr>\n";
-                               $reports->moveNext();
-                               $i++;
-                       }
-                       echo "</table>\n";
-               }
-               else {
-                       echo "<p>{$lang['strnoreports']}</p>\n";
-               }
-
+               $columns = array(
+                       'report' => array(
+                               'title' => $lang['strreport'],
+                               'field' => 'report_name',
+                       ),
+                       'database' => array(
+                               'title' => $lang['strdatabase'],
+                               'field' => 'db_name',
+                       ),
+                       'created' => array(
+                               'title' => $lang['strcreated'],
+                               'field' => 'date_created',
+                       ),
+                       'actions' => array(
+                               'title' => $lang['stractions'],
+                       ),
+                       'comment' => array(
+                               'title' => $lang['strcomment'],
+                               'field' => 'descr',
+                       ),
+               );
+               
+               $actions = array(
+                       'properties' => array(
+                               'title' => $lang['strproperties'],
+                               'url'   => "{$PHP_SELF}?action=properties&amp;",
+                               'vars'  => array('report_id' => 'report_id'),
+                       ),
+                       'run' => array(
+                               'title' => $lang['strrun'],
+                               'url'   => "display.php?subject=report&amp;return_url={$PHP_SELF}&amp;return_desc=".urlencode($lang['strback'])."&amp;",
+                               'vars'  => array('report' => 'report_name', 'database' => 'db_name', 'query' => 'report_sql'),
+                       ),
+                       'edit' => array(
+                               'title' => $lang['stredit'],
+                               'url'   => "{$PHP_SELF}?action=edit&amp;",
+                               'vars'  => array('report_id' => 'report_id'),
+                       ),
+                       'drop' => array(
+                               'title' => $lang['strdrop'],
+                               'url'   => "{$PHP_SELF}?action=confirm_drop&amp;",
+                               'vars'  => array('report_id' => 'report_id'),
+                       ),
+               );
+               
+               $misc->printTable($reports, $columns, $actions, $lang['strnoreports']);
+               
                echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create\">{$lang['strcreatereport']}</a></p>\n";
        }
        

diff --git a/tables.php b/tables.php
index a4672143943ad00ede5c4822695cbb37d0370158..f073b2652f7078d8d02956c076c84e3d6b7d9505 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.65 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: tables.php,v 1.66 2004/09/02 13:53:56 jollytoad Exp $
         */
 
        // Include application functions
@@ -281,6 +281,7 @@
 
                        echo "<p><input type=\"hidden\" name=\"action\" value=\"selectrows\" />\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"subject\" value=\"table\" />\n";
                        echo $misc->form;
                        echo "<input type=\"submit\" name=\"select\" value=\"{$lang['strselect']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
@@ -561,7 +562,7 @@
                        ),
                        'browse' => array(
                                'title' => $lang['strbrowse'],
-                               'url'   => "display.php?{$misc->href}&amp;objtype=table&amp;return_url=".urlencode("tables.php?{$misc->href}")."&amp;return_desc=".urlencode($lang['strback'])."&amp;",
+                               'url'   => "display.php?{$misc->href}&amp;subject=table&amp;return_url=".urlencode("tables.php?{$misc->href}")."&amp;return_desc=".urlencode($lang['strback'])."&amp;",
                                'vars'  => array('table' => 'relname'),
                        ),
                        'select' => array(

diff --git a/tblproperties.php b/tblproperties.php
index 87a718aee555877e5e36a81cb44faca16b49b86d..d79e6c7e60ae881de801459bdef945656fd9b358 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.59 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: tblproperties.php,v 1.60 2004/09/02 13:53:57 jollytoad Exp $
         */
 
        // Include application functions
@@ -581,7 +581,7 @@
 
                echo "<ul>\n";
                $return_url = urlencode("tblproperties.php?{$misc->href}&table={$_REQUEST['table']}");
-               echo "\t<li><a href=\"display.php?{$misc->href}&table=", urlencode($_REQUEST['table']), "&objtype=table&return_url={$return_url}&return_desc=",
+               echo "\t<li><a href=\"display.php?{$misc->href}&table=", urlencode($_REQUEST['table']), "&subject=table&return_url={$return_url}&return_desc=",
                        urlencode($lang['strback']), "\">{$lang['strbrowse']}</a></li>\n";
                echo "\t<li><a href=\"tables.php?action=confselectrows&{$misc->href}&table=", urlencode($_REQUEST['table']),"\">{$lang['strselect']}</a></li>\n";
                echo "\t<li><a href=\"tables.php?action=confinsertrow&{$misc->href}&table=", urlencode($_REQUEST['table']),"\">{$lang['strinsert']}</a></li>\n";

diff --git a/viewproperties.php b/viewproperties.php
index 687b0fb11981c707872a86fb357a5e3ea41314f6..f45e979ba6a3738d1801738b9ce40df0ca61cfb0 100755 (executable)
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -3,7 +3,7 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.11 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: viewproperties.php,v 1.12 2004/09/02 13:53:57 jollytoad Exp $
         */
 
        // Include application functions
@@ -302,20 +302,8 @@
                echo "<br />\n";
 
                echo "<ul>\n";
-
-               // @@@@@@@@@ FIX THIS!!!!!
-               $data->fieldClean($_REQUEST['view']);
-               if ($data->hasSchemas() && isset($_REQUEST['schema'])) {
-                       $data->fieldClean($_REQUEST['schema']);
-                       $query = urlencode("SELECT * FROM \"{$_REQUEST['schema']}\".\"{$_REQUEST['view']}\"");
-               }
-               else
-                       $query = urlencode("SELECT * FROM \"{$_REQUEST['view']}\"");
-                       
-               $count = urlencode("SELECT COUNT(*) AS total FROM \"{$_REQUEST['view']}\"");
                $return_url = urlencode("viewproperties.php?{$misc->href}&view=" . urlencode($_REQUEST['view']));
-
-               echo "\t<li><a href=\"display.php?{$misc->href}&query={$query}&count={$count}&return_url={$return_url}&return_desc=",
+               echo "\t<li><a href=\"display.php?{$misc->href}&view=", urlencode($_REQUEST['view']), "&subject=view&return_url={$return_url}&return_desc=",
                        urlencode($lang['strback']), "\">{$lang['strbrowse']}</a></li>\n";
                echo "\t<li><a href=\"views.php?action=confselectrows&{$misc->href}&view=", urlencode($_REQUEST['view']),"\">{$lang['strselect']}</a></li>\n";
                echo "\t<li><a href=\"views.php?action=confirm_drop&{$misc->href}&view=", urlencode($_REQUEST['view']),"\">{$lang['strdrop']}</a></li>\n";

diff --git a/views.php b/views.php
index d90c1726ad15f059cb595c15b2ed40c2f63e2f54..25763f04028ff29191d3f8fdf6dde6cadd1b7fcf 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.49 2004/09/01 16:35:59 jollytoad Exp $
+        * $Id: views.php,v 1.50 2004/09/02 13:53:57 jollytoad Exp $
         */
 
        // Include application functions
@@ -87,6 +87,7 @@
 
                        echo "<p><input type=\"hidden\" name=\"action\" value=\"selectrows\" />\n";
                        echo "<input type=\"hidden\" name=\"view\" value=\"", htmlspecialchars($_REQUEST['view']), "\" />\n";
+                       echo "<input type=\"hidden\" name=\"subject\" value=\"view\" />\n";
                        echo $misc->form;
                        echo "<input type=\"submit\" name=\"select\" value=\"{$lang['strselect']}\" />\n";
                        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
@@ -520,17 +521,6 @@
                global $data, $misc, $conf;
                global $PHP_SELF, $lang;
                
-               function vwPre(&$rowdata) {
-                       global $data;
-                       if ($data->hasSchemas() && isset($_REQUEST['schema'])) {
-                               $data->fieldClean($_REQUEST['schema']);
-                               $rowdata->f['+vwquery'] = "SELECT * FROM \"{$_REQUEST['schema']}\".\"{$rowdata->f['relname']}\"";
-                       } else {
-                               $rowdata->f['+vwquery'] = "SELECT * FROM \"{$rowdata->f['relname']}\"";
-                       }
-                       $rowdata->f['+vwcount'] = "SELECT COUNT(*) AS total FROM \"{$rowdata->f['relname']}\"";
-               }
-               
                $misc->printTrail('schema');
                $misc->printTabs('schema','views');
                $misc->printMsg($msg);
@@ -563,8 +553,8 @@
                        ),
                        'browse' => array(
                                'title' => $lang['strbrowse'],
-                               'url'   => "display.php?{$misc->href}&amp;return_url=".urlencode("views.php?{$misc->href}")."&amp;return_desc=".urlencode($lang['strback'])."&amp;",
-                               'vars'  => array('query' => '+vwquery', 'count' => '+vwcount'),
+                               'url'   => "display.php?{$misc->href}&amp;subject=view&amp;return_url=".urlencode("views.php?{$misc->href}")."&amp;return_desc=".urlencode($lang['strback'])."&amp;",
+                               'vars'  => array('view' => 'relname'),
                        ),
                        'select' => array(
                                'title' => $lang['strselect'],
@@ -586,7 +576,7 @@
                        ),
                );
                
-               $misc->printTable($views, $columns, $actions, $lang['strnoviews'], 'vwPre');
+               $misc->printTable($views, $columns, $actions, $lang['strnoviews']);
                
                echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create&{$misc->href}\">{$lang['strcreateview']}</a> |\n";
                echo "<a class=\"navlink\" href=\"$PHP_SELF?action=wiz_create&{$misc->href}\">{$lang['strcreateviewwiz']}</a></p>\n";