[TWiki-Dev] [SVN] ArthurClemens r13962 - twiki/branches/MAIN/lib

[<de...@de...>]

Author: ArthurClemens
Date: 2007-05-28 06:58:16 -0500 (Mon, 28 May 2007)
New Revision: 13962

Modified:
   twiki/branches/MAIN/lib/TWiki.pm
Log:
Item4153: add control over TOC rendering: TOC_MIN_DEPTH, TOC_MAX_DEPTH, TOC_TITLE

Modified: twiki/branches/MAIN/lib/TWiki.pm
===================================================================
--- twiki/branches/MAIN/lib/TWiki.pm	2007-05-28 11:46:40 UTC (rev 13961)
+++ twiki/branches/MAIN/lib/TWiki.pm	2007-05-28 11:58:16 UTC (rev 13962)
@@ -1787,7 +1787,7 @@
 #    * $headingPatternHt : <h[1-6]> HTML section heading </h[1-6]>
 sub _TOC {
     my ( $this, $text, $defaultTopic, $defaultWeb, $args ) = @_;
-
+    
     my $params = new TWiki::Attrs( $args );
     # get the topic name attribute
     my $topic = $params->{_DEFAULT} || $defaultTopic;
@@ -1803,10 +1803,11 @@
     $webPath =~ s/\./\//g;
 
     # get the depth limit attribute
-    my $depth = $params->{depth} || 6;
-
+    my $maxDepth = $params->{depth} || $this->{prefs}->getPreferencesValue('TOC_MAX_DEPTH') || 6;
+    my $minDepth = $this->{prefs}->getPreferencesValue('TOC_MIN_DEPTH') || 1;
+    
     # get the title attribute
-    my $title = $params->{title} || '';
+    my $title = $params->{title} || $this->{prefs}->getPreferencesValue('TOC_TITLE') || '';
     $title = CGI::span( { class => 'twikiTocTitle' }, $title ) if( $title );
 
     if( $web ne $defaultWeb || $topic ne $defaultTopic ) {
@@ -1854,7 +1855,7 @@
             next;
         }
 
-        if( $line && $level <= $depth ) {
+        if( $line && ($level >= $minDepth) && ($level <= $maxDepth) ) {
             # cut TOC exclude '---+ heading !! exclude this bit'
             $line =~ s/\s*$regex{headerPatternNoTOC}.+$//go;
             next unless $line;