Updated for XLoadTree2(beta)

diff --git a/browser.php b/browser.php
index c8f8d4f1c3228f7d909b61980aec2db0046481d3..729904fc5f2b6cfc836179f9d53368efa5ee3754 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.44.2.1 2005/03/01 10:47:03 jollytoad Exp $
+        * $Id: browser.php,v 1.44.2.2 2005/03/03 14:52:56 jollytoad Exp $
         */
 
        // Include application functions
@@ -13,12 +13,17 @@
        include_once('./libraries/lib.inc.php');
        
        // Output header
-       $misc->printHeader('', "<script src=\"xloadtree/xtree.js\" type=\"text/javascript\"></script>\n<script src=\"xloadtree/xmlextras.js\" type=\"text/javascript\"></script>\n<script src=\"xloadtree/xloadtree.js\" type=\"text/javascript\"></script>");
+       $misc->printHeader('', "<script src=\"xloadtree/xmlextras.js\" type=\"text/javascript\"></script>\n<script src=\"xloadtree/xtree2.js\" type=\"text/javascript\"></script>\n<script src=\"xloadtree/xloadtree2.js\" type=\"text/javascript\"></script>");
        $misc->printBody('browser');
 ?>
 
-       <div class="logo"><a href="intro.php" target="detail"><img src="images/themes/<?php echo $conf['theme'] ?>/title.png" width="200" height="50" alt="<?php echo htmlspecialchars($appName) ?>" title="<?php echo htmlspecialchars($appName) ?>" /></a></div>
+       <div class="logo"><a href="intro.php" target="detail"><img src="<?php echo $misc->icon('title') ?>" width="200" height="50" alt="<?php echo htmlspecialchars($appName) ?>" title="<?php echo htmlspecialchars($appName) ?>" /></a></div>
 
+<style type="text/css">
+.webfx-tree-children {
+       background-image:       url("<?php echo $misc->icon('I') ?>");
+}
+</style>
 <script type="text/javascript">
 
 webFXTreeConfig.rootIcon               = "<?php echo $misc->icon('root') ?>";
@@ -34,11 +39,13 @@ webFXTreeConfig.tIcon                       = "<?php echo $misc->icon('T') ?>";
 webFXTreeConfig.tMinusIcon             = "<?php echo $misc->icon('Tminus') ?>";
 webFXTreeConfig.tPlusIcon              = "<?php echo $misc->icon('Tplus') ?>";
 webFXTreeConfig.blankIcon              = "<?php echo $misc->icon('blank') ?>";
+webFXTreeConfig.loadingIcon            = "<?php echo $misc->icon('loading') ?>";
+webFXTreeConfig.loadingText            = "<?php echo $lang['strloading']; ?>";
 
 var tree = new WebFXLoadTree("<?php echo $lang['strservers']; ?>", "servers.php?action=tree", "servers.php");
-tree.target = 'detail';
+tree.target = "detail";
 
-document.write(tree);
+tree.write();
 
 </script>
 

diff --git a/themes/default/global.css b/themes/default/global.css
index 3381805ea751817d53e09860007fbe90d49f8683..735386f8d4a28b7daba1f13564566d289a7e098d 100644 (file)
--- a/themes/default/global.css
+++ b/themes/default/global.css
@@ -1,7 +1,7 @@
 /**
  * Default style sheet
  *
- * $Id: global.css,v 1.31.4.1 2005/03/01 10:43:10 jollytoad Exp $
+ * $Id: global.css,v 1.31.4.2 2005/03/03 14:52:18 jollytoad Exp $
  */
 
 /** ELEMENTS */
@@ -328,28 +328,32 @@ pre.data
 .keyword {color: #FF8000}
 .literal {color: #808080}
 
-/* Browser Tree */
-.webfx-tree-container {
-       margin: 0px;
-       padding: 0px;
-       font: arial, tahoma, verdana, helvetica, sans-serif, serif;
+/* Browser Tree using XLoadTree 2 */
+.webfx-tree-row {
        white-space: nowrap;
+       font: arial, tahoma, verdana, helvetica, sans-serif, serif;
 }
 
-.webfx-tree-item {
-       padding: 0px;
-       margin: 0px;
-       font: arial, tahoma, verdana, helvetica, sans-serif, serif;
-       white-space: nowrap;
-       height: 20px;
+.webfx-tree-children {
+       background-repeat: repeat-y;
+       background-position-y: 1px !important;  /* IE only */
 }
 
-.webfx-tree-item img {
+.webfx-tree-row img {
        vertical-align: middle;
-       border: 0px;
+       height: 20px;
 }
 
 .webfx-tree-icon {
        width: 20px;
-       height: 20px;
+       cursor: hand;
+       cursor: pointer;
+}
+
+.webfx-tree-expand-icon {
+       width: 20px;
+}
+
+.webfx-tree-hide-root {
+       display: none;
 }