homogenize navigation links (bottom of pages) with list. CSS style is not really...

diff --git a/aggregates.php b/aggregates.php
index 3e19bc2630c5b8ffb440190f80dae76bc6c9a6af..7c0e8367f529de5a0972bd548c868cff0aa6c63a 100644 (file)
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.24 2007/08/31 18:30:10 ioguix Exp $
+        * $Id: aggregates.php,v 1.25 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -246,13 +246,13 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"aggregates.php?{$misc->href}\">{$lang['straggrshowall']}</a> |\n";
+               echo "<ul class=\"navlink\">\n\t<li><a class=\"navlink\" href=\"aggregates.php?{$misc->href}\">{$lang['straggrshowall']}</a></li>\n";
                if ($data->hasAlterAggregate()) {
-               echo "<a class=\"navlink\" href=\"aggregates.php?action=alter&amp;{$misc->href}&amp;aggrname=", 
-                       urlencode($_REQUEST['aggrname']), "&amp;aggrtype=", urlencode($_REQUEST['aggrtype']), "\">{$lang['stralter']}</a> |\n";
+               echo "\t<li><a class=\"navlink\" href=\"aggregates.php?action=alter&amp;{$misc->href}&amp;aggrname=", 
+                       urlencode($_REQUEST['aggrname']), "&amp;aggrtype=", urlencode($_REQUEST['aggrtype']), "\">{$lang['stralter']}</a></li>\n";
                }
-               echo "<a class=\"navlink\" href=\"aggregates.php?action=confirm_drop&amp;{$misc->href}&amp;aggrname=",
-                       urlencode($_REQUEST['aggrname']), "&amp;aggrtype=", urlencode($_REQUEST['aggrtype']), "\">{$lang['strdrop']}</a></p>\n";
+               echo "\t<li><a class=\"navlink\" href=\"aggregates.php?action=confirm_drop&amp;{$misc->href}&amp;aggrname=",
+                       urlencode($_REQUEST['aggrname']), "&amp;aggrtype=", urlencode($_REQUEST['aggrtype']), "\">{$lang['strdrop']}</a></li>\n</ul>\n";
        }
 
 

diff --git a/classes/Misc.php b/classes/Misc.php
index 96bbcf9206134968c513cb82652e65dfc0a11c66..1d010b8f0cb47cd5e9c82e67f5fd7de47e3eaf64 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.160 2007/09/13 05:16:41 xzilla Exp $
+        * $Id: Misc.php,v 1.161 2007/09/13 13:41:01 ioguix Exp $
         */
         
        class Misc {
@@ -1071,11 +1071,11 @@
                                
                                echo "<td style=\"text-align: right\">";
 
-                               echo "<a class=\"toplink\" href=\"{$url}sql\" target=\"sqledit\" onclick=\"window.open('{$url}sql','{$window_id}','toolbar=no,width=600,height=400,resizable=yes,scrollbars=no').focus(); return false;\">{$lang['strsql']}</a> | ";
+                               echo "<ul class=\"toplink\">\n\t<li><a class=\"toplink\" href=\"{$url}sql\" target=\"sqledit\" onclick=\"window.open('{$url}sql','{$window_id}','toolbar=no,width=600,height=400,resizable=yes,scrollbars=no').focus(); return false;\">{$lang['strsql']}</a></li>\n";
                                
-                               echo "<a class=\"toplink\" href=\"{$url}find\" target=\"sqledit\" onclick=\"window.open('{$url}find','{$window_id}','toolbar=no,width=600,height=400,resizable=yes,scrollbars=no').focus(); return false;\">{$lang['strfind']}</a> | ";
+                               echo "\t<li><a class=\"toplink\" href=\"{$url}find\" target=\"sqledit\" onclick=\"window.open('{$url}find','{$window_id}','toolbar=no,width=600,height=400,resizable=yes,scrollbars=no').focus(); return false;\">{$lang['strfind']}</a></li>\n";
                                
-                               echo "<a class=\"toplink\" href=\"servers.php?action=logout&amp;logoutServer=".htmlspecialchars($server_info['host']).":".htmlspecialchars($server_info['port']).":".htmlspecialchars($server_info['sslmode'])."\">{$lang['strlogout']}</a>";
+                               echo "\t<li><a class=\"toplink\" href=\"servers.php?action=logout&amp;logoutServer=".htmlspecialchars($server_info['host']).":".htmlspecialchars($server_info['port']).":".htmlspecialchars($server_info['sslmode'])."\">{$lang['strlogout']}</a></li>\n</ul>\n";
                                
                                echo "</td>";
                        }

diff --git a/colproperties.php b/colproperties.php
index ed7033fa5f9dfc7b0fbcf1399c30c99081a86512..0ff013027669679e1c72dbd06cb268a9fa3acf91 100644 (file)
--- a/colproperties.php
+++ b/colproperties.php
@@ -237,7 +237,7 @@
 
                        echo "<br />\n";
 
-                       echo "<ul>\n";
+                       echo "<ul class=\"navlink\">\n";
                        if ($isTable) {
                                $return_url = urlencode("colproperties.php?{$misc->href}&amp;table=$tableName&amp;column={$_REQUEST['column']}");
 

diff --git a/constraints.php b/constraints.php
index 8eea16c456059513f7f5bae6a2a7e4e0c05fd180..39f0ee742919c23facee12cd0151637141af0dcd 100644 (file)
--- a/constraints.php
+++ b/constraints.php
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.52 2007/08/31 18:30:10 ioguix Exp $
+        * $Id: constraints.php,v 1.53 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -476,14 +476,14 @@
                
                $misc->printTable($constraints, $columns, $actions, $lang['strnoconstraints'], 'cnPre');
                
-               echo "<p><a class=\"navlink\" href=\"constraints.php?action=add_check&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
-                       "\">{$lang['straddcheck']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"constraints.php?action=add_unique_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
-                       "\">{$lang['stradduniq']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"constraints.php?action=add_primary_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
-                       "\">{$lang['straddpk']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"constraints.php?action=add_foreign_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
-                       "\">{$lang['straddfk']}</a></p>\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"constraints.php?action=add_check&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+                       "\">{$lang['straddcheck']}</a></li>\n";
+               echo "\t<li><a href=\"constraints.php?action=add_unique_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+                       "\">{$lang['stradduniq']}</a></li>\n";
+               echo "\t<li><a href=\"constraints.php?action=add_primary_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+                       "\">{$lang['straddpk']}</a></li>\n";
+               echo "\t<li><a href=\"constraints.php?action=add_foreign_key&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
+                       "\">{$lang['straddfk']}</a></li>\n</ul>\n";
        }
 
        function doTree() {

diff --git a/display.php b/display.php
index aa9a5443df23e3d573cccbdfe9d0df35a0ed0eea..15f846d6500e204c4fc90bb7d96dae010e920fd1 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.63 2007/07/12 19:26:22 xzilla Exp $
+        * $Id: display.php,v 1.64 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Prevent timeouts on large exports (non-safe mode only)
@@ -416,50 +416,51 @@
                else echo "<p>{$lang['strnodata']}</p>\n";
 
                // Navigation links     
-               echo "<p>";
+               echo "<ul class=\"navlink\">\n";
                // Return
-               if (isset($_REQUEST['return_url']) && isset($_REQUEST['return_desc'])) {
-                       echo "<a class=\"navlink\" href=\"{$_REQUEST['return_url']}\">{$_REQUEST['return_desc']}</a> |\n";
-               }
+               if (isset($_REQUEST['return_url']) && isset($_REQUEST['return_desc']))
+                       echo "\t<li><a href=\"{$_REQUEST['return_url']}\">{$_REQUEST['return_desc']}</a></li>\n";
+
                // Edit SQL link
-               if (isset($_REQUEST['query'])) {
-                       echo "<a class=\"navlink\" href=\"database.php?{$misc->href}&amp;action=sql&amp;paginate=on&amp;query=" . urlencode($_REQUEST['query']), "\">{$lang['streditsql']}</a> |\n";
-               }
-               
+               if (isset($_REQUEST['query']))
+                       echo "\t<li><a href=\"database.php?{$misc->href}&amp;action=sql&amp;paginate=on&amp;query=",
+                               urlencode($_REQUEST['query']), "\">{$lang['streditsql']}</a></li>\n";
+
                // Expand/Collapse
                if ($_REQUEST['strings'] == 'expanded')
-                       echo "<a class=\"navlink\" href=\"display.php?{$str}&amp;{$str2}&amp;strings=collapsed&amp;page=", 
-                               urlencode($_REQUEST['page']), "\">{$lang['strcollapse']}</a>\n";
+                       echo "\t<li><a href=\"display.php?{$str}&amp;{$str2}&amp;strings=collapsed&amp;page=", 
+                               urlencode($_REQUEST['page']), "\">{$lang['strcollapse']}</a></li>\n";
                else
-                       echo "<a class=\"navlink\" href=\"display.php?{$str}&amp;{$str2}&amp;strings=expanded&amp;page=", 
-                               urlencode($_REQUEST['page']), "\">{$lang['strexpand']}</a>\n";
+                       echo "\t<li><a href=\"display.php?{$str}&amp;{$str2}&amp;strings=expanded&amp;page=", 
+                               urlencode($_REQUEST['page']), "\">{$lang['strexpand']}</a></li>\n";
+
                // Create report
-               if (isset($_REQUEST['query']) && $conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {
-                       echo " | <a class=\"navlink\" href=\"reports.php?{$misc->href}&amp;action=create&amp;report_sql=",
-                               urlencode($_REQUEST['query']), "\">{$lang['strcreatereport']}</a>\n";
-               }
+               if (isset($_REQUEST['query']) && $conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0)
+                       echo "\t<li><a href=\"reports.php?{$misc->href}&amp;action=create&amp;report_sql=",
+                               urlencode($_REQUEST['query']), "\">{$lang['strcreatereport']}</a></li>\n";
+
                // Create view and download
                if (isset($_REQUEST['query']) && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {
                        // Report views don't set a schema, so we need to disable create view in that case
-                       if (isset($_REQUEST['schema'])) echo " | <a class=\"navlink\" href=\"views.php?action=create&amp;formDefinition=",
-                               urlencode($_REQUEST['query']), "&amp;{$misc->href}\">{$lang['strcreateview']}</a>\n";
-                       echo " | <a class=\"navlink\" href=\"dataexport.php?query=", urlencode($_REQUEST['query']);
+                       if (isset($_REQUEST['schema'])) 
+                               echo "\t<li><a href=\"views.php?action=create&amp;formDefinition=",
+                                       urlencode($_REQUEST['query']), "&amp;{$misc->href}\">{$lang['strcreateview']}</a></li>\n";
+                       echo "\t<li><a href=\"dataexport.php?query=", urlencode($_REQUEST['query']);
                        if (isset($_REQUEST['search_path']))
                                echo "&amp;search_path=", urlencode($_REQUEST['search_path']);
-                       echo "&amp;{$misc->href}\">{$lang['strdownload']}</a>\n";
+                       echo "&amp;{$misc->href}\">{$lang['strdownload']}</a></li>\n";
                }
 
                // Insert
-               if (isset($object) && (isset($subject) && $subject == 'table')) {
-                       echo " | <a class=\"navlink\" href=\"tables.php?action=confinsertrow&amp;table=",
-                               urlencode($object), "&amp;{$misc->href}\">{$lang['strinsert']}</a>\n";
-               }
+               if (isset($object) && (isset($subject) && $subject == 'table'))
+                       echo "\t<li><a href=\"tables.php?action=confinsertrow&amp;table=",
+                               urlencode($object), "&amp;{$misc->href}\">{$lang['strinsert']}</a></li>\n";
 
                // Refresh
-               echo "| <a class=\"navlink\" href=\"display.php?{$str}&amp;{$str2}&amp;strings=", urlencode($_REQUEST['strings']), 
+               echo "\t<li><a href=\"display.php?{$str}&amp;{$str2}&amp;strings=", urlencode($_REQUEST['strings']), 
                        "&amp;page=" . urlencode($_REQUEST['page']),
-                       "\">{$lang['strrefresh']}</a>\n";
-               echo "</p>\n";
+                       "\">{$lang['strrefresh']}</a></li>\n";
+               echo "</ul>\n";
        }
        
        // If a table is specified, then set the title differently

diff --git a/domains.php b/domains.php
index e73bb81705f5e02c02b851541604d67b7b5e4ebd..07cb9a716c008fd17c83b01d9a4c13830c760305 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.33 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: domains.php,v 1.34 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -231,14 +231,14 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"domains.php?{$misc->href}\">{$lang['strshowalldomains']}</a>\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"domains.php?{$misc->href}\">{$lang['strshowalldomains']}</a></li>\n";
                if ($data->hasDomainConstraints()) {
-                       echo "| <a class=\"navlink\" href=\"domains.php?action=add_check&amp;{$misc->href}&amp;domain=", urlencode($_REQUEST['domain']),
-                               "\">{$lang['straddcheck']}</a>\n";
-                       echo "| <a class=\"navlink\" href=\"domains.php?action=alter&amp;{$misc->href}&amp;domain=", 
-                               urlencode($_REQUEST['domain']), "\">{$lang['stralter']}</a>\n";
+                       echo "\t<li><a href=\"domains.php?action=add_check&amp;{$misc->href}&amp;domain=", urlencode($_REQUEST['domain']),
+                               "\">{$lang['straddcheck']}</a></li>\n";
+                       echo "\t<li><a href=\"domains.php?action=alter&amp;{$misc->href}&amp;domain=", 
+                               urlencode($_REQUEST['domain']), "\">{$lang['stralter']}</a></li>\n";
                }
-               echo "</p>\n";
+               echo "</ul>\n";
        }
        
        /**

diff --git a/functions.php b/functions.php
index 59a9b1e7156480f6983d07cfae342d159093ddb8..e06d9d81aab7b6d0ce1efe6d8b8fce452638f30a 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.67 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: functions.php,v 1.68 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -256,11 +256,11 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<p><a class=\"navlink\" href=\"functions.php?{$misc->href}\">{$lang['strshowallfunctions']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"functions.php?action=edit&amp;{$misc->href}&amp;function=", 
-                       urlencode($_REQUEST['function']), "&amp;function_oid=", urlencode($_REQUEST['function_oid']), "\">{$lang['stralter']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"functions.php?action=confirm_drop&amp;{$misc->href}&amp;function=",
-                       urlencode($func_full), "&amp;function_oid=", $_REQUEST['function_oid'], "\">{$lang['strdrop']}</a>\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"functions.php?{$misc->href}\">{$lang['strshowallfunctions']}</a></li>\n";
+               echo "\t<li><a href=\"functions.php?action=edit&amp;{$misc->href}&amp;function=", 
+                       urlencode($_REQUEST['function']), "&amp;function_oid=", urlencode($_REQUEST['function_oid']), "\">{$lang['stralter']}</a></li>\n";
+               echo "\t<li><a href=\"functions.php?action=confirm_drop&amp;{$misc->href}&amp;function=",
+                       urlencode($func_full), "&amp;function_oid=", $_REQUEST['function_oid'], "\">{$lang['strdrop']}</a></li>\n</ul>";
        }
        
        /**
@@ -680,9 +680,9 @@
                
                $misc->printTable($funcs, $columns, $actions, $lang['strnofunctions']);
 
-               echo "<p><a class=\"navlink\" href=\"functions.php?action=create&amp;{$misc->href}\">{$lang['strcreateplfunction']}</a> | ";
-               echo "<a class=\"navlink\" href=\"functions.php?action=create&amp;language=internal&amp;{$misc->href}\">{$lang['strcreateinternalfunction']}</a> | ";
-               echo "<a class=\"navlink\" href=\"functions.php?action=create&amp;language=C&amp;{$misc->href}\">{$lang['strcreatecfunction']}</a></p>\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"functions.php?action=create&amp;{$misc->href}\">{$lang['strcreateplfunction']}</a></li>\n";
+               echo "\t<li><a href=\"functions.php?action=create&amp;language=internal&amp;{$misc->href}\">{$lang['strcreateinternalfunction']}</a></li>\n";
+               echo "\t<li><a href=\"functions.php?action=create&amp;language=C&amp;{$misc->href}\">{$lang['strcreatecfunction']}</a></li>\n</ul>\n";
        }
        
        /**

diff --git a/plugin_slony.php b/plugin_slony.php
index b3d0972ae7570b3792a66633ee7f83d596b3a37c..850c2a1511fc70cd15346988637c063f94c9e2cb 100755 (executable)
--- a/plugin_slony.php
+++ b/plugin_slony.php
@@ -3,7 +3,7 @@
        /**
         * Slony database tab plugin
         *
-        * $Id: plugin_slony.php,v 1.23 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: plugin_slony.php,v 1.24 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -1185,12 +1185,12 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=confirm_drop_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strdrop']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=confirm_lock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strlock']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=confirm_unlock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strunlock']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=merge_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmerge']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=move_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmove']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"plugin_slony.php?action=execute_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strexecute']}</a></p>\n";
+               echo "<ul class=\"navlink\"><li><a href=\"plugin_slony.php?action=confirm_drop_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strdrop']}</a></li>\n";
+               echo "\t<li><a href=\"plugin_slony.php?action=confirm_lock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strlock']}</a></li>\n";
+               echo "\t<li><a href=\"plugin_slony.php?action=confirm_unlock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strunlock']}</a></li>\n";
+               echo "\t<li><a href=\"plugin_slony.php?action=merge_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmerge']}</a></li>\n";
+               echo "\t<li><a href=\"plugin_slony.php?action=move_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmove']}</a></li>\n";
+               echo "\t<li><a href=\"plugin_slony.php?action=execute_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strexecute']}</a></li></ul>\n";
        }
 
        /**

diff --git a/privileges.php b/privileges.php
index 5025d3ec9cd08017a99d3db593465a86cd9f1187..c11bb59e0cd2b7ded8cb562e0a0bcbfc9b23dbb7 100644 (file)
--- a/privileges.php
+++ b/privileges.php
@@ -3,7 +3,7 @@
        /**
         * Manage privileges in a database
         *
-        * $Id: privileges.php,v 1.44 2007/07/16 21:27:29 ioguix Exp $
+        * $Id: privileges.php,v 1.45 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -241,12 +241,12 @@
                        $alterurl = "privileges.php?action=alter&{$misc->href}&{$subject}={$object}&subject={$subject}&mode=";
                }
        
-               echo "<p><a class=\"navlink\" href=\"{$alterurl}grant\">{$lang['strgrant']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"{$alterurl}revoke\">{$lang['strrevoke']}</a>\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"{$alterurl}grant\">{$lang['strgrant']}</a></li>\n";
+               echo "\t<li><a href=\"{$alterurl}revoke\">{$lang['strrevoke']}</a></li>\n";
                if (isset($allurl))
-                       echo "| <a class=\"navlink\" href=\"{$allurl}?{$misc->href}\">{$alltxt}</a>\n";
+                       echo "\t<li><a href=\"{$allurl}?{$misc->href}\">{$alltxt}</a></li>\n";
                
-               echo "</p>\n";
+               echo "</ul>\n";
        }
 
        $misc->printHeader($lang['strprivileges']);

diff --git a/reports.php b/reports.php
index 899f547c5f4682884af3784edeb33951f0d80b53..6c20189bc519a438b998bc3b667a33d358b08c62 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -3,7 +3,7 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.32 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: reports.php,v 1.33 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -121,8 +121,8 @@
                }
                else echo "<p>{$lang['strinvalidparam']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"reports.php?{$misc->href}\">{$lang['strshowallreports']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"reports.php?action=edit&amp;{$misc->href}&amp;report_id={$report->fields['report_id']}\">{$lang['stredit']}</a></p>\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"reports.php?{$misc->href}\">{$lang['strshowallreports']}</a></li>\n";
+               echo "\t<li><a href=\"reports.php?action=edit&amp;{$misc->href}&amp;report_id={$report->fields['report_id']}\">{$lang['stredit']}</a></li>\n</ul>\n";
        }
 
        /**

diff --git a/roles.php b/roles.php
index b3d83911f3cc658eb2dcc0cfba73a6364efc305d..2054fbf49ac6f037012c264ef4d0b868c6677782 100644 (file)
--- a/roles.php
+++ b/roles.php
@@ -3,7 +3,7 @@
        /**
         * Manage roles in a database cluster
         *
-        * $Id: roles.php,v 1.10 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: roles.php,v 1.11 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -425,11 +425,11 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
 
-               echo "<p><a class=\"navlink\" href=\"roles.php?{$misc->href}\">{$lang['strshowallroles']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"roles.php?action=alter&amp;{$misc->href}&amp;rolename=", 
-                       urlencode($_REQUEST['rolename']), "\">{$lang['stralter']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"roles.php?action=confirm_drop&amp;{$misc->href}&amp;rolename=",
-                       urlencode($_REQUEST['rolename']), "\">{$lang['strdrop']}</a>\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"roles.php?{$misc->href}\">{$lang['strshowallroles']}</a></li>\n";
+               echo "\t<li><a href=\"roles.php?action=alter&amp;{$misc->href}&amp;rolename=", 
+                       urlencode($_REQUEST['rolename']), "\">{$lang['stralter']}</a></li>\n";
+               echo "\t<li><a href=\"roles.php?action=confirm_drop&amp;{$misc->href}&amp;rolename=",
+                       urlencode($_REQUEST['rolename']), "\">{$lang['strdrop']}</li>\n</ul>\n";
        }
 
        /**

diff --git a/sequences.php b/sequences.php
index f7f2107b2650cb5290f07dc21018c2a7f6ee55ed..9c8fd848f33fe0cf5875829f350e1954f4a82856 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.43 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: sequences.php,v 1.44 2007/09/13 13:41:01 ioguix Exp $
         */
        
        // Include application functions
@@ -144,13 +144,12 @@
                        echo "</tr>";
                        echo "</table>";
                        
-                       if ($data->hasAlterSequence()) {
-                               echo "<p><a class=\"navlink\" href=\"sequences.php?action=confirm_alter&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['stralter']}</a> |\n";
-                       }
-                       echo "<a class=\"navlink\" href=\"sequences.php?action=confirm_setval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strsetval']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"sequences.php?action=nextval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strnextval']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"sequences.php?action=reset&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strreset']}</a> |\n";
-                       echo "<a class=\"navlink\" href=\"sequences.php?{$misc->href}\">{$lang['strshowallsequences']}</a></p>\n";
+                       if ($data->hasAlterSequence())
+                               echo "<ul class=\"navlink\">\n\t<li><a href=\"sequences.php?action=confirm_alter&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['stralter']}</a></li>\n";
+                       echo "\t<li><a href=\"sequences.php?action=confirm_setval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strsetval']}</a></li>\n";
+                       echo "\t<li><a href=\"sequences.php?action=nextval&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strnextval']}</a></li>\n";
+                       echo "\t<li><a href=\"sequences.php?action=reset&amp;{$misc->href}&amp;sequence=", urlencode($sequence->fields['seqname']), "\">{$lang['strreset']}</a></li>\n";
+                       echo "\t<li><a href=\"sequences.php?{$misc->href}\">{$lang['strshowallsequences']}</a></li>\n</ul>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
        }

diff --git a/sql.php b/sql.php
index 53ee0902b0d83004388d9e49b871e3c273531dde..edabfe5d6b8c06fff4ece7b2311cf3e607ca51f6 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -6,7 +6,7 @@
         * how many SQL statements have been strung together with semi-colons
         * @param $query The SQL query string to execute
         *
-        * $Id: sql.php,v 1.37 2007/09/04 19:39:48 ioguix Exp $
+        * $Id: sql.php,v 1.38 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Prevent timeouts on large exports (non-safe mode only)
@@ -177,13 +177,12 @@
        
        echo "<p>{$lang['strsqlexecuted']}</p>\n";
 
-       echo "<p><a class=\"navlink\" href=\"database.php?database=", urlencode($_REQUEST['database']),
-               "&amp;server=", urlencode($_REQUEST['server']), "&amp;action=sql&amp;query=", urlencode($_REQUEST['query']), "\">{$lang['streditsql']}</a>";
-       if ($conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {
-               echo " | <a class=\"navlink\" href=\"reports.php?{$misc->href}&amp;action=create&amp;report_sql=",
-                       urlencode($_REQUEST['query']), "\">{$lang['strcreatereport']}</a>";
-       }
-       echo "</p>\n";
+       echo "<ul class=\"navlink\">\n\t<li><a href=\"database.php?database=", urlencode($_REQUEST['database']),
+               "&amp;server=", urlencode($_REQUEST['server']), "&amp;action=sql&amp;query=", urlencode($_REQUEST['query']), "\">{$lang['streditsql']}</a></li>\n";
+       if ($conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0)
+               echo "\t<li><a href=\"reports.php?{$misc->href}&amp;action=create&amp;report_sql=",
+                       urlencode($_REQUEST['query']), "\">{$lang['strcreatereport']}</a></li>\n";
+       echo "</ul>\n";
        
        $misc->printFooter();
 ?>

diff --git a/tables.php b/tables.php
index 1f9d07de54f3a71bd3d4af24dd9b626a1a09b047..f6e993ac239000f3cd33d07135dfe467ea3def76 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.103 2007/09/09 20:20:31 ioguix Exp $
+        * $Id: tables.php,v 1.104 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -955,10 +955,10 @@
 
                $misc->printTable($tables, $columns, $actions, $lang['strnotables']);
 
-               echo "<p><a class=\"navlink\" href=\"tables.php?action=create&amp;{$misc->href}\">{$lang['strcreatetable']}</a> |\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"tables.php?action=create&amp;{$misc->href}\">{$lang['strcreatetable']}</a></li>\n";
                if ($data->hasCreateTableLike())
-                       echo "<a class=\"navlink\" href=\"tables.php?action=createlike&amp;{$misc->href}\">{$lang['strcreatetablelike']}</a>\n";
-               echo "</p>\n";
+                       echo "\t<li><a href=\"tables.php?action=createlike&amp;{$misc->href}\">{$lang['strcreatetablelike']}</a></li>\n";
+               echo "</ul>\n";
        }
        
        /**

diff --git a/tblproperties.php b/tblproperties.php
index 6252f7e432fcfff80a2685aec8e651e8e6e00deb..7929d6a33437f1ff5e43c786c85cb2f0e53f0766 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.84 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: tblproperties.php,v 1.85 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -538,7 +538,7 @@
                
                $misc->printTable($attrs, $columns, $actions, null, 'attPre');
 
-               echo "<ul>\n";
+               echo "<ul class=\"navlink\">\n";
                echo "\t<li><a href=\"display.php?{$misc->href}&amp;table=", urlencode($_REQUEST['table']), "&amp;subject=table&amp;return_url={$return_url}&amp;return_desc=",
                        urlencode($lang['strback']), "\">{$lang['strbrowse']}</a></li>\n";
                echo "\t<li><a href=\"tables.php?action=confselectrows&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),"\">{$lang['strselect']}</a></li>\n";

diff --git a/themes/default/global.css b/themes/default/global.css
index 24e409fce1e5f7090f5535fd8b9258703e43faaf..a90a18e4f40727b85a1dc9b9aabb2e524061df5a 100644 (file)
--- a/themes/default/global.css
+++ b/themes/default/global.css
@@ -1,7 +1,7 @@
 /**
  * Default style sheet
  *
- * $Id: global.css,v 1.43 2007/04/23 15:10:30 soranzo Exp $
+ * $Id: global.css,v 1.44 2007/09/13 13:41:01 ioguix Exp $
  */
 
 /** ELEMENTS */
@@ -146,7 +146,22 @@ td.topbar
        font-size: smaller; /*0.8em;*/
        text-align: left;
 }
-
+ul.toplink,ul.navlink
+{
+       list-style: none;
+       margin:0;padding:0;
+}
+ul.navlink{margin:20px 0}
+ul.toplink li, ul.navlink li
+{
+       display:inline;
+       border-left:1px solid #000000;
+       margin:0;padding: 0 2px 0 5px;
+}
+ul.toplink li:first-child, ul.navlink li:first-child {
+       border: none;
+       padding-left:0;
+}
 td.data1
 {
        color: #000000;
@@ -290,7 +305,7 @@ a:hover
        text-decoration: none;
 }
 
-a.navlink:link, a.toplink:link
+a.navlink:link, a.toplink:link, ul.navlink li a, ul.toplink li a
 {
        color: #336699;
        font-family: arial, tahoma, verdana, helvetica, sans-serif, serif;
@@ -298,7 +313,7 @@ a.navlink:link, a.toplink:link
        text-decoration: none;
 }
 
-a.navlink:visited, a.toplink:visited
+a.navlink:visited, a.toplink:visited, ul.navlink li a:visited, ul.toplink li a:visited
 {
        color: #336699;
        font-family: arial, tahoma, verdana, helvetica, sans-serif, serif;
@@ -306,7 +321,7 @@ a.navlink:visited, a.toplink:visited
        text-decoration: none;
 }
 
-a.navlink:hover, a.toplink:hover
+a.navlink:hover, a.toplink:hover, ul.navlink li a:hover, ul.toplink li a:hover
 {
        color: #cc0000;
        font-family: arial, tahoma, verdana, helvetica, sans-serif, serif;
@@ -314,7 +329,7 @@ a.navlink:hover, a.toplink:hover
        text-decoration: none;
 }
 
-a.navlink:active, a.toplink:active
+a.navlink:active, a.toplink:active, ul.navlink li a:active, ul.toplink li a:active
 {
        color: #cc0000;
        font-family: arial, tahoma, verdana, helvetica, sans-serif, serif;

diff --git a/types.php b/types.php
index b8957d881d4f0539b06f37b2b7ab469269126ade..0135909a3956e9146231f8a55f689d6ae1657c00 100644 (file)
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
        /**
         * Manage types in a database
         *
-        * $Id: types.php,v 1.39 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: types.php,v 1.40 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -447,10 +447,10 @@
                
                $misc->printTable($types, $columns, $actions, $lang['strnotypes']);
 
-               echo "<p><a class=\"navlink\" href=\"types.php?action=create&amp;{$misc->href}\">{$lang['strcreatetype']}</a>";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"types.php?action=create&amp;{$misc->href}\">{$lang['strcreatetype']}</a></li>\n";
                if ($data->hasCompositeTypes())
-                       echo "\n| <a class=\"navlink\" href=\"types.php?action=create_comp&amp;{$misc->href}\">{$lang['strcreatecomptype']}</a>";
-               echo "</p>\n";
+                       echo "\t<li><a href=\"types.php?action=create_comp&amp;{$misc->href}\">{$lang['strcreatecomptype']}</a></li>\n";
+               echo "</ul>\n";
 
        }
        

diff --git a/viewproperties.php b/viewproperties.php
index b7bdc98cc98bb96c0b8acdbade654934b1bae639..9b660bafcdd8941bbe93fa4243f9431e4400c5e1 100755 (executable)
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -3,7 +3,7 @@
        /**
         * List views in a database
         *
-        * $Id: viewproperties.php,v 1.31 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: viewproperties.php,v 1.32 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -341,7 +341,7 @@
        
                echo "<br />\n";
 
-               echo "<ul>\n";
+               echo "<ul class=\"navlink\">\n";
                $return_url = urlencode("viewproperties.php?{$misc->href}&amp;view=" . urlencode($_REQUEST['view']));
                echo "\t<li><a href=\"display.php?{$misc->href}&amp;view=", urlencode($_REQUEST['view']), "&amp;subject=view&amp;return_url={$return_url}&amp;return_desc=",
                        urlencode($lang['strback']), "\">{$lang['strbrowse']}</a></li>\n";

diff --git a/views.php b/views.php
index 8689b51e5edd51cf6dd1fa2eec00a34ab777b49c..17fe3b6d08539436545323c486b49ddd5e7831dc 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.73 2007/08/31 18:30:11 ioguix Exp $
+        * $Id: views.php,v 1.74 2007/09/13 13:41:01 ioguix Exp $
         */
 
        // Include application functions
@@ -592,8 +592,8 @@
                
                $misc->printTable($views, $columns, $actions, $lang['strnoviews']);
                
-               echo "<p><a class=\"navlink\" href=\"views.php?action=create&amp;{$misc->href}\">{$lang['strcreateview']}</a> |\n";
-               echo "<a class=\"navlink\" href=\"views.php?action=wiz_create&amp;{$misc->href}\">{$lang['strcreateviewwiz']}</a></p>\n";
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"views.php?action=create&amp;{$misc->href}\">{$lang['strcreateview']}</a></li>\n";
+               echo "\t<li><a href=\"views.php?action=wiz_create&amp;{$misc->href}\">{$lang['strcreateviewwiz']}</a></li>\n</ul>\n";
 
        }