improve data management navigation; adds browse/search options to tables/views, and...

diff --git a/classes/Misc.php b/classes/Misc.php
index 1b34b14ec11c0a7868b8881923bcead37a373a35..5cca845897f9aea0d53150f4e5e7bb2cc3fad1ed 100644 (file)
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -1015,6 +1015,31 @@
                                                        'icon'  => 'Columns',
                                                        'branch'=> true,
                                                ),
+                                               'browse' => array(
+                                                       'title' => $lang['strbrowse'],
+                                                       'icon'=>'Columns',
+                                                       'url'   => 'display.php',
+                                                       'urlvars' => array ('subject' => 'table','table' => field('table')),
+                                                       'return' => 'table',
+                                                       'branch'=> true,
+                                               ),
+                                               'select' => array(
+                                                       'title' => $lang['strselect'],
+                                                       'icon'  => 'Search',
+                                                       'url'   => 'tables.php',
+                                                       'urlvars' => array('subject' => 'table', 'table' => field('table'),'action' => 'confselectrows',),
+                                                       'help'  => 'pg.sql.select',
+                                               ),
+                                               'insert'=>array(
+                                                       'title' => $lang['strinsert'],
+                                                       'url' => 'tables.php',
+                                                       'urlvars' => array (
+                                                               'action' => 'confinsertrow',
+                                                               'table' => field('table')
+                                                       ),
+                                                       'help'  => 'pg.sql.insert',
+                                                       'icon'=>'Operator'
+                                               ),
                                                'indexes' => array (
                                                        'title' => $lang['strindexes'],
                                                        'url'   => 'indexes.php',
@@ -1092,6 +1117,25 @@
                                                        'icon'  => 'Columns',
                                                        'branch'=> true,
                                                ),
+                                               'browse' => array(
+                                                       'title' => $lang['strbrowse'],
+                                                       'icon'=>'Columns',
+                                                       'url'   => 'display.php',
+                                                       'urlvars' => array (
+                                                                       'action' => 'confselectrows',
+                                                                       'return' => 'schema',
+                                                                       'subject' => 'view',
+                                                                       'view' => field('view')
+                                                       ),
+                                                       'branch'=> true,
+                                               ),
+                                               'select' => array(
+                                                       'title' => $lang['strselect'],
+                                                       'icon'  => 'Search',
+                                                       'url'   => 'views.php',
+                                                       'urlvars' => array('action' => 'confselectrows', 'view' => field('view'),),
+                                                       'help'  => 'pg.sql.select',
+                                               ),
                                                'definition' => array (
                                                        'title' => $lang['strdefinition'],
                                                        'url'   => 'viewproperties.php',

diff --git a/display.php b/display.php
index 87771db43b3dba2d1c78bc1b6dce5e9bcf0544c1..f87a215337b796ee03244f2506af252cacd1b8d9 100644 (file)
--- a/display.php
+++ b/display.php
@@ -443,6 +443,7 @@
                }
 
                $misc->printTrail(isset($subject) ? $subject : 'database');
+               $misc->printTabs($subject,'browse');
 
                /* This code is used when browsing FK in pure-xHTML (without js) */
                if (isset($_REQUEST['fkey'])) {
@@ -461,7 +462,6 @@
                                $type = 'SELECT';
                        }
                        else {
-                               $misc->printTitle($lang['strbrowse']);
                                $type = 'TABLE';
                        }
                } else {

diff --git a/tables.php b/tables.php
index ab727f1f1c4a69b2c9fe2bded1b2b55a74315fa4..c92225cf48ed460fd9820d8a4128186de2d804a6 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -349,7 +349,7 @@
 
                if ($confirm) {
                        $misc->printTrail('table');
-                       $misc->printTitle($lang['strselect'], 'pg.sql.select');
+                       $misc->printTabs('table','select');
                        $misc->printMsg($msg);
 
                        $attrs = $data->getTableAttributes($_REQUEST['table']);
@@ -456,7 +456,8 @@
 
                if ($confirm) {
                        $misc->printTrail('table');
-                       $misc->printTitle($lang['strinsertrow'], 'pg.sql.insert');
+                       $misc->printTabs('table','insert');
+                       
                        $misc->printMsg($msg);
 
                        $attrs = $data->getTableAttributes($_REQUEST['table']);
@@ -776,7 +777,7 @@
                                                'url' => 'display.php',
                                                'urlvars' => array (
                                                        'subject' => 'table',
-                                                       'return' => 'schema',
+                                                       'return' => 'table',
                                                        'table' => field('relname')
                                                )
                                        )
@@ -923,7 +924,6 @@
                                'content' => $lang['strcreatetablelike']
                        );
                }
-
                $misc->printNavLinks($navlinks, 'tables-tables', get_defined_vars());
        }
        

diff --git a/views.php b/views.php
index 56e2217abe4496560a888f57cf168d64ed6c821c..b60b0947d33a28a5134456524129bd2b4ae805bc 100644 (file)
--- a/views.php
+++ b/views.php
@@ -22,7 +22,7 @@
 
                if ($confirm) {
                        $misc->printTrail('view');
-                       $misc->printTitle($lang['strselect'], 'pg.sql.select');
+                       $misc->printTabs('view','select');
                        $misc->printMsg($msg);
 
                        $attrs = $data->getTableAttributes($_REQUEST['view']);