Add a template to the tabbed TOC macro

Fixes #1177
Jermolene · Dec 2, 2014 · b220c19 · b220c19
1 parent 64a905b
commit b220c19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
@@ -162,7 +162,7 @@ tags: $:/tags/Macro
 [all[current]field:title{$selectedTiddler$}]
 \end
 
-\define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText)
+\define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,template:"")
 <$tiddler tiddler={{$selectedTiddler$}}>
 <div class="tc-tabbed-table-of-contents">
 <$linkcatcher to="$selectedTiddler$">
@@ -172,15 +172,15 @@ tags: $:/tags/Macro
 </$linkcatcher>
 <div class="tc-tabbed-table-of-contents-content">
 <h1><$view field="caption"><$view field="title"/></$view></h1>
-<$transclude mode="block">$unselectedText$</$transclude>
+<$transclude mode="block" tiddler="$template$"><$transclude mode="block">$unselectedText$</$transclude></$transclude>
 </div>
 </div>
 </$tiddler>
 \end
 
-\define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText)
+\define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,template:"")
 <$linkcatcher to="""$selectedTiddler$""">
-<$macrocall $name="toc-tabbed-external-nav" tag="""$tag$""" sort="""$sort$""" selectedTiddler="""$selectedTiddler$""" unselectedText="""$unselectedText$"""/>
+<$macrocall $name="toc-tabbed-external-nav" tag="""$tag$""" sort="""$sort$""" selectedTiddler="""$selectedTiddler$""" unselectedText="""$unselectedText$""" template="""$template$"""/>
 </$linkcatcher>
 \end
 
diff --git a/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed Example.tid b/editions/tw5.com/tiddlers/demonstrations/TableOfContentsMacro Tabbed Example.tid
@@ -13,6 +13,7 @@ The tabbed table of contents macro renders a selective expandable table of conte
 |2nd |sort |Optional sorting subfilter (eg `sort[title]`) | |
 |3rd |selectedTiddler |Title of the tiddler containing the title of the currently displayed tiddler  |"$:/temp/toc/selectedTiddler" |
 |4th |unselectedText |Text to be displayed when no tiddler is selected | |
+|5th |template |Optional title of a tiddler to be used as a template for rendering the selected tiddler | |
 
 !!! Internal navigation