Index: lib/TWiki/Plugins/TreeBrowserPlugin.pm
===================================================================
--- lib/TWiki/Plugins/TreeBrowserPlugin.pm	(revision 11502)
+++ lib/TWiki/Plugins/TreeBrowserPlugin.pm	(working copy)
@@ -38,7 +38,7 @@
         $debug $js
     );
 
-$VERSION = '1.031';
+$VERSION = 'v0.7';
 $pluginName = 'TreeBrowserPlugin';
 
 # =========================
@@ -97,6 +97,9 @@
     my $open2 = &TWiki::Func::extractNameValuePair( $theAttr, "openAll" );
     my $shared = &TWiki::Func::extractNameValuePair( $theAttr, "shared" );
     my $useLines = &TWiki::Func::extractNameValuePair( $theAttr, "uselines" );  
+    my $usePlusMinus = &TWiki::Func::extractNameValuePair( $theAttr, "useplusminus" );
+    my $noIndent = &TWiki::Func::extractNameValuePair( $theAttr, "noindent" );
+    my $noCss = &TWiki::Func::extractNameValuePair( $theAttr, "nocss" );
     my $useStatusText = &TWiki::Func::extractNameValuePair( $theAttr, "usestatustext" );
     my $closeSameLevel = &TWiki::Func::extractNameValuePair( $theAttr, "closesamelevel" );    
     my $icons = 0;
@@ -108,12 +111,12 @@
     my $opento = 0;
     $opento = $open1 if (!$openall && $open1);
     
-    return $thePre . &renderTreeView( $type, $params, $useLines, $useStatusText, $closeSameLevel, $theTitle, $icons, $shared, $openall, $opento, $theList );
+    return $thePre . &renderTreeView( $type, $params, $useLines, $usePlusMinus, $useStatusText, $closeSameLevel, $noIndent, $noCss, $theTitle, $icons, $shared, $openall, $opento, $theList );
 }
 
 sub renderTreeView
 {
-    my ( $theType, $theParams, $useLines, $useStatusText, $closeSameLevel, $theTitle, $icons, $shared, $openAll, $openTo, $theText ) = @_;
+    my ( $theType, $theParams, $useLines, $usePlusMinus, $useStatusText, $closeSameLevel, $noIndent, $noCss, $theTitle, $icons, $shared, $openAll, $openTo, $theText ) = @_;
 
     $theText =~ s/^[\n\r]*//os;
     my @tree = ();
@@ -160,10 +163,16 @@
 
     $js++;
     my $var = ($shared)?$shared:"d$js";
-    my $script = "
-<link rel=\"StyleSheet\" href=\"$attachUrl/dtree.css\" type=\"text/css\" />
+    
+    my $script = "\n";
+   #add CSS unless no CSS specified
+    #$script .="<link rel=\"StyleSheet\" href=\"$attachUrl/dtree.css\" type=\"text/css\" />" unless ($noCss=~/true|1|on/i);  
+    $script .= "
 <script type=\"text/javascript\" src=\"$attachUrl/dtree.js\"></script>";
-    $text = "<div class=\"dtree\"><script type=\"text/javascript\">
+    $text = "<div class=\"dtree\">";
+    #$text .="<link rel=\"StyleSheet\" href=\"$attachUrl/dtree.css\" type=\"text/css\" />" unless ($noCss=~/true|1|on/i);
+   $text .="<style type=\"text/css\" media=\"all\">\@import \"$attachUrl/dtree.css\";</style>" unless ($noCss=~/true|1|on/i);    
+   $text .="<script type=\"text/javascript\">
 <!--
 $var = new dTree('$var');\n";
     $text .= "$var.config.inOrder=true;\n";
@@ -176,8 +185,11 @@
     $text .= "$var.config.useIcons=false;\n" unless $icons;
     $text .= "$var.config.shared=true;\n" if $shared;
     $text .= "$var.config.useLines=false;\n" if ($useLines=~/false|0|off/i);
+    $text .= "$var.config.usePlusMinus=false;\n" if ($usePlusMinus=~/false|0|off/i);
     $text .= "$var.config.closeSameLevel=true;\n" if ($closeSameLevel=~/true|1|on/i);
+    $text .= "$var.config.noIndent=true;\n" if ($noIndent=~/true|1|on/i);
 
+
     $text .= "$var.config.useStatusText=false;\n"; #Broken due to dtree usage if ($useStatusText=~/true|1|on/i);
     $text .= "$var.config.useSelection=false;\n"; #Broken due to dtree usage
     $text .= "$var.config.folderLinks=false;\n"; #Broken due to dtree usage
Index: pub/TWiki/TreeBrowserPlugin/dtree.css
===================================================================
--- pub/TWiki/TreeBrowserPlugin/dtree.css	(revision 11502)
+++ pub/TWiki/TreeBrowserPlugin/dtree.css	(working copy)
@@ -32,4 +32,5 @@
 }
 .dtree .clip {
 	overflow: hidden;
-}
\ No newline at end of file
+}
+
Index: pub/TWiki/TreeBrowserPlugin/dtree.js
===================================================================
--- pub/TWiki/TreeBrowserPlugin/dtree.js	(revision 11502)
+++ pub/TWiki/TreeBrowserPlugin/dtree.js	(working copy)
@@ -33,7 +33,9 @@
 		folderLinks : true,
 		useSelection : true,
 		useCookies : true,
-		useLines : true,
+		useLines : true,
+		usePlusMinus : true,
+      noIndent : false,
 		useIcons : true,
 		useStatusText : false,
 		closeSameLevel	: false,
@@ -148,13 +150,19 @@
 	this.aIndent.pop();
 	return str;
 };// Adds the empty and line icons
-dTree.prototype.indent = function(node, nodeId) {
-	var str = '';
+dTree.prototype.indent = function(node, nodeId) {
+   var str = '';
+   if (this.config.noIndent) return str;
 	if (this.root.id != node.pid) {
 		for (var n=0; n<this.aIndent.length; n++)
 			str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
 		(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
-		if (node._hc) {
+		if (node._hc) {
+         if (!this.config.usePlusMinus) 
+            { //Just indent without + or - icon      
+            str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
+            return str;
+            }
 			str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';
 			if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
 			else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
@@ -243,12 +251,15 @@
 	}
 }// Change the status of a node(open or closed)
 dTree.prototype.nodeStatus = function(status, id, bottom) {
-	eDiv	= document.getElementById('d' + this.obj + id);
-	eJoin	= document.getElementById('j' + this.obj + id);
+	eDiv	= document.getElementById('d' + this.obj + id);
+   var eJoin;
+   if (this.config.usePlusMinus) 
+	  eJoin	= document.getElementById('j' + this.obj + id);
 	if (this.config.useIcons) {
 		eIcon	= document.getElementById('i' + this.obj + id);
 		eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
-	}
+	}
+   if (this.config.usePlusMinus) 
 	eJoin.src = (this.config.useLines)?
 	((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
 	((status)?this.icon.nlMinus:this.icon.nlPlus);
Index: data/TWiki/TreeBrowserPlugin.txt
===================================================================
--- data/TWiki/TreeBrowserPlugin.txt	(revision 11502)
+++ data/TWiki/TreeBrowserPlugin.txt	(working copy)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="StephaneLenclud" date="1158449493" format="1.1" reprev="1.7" version="1.7"}%
+%META:TOPICINFO{author="StephaneLenclud" date="1159728906" format="1.1" reprev="1.9" version="1.9"}%
 ---+ Tree Browser Plugin
 
 Renders a bulleted or numbered list as a collapsable/expandable tree of nodes.
@@ -17,6 +17,9 @@
 | =openTo= | Must be an integer. If present, the tree is expanded to the given node, as numbered from the root. | =0= |
 | =shared= | Must be a string. If present, the state of the tree is shared across all trees using this string. For example, if the tree is used in the WebLeftBar, the state will hold at all topics with this WebLeftBar. It's basically the name of the JavaScript object representing your tree. | none |
 | =uselines= | Set to =false= if you don't want to show lines linking nodes and leafs in the tree | =true= |
+| =useplusminus= | Set to =false= if you don't want to show '-' and '+' signs. One can use something like =onclick='javascript: tree.o($index);'= in the tree item to trigger opening/closing of a node. | =true= |
+| =noindent= | Set to =true= to show children at the level their parent. It suppresses children indentation. | =false= |
+| =nocss= | Set to =true= to prevent inclusion of =dtree.css=. | =false= |
 | =closesamelevel= | If =true= only one node within a parent can be expanded at the same time. openAll() and closeAll() functions do not work when this is enabled. | =false= |
 
 Rendering themes can be defined by =&lt;name&gt;_THEME= Plugin settings
@@ -114,7 +117,6 @@
      | *File:* | *Description:* |
      | ==data/TWiki/%TOPIC%.txt== | Plugin topic |
      | ==lib/TWiki/Plugins/%TOPIC%.pm== | Plugin Perl module |
-     | ==View.pm.patch== | Patch to =lib/TWiki/UI/View.pm= |
      | ==pub/TWiki/%TOPIC%/dtree.css== | part of dtree |
      | ==pub/TWiki/%TOPIC%/dtree.js== | part of dtree |
      | ==pub/TWiki/%TOPIC%/base.gif== | part of dtree |
@@ -156,23 +158,21 @@
      | ==pub/TWiki/%TOPIC%/xls.gif== | icons from [[TWiki:Plugins.RenderListPlugin][RenderListPlugin]] |
      | ==pub/TWiki/%TOPIC%/zip.gif== | icons from [[TWiki:Plugins.RenderListPlugin][RenderListPlugin]] |
 
-   0 Patch =lib/TWiki/UI/View.pm= using =View.pm.patch=. This patch inserts code into =lib/TWiki/UI/View.pm= which lifts some !JavaScript up into the head section of the document.
-   0 See if the above example renders correctly.
-
 ---++ Planned Enhancements
 
-   * Support configurable icons for each node (similar to TWiki:Plugins.RenderListPlugin).
-   * Support configurable default icons.
-   * Support wrapping of long node text.
-   * Allow for tree status to be shared across topics (e.g., leave the status of nodes unchanged for a tree used in the WebLeftBar).
-   * Support tree browser in other than view mode also.
-
+   * Support configurable icons for each node (similar to TWiki:Plugins.RenderListPlugin). _SL: Sounds fun!_
+   * Support configurable default icons. _SL: I think this was done sometimes ago._
+   * Support wrapping of long node text. _SL: Not sure how to do that? Looks like it's not such a big problem with Firfox._
+   * Support tree browser in other than view mode also. _SL: Not sure what's that?_
+   * Cleanup and comment !JavaScript code.
+   
 ---++ Plugin Info
 
 |  Plugin Author: | TWiki:Main.ThomasWeigert |
-|  Plugin Version: | v0.6 |
+|  Plugin Version: | v0.7 |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  17 Sep 2006: | (v0.6) - Adding =closesamelevel= and =uselines= functionalities, fix rendering issues with Firefox and pattern skin, fix warnings in apache error logs |
+|  01 Oct 2006: | (v0.7) - Adding =useplusminus= , =noindent= and =nocss= parameters. By [[TWiki:Main.StephaneLenclud][Stéphane Lenclud]]. |
+|  17 Sep 2006: | (v0.6) - Adding =closesamelevel= and =uselines= functionalities, fix rendering issues with Firefox and pattern skin, fix warnings in apache error logs. By [[TWiki:Main.StephaneLenclud][Stéphane Lenclud]] |
 |  12 Apr 2006: | (v0.5) - Minor update for TWiki:Codev.TWikiRelease04x00  |
 |  16 Sep 2005: | (v0.4) - Fix bug in =openAll= and =openTo= functions  |
 |  06 Sep 2005: | (v0.3) - Adopt the rendering themes from TWiki:Plugins.RenderListPlugin |
@@ -195,6 +195,7 @@
 
 %META:FILEATTACHMENT{name="empty.gif" attr="" autoattached="1" comment="" date="1151849905" path="empty.gif" size="62" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="email.gif" attr="" autoattached="1" comment="" date="1151849905" path="email.gif" size="183" user="UnknownUser" version=""}%
+%META:FILEATTACHMENT{name="dtree.js~" attr="" autoattached="1" comment="" date="1159656757" path="dtree.js~" size="12407" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="xls.gif" attr="" autoattached="1" comment="" date="1151849905" path="xls.gif" size="918" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="joinbottom.gif" attr="" autoattached="1" comment="" date="1151849905" path="joinbottom.gif" size="66" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="question.gif" attr="" autoattached="1" comment="" date="1151849905" path="question.gif" size="1044" user="UnknownUser" version=""}%
@@ -208,7 +209,7 @@
 %META:FILEATTACHMENT{name="cd.gif" attr="" autoattached="1" comment="" date="1151849905" path="cd.gif" size="239" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="virtualperson.gif" attr="" autoattached="1" comment="" date="1151849905" path="virtualperson.gif" size="149" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="group.gif" attr="" autoattached="1" comment="" date="1151849905" path="group.gif" size="162" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dtree.css" attr="" autoattached="1" comment="" date="1157137786" path="dtree.css" size="815" user="Main.StephaneLenclud" version="1"}%
+%META:FILEATTACHMENT{name="dtree.css" attr="" autoattached="1" comment="" date="1159656429" path="dtree.css" size="817" user="Main.StephaneLenclud" version="1"}%
 %META:FILEATTACHMENT{name="minus.gif" attr="" autoattached="1" comment="" date="1151849905" path="minus.gif" size="86" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="ppt.gif" attr="" autoattached="1" comment="" date="1151849905" path="ppt.gif" size="921" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="join.gif" attr="" autoattached="1" comment="" date="1151849905" path="join.gif" size="69" user="UnknownUser" version=""}%
@@ -219,7 +220,7 @@
 %META:FILEATTACHMENT{name="minusbottom.gif" attr="" autoattached="1" comment="" date="1151849905" path="minusbottom.gif" size="85" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="nolines_plus.gif" attr="" autoattached="1" comment="" date="1151849905" path="nolines_plus.gif" size="870" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="persons.gif" attr="" autoattached="1" comment="" date="1151849905" path="persons.gif" size="164" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dtree.js" attr="" autoattached="1" comment="" date="1157194177" path="dtree.js" size="11964" user="Main.StephaneLenclud" version="8"}%
+%META:FILEATTACHMENT{name="dtree.js" attr="" autoattached="1" comment="" date="1159656769" path="dtree.js" size="12407" user="Main.StephaneLenclud" version="8"}%
 %META:FILEATTACHMENT{name="sound.gif" attr="" autoattached="1" comment="" date="1151849905" path="sound.gif" size="166" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="home.gif" attr="" autoattached="1" comment="" date="1151849905" path="home.gif" size="172" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="folder.gif" attr="" autoattached="1" comment="" date="1151849905" path="folder.gif" size="372" user="UnknownUser" version=""}%
@@ -231,6 +232,7 @@
 %META:FILEATTACHMENT{name="trend.gif" attr="" autoattached="1" comment="" date="1151849905" path="trend.gif" size="149" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="trash.gif" attr="" autoattached="1" comment="" date="1151849905" path="trash.gif" size="1051" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="line.gif" attr="" autoattached="1" comment="" date="1151849905" path="line.gif" size="66" user="UnknownUser" version=""}%
+%META:FILEATTACHMENT{name="dtree.css~" attr="" autoattached="1" comment="" date="1159398861" path="dtree.css~" size="821" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="virtualhome.gif" attr="" autoattached="1" comment="" date="1151849905" path="virtualhome.gif" size="162" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="plus.gif" attr="" autoattached="1" comment="" date="1151849905" path="plus.gif" size="89" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="globe.gif" attr="" autoattached="1" comment="" date="1151849905" path="globe.gif" size="1095" user="UnknownUser" version=""}%