Use the new icons

19 files changed, 68 insertions, 57 deletions

diff --git a/HISTORY b/HISTORY
index b618aa04..c9c61d54 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,10 @@ phpPgAdmin History
 Version 4.1
 -----------
 
+Features
+* New icons by Niko <[email protected]>, from the graphics repository on pgFoundry.
+* Added icons to bread crumb trail and tabs.
+
 Version 4.0
 -----------
 
diff --git a/aggregates.php b/aggregates.php
index 94d1abd2..700debc9 100644
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage aggregates in a database
 	 *
-	 * $Id: aggregates.php,v 1.12 2005/10/18 03:45:15 chriskl Exp $
+	 * $Id: aggregates.php,v 1.13 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -58,7 +58,7 @@
 		
 		$attrs = array(
 			'text'   => $proto,
-			'icon'   => 'functions',
+			'icon'   => 'Aggregate',
 			'toolTip'=> field('aggcomment'),
 		);
 		
diff --git a/all_db.php b/all_db.php
index db24e015..3b2aeb93 100644
--- a/all_db.php
+++ b/all_db.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage databases within a server
 	 *
-	 * $Id: all_db.php,v 1.41 2005/10/18 03:45:15 chriskl Exp $
+	 * $Id: all_db.php,v 1.42 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -321,7 +321,7 @@
 		
 		$attrs = array(
 			'text'   => field('datname'),
-			'icon'   => 'database',
+			'icon'   => 'Database',
 			'toolTip'=> field('datcomment'),
 			'action' => url('redirect.php',
 							$reqvars,
diff --git a/browser.php b/browser.php
index ed259e31..1d6db933 100644
--- 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.52 2005/11/09 09:08:37 jollytoad Exp $
+	 * $Id: browser.php,v 1.53 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -28,8 +28,8 @@
 
 <script type="text/javascript">
 
-webFXTreeConfig.rootIcon		= "<?php echo $misc->icon('root') ?>";
-webFXTreeConfig.openRootIcon	= "<?php echo $misc->icon('root') ?>";
+webFXTreeConfig.rootIcon		= "<?php echo $misc->icon('Servers') ?>";
+webFXTreeConfig.openRootIcon	= "<?php echo $misc->icon('Servers') ?>";
 webFXTreeConfig.folderIcon		= "<?php echo $misc->icon('folder') ?>";
 webFXTreeConfig.openFolderIcon	= "<?php echo $misc->icon('folderOpen') ?>";
 webFXTreeConfig.fileIcon		= "<?php echo $misc->icon('file') ?>";
diff --git a/casts.php b/casts.php
index 2f3dd55d..410b4ffc 100644
--- a/casts.php
+++ b/casts.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage casts in a database
 	 *
-	 * $Id: casts.php,v 1.11 2005/10/18 03:45:15 chriskl Exp $
+	 * $Id: casts.php,v 1.12 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -74,7 +74,7 @@
 		
 		$attrs = array(
 			'text'   => $proto,
-			'icon'   => 'casts'
+			'icon'   => 'Cast'
 		);
 		
 		$misc->printTreeXML($casts, $attrs);
diff --git a/conversions.php b/conversions.php
index d087f58e..2c2e255f 100644
--- a/conversions.php
+++ b/conversions.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage conversions in a database
 	 *
-	 * $Id: conversions.php,v 1.11 2005/10/18 03:45:15 chriskl Exp $
+	 * $Id: conversions.php,v 1.12 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -65,7 +65,7 @@
 		
 		$attrs = array(
 			'text'   => field('conname'),
-			'icon'   => 'conversions',
+			'icon'   => 'Conversion',
 			'toolTip'=> field('concomment')
 		);
 		
diff --git a/domains.php b/domains.php
index c5a47d44..2399ced0 100644
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage domains in a database
 	 *
-	 * $Id: domains.php,v 1.21 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: domains.php,v 1.22 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -437,7 +437,7 @@
 		
 		$attrs = array(
 			'text'   => field('domname'),
-			'icon'   => 'domains',
+			'icon'   => 'Domain',
 			'toolTip'=> field('domcomment'),
 			'action' => url('domains.php',
 							$reqvars,
diff --git a/functions.php b/functions.php
index 5b90ba40..bd728382 100644
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage functions in a database
 	 *
-	 * $Id: functions.php,v 1.52 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: functions.php,v 1.53 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -551,7 +551,7 @@
 		
 		$attrs = array(
 			'text'    => $proto,
-			'icon'    => 'functions',
+			'icon'    => 'Function',
 			'toolTip' => field('procomment'),
 			'action'  => url('redirect.php',
 							$reqvars,
diff --git a/languages.php b/languages.php
index 03f89a27..d692a02f 100644
--- a/languages.php
+++ b/languages.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage languages in a database
 	 *
-	 * $Id: languages.php,v 1.9 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: languages.php,v 1.10 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -57,7 +57,7 @@
 		
 		$attrs = array(
 			'text'   => field('lanname'),
-			'icon'   => 'languages'
+			'icon'   => 'Language'
 		);
 		
 		$misc->printTreeXML($languages, $attrs);
diff --git a/opclasses.php b/opclasses.php
index 7d207646..58f0062a 100644
--- a/opclasses.php
+++ b/opclasses.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage opclasss in a database
 	 *
-	 * $Id: opclasses.php,v 1.8 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: opclasses.php,v 1.9 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -67,7 +67,7 @@
 		
 		$attrs = array(
 			'text'   => $proto,
-			'icon'   => 'operators',
+			'icon'   => 'OperatorClass',
 			'toolTip'=> field('opccomment'),
 		);
 		
diff --git a/operators.php b/operators.php
index 91c484ad..7e5a8682 100644
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage operators in a database
 	 *
-	 * $Id: operators.php,v 1.20 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: operators.php,v 1.21 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -171,7 +171,7 @@
 		
 		$attrs = array(
 			'text'   => $proto,
-			'icon'   => 'operators',
+			'icon'   => 'Operator',
 			'toolTip'=> field('oprcomment'),
 			'action' => url('operators.php',
 							$reqvars,
diff --git a/plugin_slony.php b/plugin_slony.php
index 31e7c112..28b41581 100755
--- a/plugin_slony.php
+++ b/plugin_slony.php
@@ -3,7 +3,7 @@
 	/**
 	 * Slony database tab plugin
 	 *
-	 * $Id: plugin_slony.php,v 1.6 2005/11/09 09:05:58 jollytoad Exp $
+	 * $Id: plugin_slony.php,v 1.7 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Avoid database connections whenever possible
@@ -48,7 +48,8 @@
 						$tabs = array('cluster' => array (
 											'title' => $slony->slony_cluster,
 											'url'   => 'plugin_slony.php',
-											'urlvars' => array('subject' => 'clusters_top')
+											'urlvars' => array('subject' => 'clusters_top'),
+											'icon'  => 'Cluster',
 										));
 				}
 				else $tabs = array();
@@ -77,7 +78,8 @@
 				$tabs = array('nodes' => array (
 										'title' => $lang['strnodes'],
 										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'nodes')
+										'urlvars' => array('subject' => 'nodes'),
+										'icon'  => 'Nodes',
 									));
 				
 				$items = $misc->adjustTabsForTree($tabs);
@@ -105,7 +107,8 @@
 				$tabs = array('sets' => array (
 										'title' => 	$lang['strrepsets'],
 										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'sets')
+										'urlvars' => array('subject' => 'sets'),
+										'icon'  => 'ReplicationSets',
 									));
 				
 				$items = $misc->adjustTabsForTree($tabs);
@@ -134,7 +137,7 @@
 				
 				$attrs = array(
 					'text'   => field('no_comment'),
-					'icon'   => 'folder',
+					'icon'   => 'Node',
 					'action' => url('plugin_slony.php',
 									$reqvars,
 									array(
@@ -163,7 +166,8 @@
 				$tabs = array('paths' => array (
 										'title' => $lang['strpaths'],
 										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'paths')
+										'urlvars' => array('subject' => 'paths'),
+										'icon'  => 'Paths',
 									));
 				
 				$items = $misc->adjustTabsForTree($tabs);
@@ -189,7 +193,8 @@
 				$tabs = array('listens' => array (
 										'title' => $lang['strlistens'],
 										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'listens')
+										'urlvars' => array('subject' => 'listens'),
+										'icon'  => 'Listens',
 									));
 				
 				$items = $misc->adjustTabsForTree($tabs);
@@ -218,7 +223,7 @@
 				
 				$attrs = array(
 					'text'   => field('no_comment'),
-					'icon'   => field('icon', 'folder'),
+					'icon'   => 'Path',
 					'action' => url('plugin_slony.php',
 									$reqvars,
 									array('no_id' => field('pa_client'), 'path_id' => field('no_id'), 'action' => 'path_properties')
@@ -233,7 +238,7 @@
 				
 				$attrs = array(
 					'text'   => field('no_comment'),
-					'icon'   => field('icon', 'folder'),
+					'icon'   => 'Listen',
 					'action' => url('plugin_slony.php',
 									$reqvars,
 									array('no_id' => field('li_receiver'), 'listen_id' => field('no_id'), 'action' => 'listen_properties')
@@ -248,7 +253,7 @@
 			
 				$attrs = array(
 					'text'   => field('set_comment'),
-					'icon'   => 'folder',
+					'icon'   => 'AvailableReplicationSet',
 					'action' => url('plugin_slony.php',
 									$reqvars,
 									array(
@@ -273,7 +278,8 @@
 				$tabs = array('sequences' => array (
 										'title' => $lang['strsequences'],
 										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'sequences')
+										'urlvars' => array('subject' => 'sequences'),
+										'icon'  => 'Sequences'
 									));
 				
 				$items = $misc->adjustTabsForTree($tabs);
@@ -299,7 +305,8 @@
 				$tabs = array('tables' => array (
 										'title' => $lang['strtables'],
 										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'tables')
+										'urlvars' => array('subject' => 'tables'),
+										'icon'  => 'Tables',
 									));
 				
 				$items = $misc->adjustTabsForTree($tabs);
@@ -326,7 +333,8 @@
 				$tabs = array('subscriptions' => array (
 										'title' => $lang['strsubscriptions'],
 										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'subscriptions')
+										'urlvars' => array('subject' => 'subscriptions'),
+										'icon'  => 'Subscriptions',
 									));
 				
 				$items = $misc->adjustTabsForTree($tabs);
@@ -357,7 +365,7 @@
 
 				$attrs = array(
 					'text'   => field('qualname'),
-					'icon'   => 'sequences',
+					'icon'   => 'Sequence',
 					'toolTip'=> field('seqcomment'),
 					'action' => url('sequences.php',
 									$reqvars,
@@ -379,7 +387,7 @@
 				
 				$attrs = array(
 					'text'   => field('qualname'),
-					'icon'   => 'tables',
+					'icon'   => 'Table',
 					'toolTip'=> field('relcomment'),
 					'action' => url('redirect.php',
 									$reqvars,
@@ -395,7 +403,7 @@
 				
 				$attrs = array(
 					'text'   => field('no_comment'),
-					'icon'   => field('icon', 'folder'),
+					'icon'   => 'AvailableSubscription',
 					'action' => url('plugin_slony.php',
 									$reqvars,
 									array('set_id' => field('sub_set'), 'no_id' => field('no_id'), 'action' => 'subscription_properties')
diff --git a/schemas.php b/schemas.php
index b4435372..504927d1 100755
--- a/schemas.php
+++ b/schemas.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage schemas in a database
 	 *
-	 * $Id: schemas.php,v 1.4 2005/10/18 04:00:19 chriskl Exp $
+	 * $Id: schemas.php,v 1.5 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -246,7 +246,7 @@
 		
 		$attrs = array(
 			'text'   => field('nspname'),
-			'icon'   => 'folder',
+			'icon'   => 'Schema',
 			'toolTip'=> field('nspcomment'),
 			'action' => url('redirect.php',
 							$reqvars,
diff --git a/sequences.php b/sequences.php
index 62609a65..8967d1ca 100644
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage sequences in a database
 	 *
-	 * $Id: sequences.php,v 1.30 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: sequences.php,v 1.31 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 	
 	// Include application functions
@@ -80,7 +80,7 @@
 		
 		$attrs = array(
 			'text'   => field('seqname'),
-			'icon'   => 'sequences',
+			'icon'   => 'Sequence',
 			'toolTip'=> field('seqcomment'),
 			'action' => url('sequences.php',
 							$reqvars,
diff --git a/servers.php b/servers.php
index fbedcca2..93e23d13 100644
--- a/servers.php
+++ b/servers.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage servers
 	 *
-	 * $Id: servers.php,v 1.4 2005/10/18 04:00:19 chriskl Exp $
+	 * $Id: servers.php,v 1.5 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -87,7 +87,7 @@
 			'text'   => field('desc'),
 			
 			// Show different icons for logged in/out
-			'icon'   => ifempty(field('username'), 'serverOut', 'server'),
+			'icon'   => ifempty(field('username'), 'DisconnectedServer', 'Server'),
 			
 			'toolTip'=> field('id'),
 			
diff --git a/tables.php b/tables.php
index 4ee67518..76780184 100644
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
 	/**
 	 * List tables in a database
 	 *
-	 * $Id: tables.php,v 1.74 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: tables.php,v 1.75 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -633,7 +633,7 @@
 		
 		$attrs = array(
 			'text'   => field('relname'),
-			'icon'   => 'tables',
+			'icon'   => 'Table',
 			'toolTip'=> field('relcomment'),
 			'action' => url('redirect.php',
 							$reqvars,
diff --git a/themes/default/global.css b/themes/default/global.css
index 2d0ce5a3..7a4d8680 100644
--- a/themes/default/global.css
+++ b/themes/default/global.css
@@ -1,7 +1,7 @@
 /**
  * Default style sheet
  *
- * $Id: global.css,v 1.33 2005/06/19 19:04:33 slubek Exp $
+ * $Id: global.css,v 1.34 2005/11/25 08:49:08 jollytoad Exp $
  */
 
 /** ELEMENTS */
@@ -195,7 +195,7 @@ td.opbutton2
 {
 	border: 2px solid #E6E6CC;
 	background-color: #F3F3E9;
-	padding: 2px 1em;
+	padding: 2px 1ex;
 	vertical-align: bottom;
 }
 
@@ -351,19 +351,18 @@ pre.data
 
 .webfx-tree-row img {
 	vertical-align: middle;
-	height: 20px;
+}
+
+.webfx-tree-item-label {
+	margin-left: 0.5ex;
 }
 
 .webfx-tree-icon {
-	width: 20px;
+	margin-left: 1px;
 	cursor: hand;
 	cursor: pointer;
 }
 
-.webfx-tree-expand-icon {
-	width: 20px;
-}
-
 .webfx-tree-hide-root {
 	display: none;
 }
diff --git a/types.php b/types.php
index 614c2023..89cfaa76 100644
--- a/types.php
+++ b/types.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage types in a database
 	 *
-	 * $Id: types.php,v 1.28 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: types.php,v 1.29 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -470,7 +470,7 @@
 		
 		$attrs = array(
 			'text'   => field('typname'),
-			'icon'   => 'types',
+			'icon'   => 'Type',
 			'toolTip'=> field('typcomment'),
 			'action' => url('types.php',
 							$reqvars,
diff --git a/views.php b/views.php
index b05c9f68..f40586e3 100644
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage views in a database
 	 *
-	 * $Id: views.php,v 1.54 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: views.php,v 1.55 2005/11/25 08:49:08 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -595,7 +595,7 @@
 		
 		$attrs = array(
 			'text'   => field('relname'),
-			'icon'   => 'views',
+			'icon'   => 'View',
 			'toolTip'=> field('relcomment'),
 			'action' => url('redirect.php',
 							$reqvars,