tiddlywiki 5.3.5 → 5.3.6

package/core/ui/PageControls/storyview.tid

@@ -4,19 +4,16 @@ caption: {{$:/core/images/storyview-classic}} {{$:/language/Buttons/StoryView/Ca
 description: {{$:/language/Buttons/StoryView/Hint}}
 
 \whitespace trim
-\define icon()
-$:/core/images/storyview-$(storyview)$
-\end
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/storyview">> tooltip={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 <$set name="storyview" value={{$:/view}}>
-<$transclude tiddler=<<icon>>/>
+<$transclude tiddler=`$:/core/images/storyview-$(storyview)$`/>
 </$set>
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/StoryView/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </span>
 <$reveal state=<<qualify "$:/state/popup/storyview">> type="popup" position="below" animate="yes">

package/core/ui/PageControls/tag-button.tid

@@ -4,17 +4,16 @@ caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption}
 description: {{$:/language/Buttons/TagManager/Hint}}
 
 \whitespace trim
-\define control-panel-button(class)
-\whitespace trim
-<$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+\procedure control-panel-button(class)
+<$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`>
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/tag-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/TagManager/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 \end
 

package/core/ui/PageControls/theme.tid

@@ -6,12 +6,12 @@ description: {{$:/language/Buttons/Theme/Hint}}
 \whitespace trim
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/theme">> tooltip={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/theme-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Theme/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </span>
 <$reveal state=<<qualify "$:/state/popup/theme">> type="popup" position="below" animate="yes">

package/core/ui/PageControls/timestamp.tid

@@ -7,26 +7,26 @@ description: {{$:/language/Buttons/Timestamp/Hint}}
 <$reveal type="nomatch" state="$:/config/TimestampDisable" text="yes">
 <$button tooltip={{$:/language/Buttons/Timestamp/On/Hint}} aria-label={{$:/language/Buttons/Timestamp/On/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-setfield $tiddler="$:/config/TimestampDisable" $value="yes"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/timestamp-on}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Timestamp/On/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </$reveal>
 <$reveal type="match" state="$:/config/TimestampDisable" text="yes">
 <$button tooltip={{$:/language/Buttons/Timestamp/Off/Hint}} aria-label={{$:/language/Buttons/Timestamp/Off/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-setfield $tiddler="$:/config/TimestampDisable" $value="no"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/timestamp-off}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Timestamp/Off/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </$reveal>

package/core/ui/PageControls/unfold-all.tid

@@ -6,12 +6,12 @@ description: {{$:/language/Buttons/UnfoldAll/Hint}}
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/UnfoldAll/Hint}} aria-label={{$:/language/Buttons/UnfoldAll/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-unfold-all-tiddlers" $param=<<currentTiddler>> foldedStatePrefix="$:/state/folded/"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]" variable="listItem">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/unfold-all-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/UnfoldAll/Caption}}/>
 </span>
-</$list>
-</$button>
+<%endif%>
+</$button>

package/core/ui/SideBar/Recent.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/SideBar/Recent
 tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/Recent/Caption}}
 
-<$macrocall $name="timeline" format={{$:/language/RecentChanges/DateFormat}}/>
+<$transclude $variable="timeline" format={{$:/language/RecentChanges/DateFormat}} limit={{$:/config/RecentLimit}}/>

package/core/ui/SideBarSegments/search.tid

@@ -3,12 +3,12 @@ tags: $:/tags/SideBarSegment
 
 \whitespace trim
 
-\define count-popup-button()
+\procedure count-popup-button()
 \whitespace trim
 <$button popup=<<qualify "$:/state/popup/search-dropdown">> class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
-<$list filter="[{$(searchTiddler)$}minlength{$:/config/Search/MinLength}limit[1]]" variable="listItem">
-<$vars userInput={{{ [<searchTiddler>get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}} replaceRegexp="limit\[\d+\]">
+<$list filter="[<searchTiddler>get[text]minlength{$:/config/Search/MinLength}limit[1]]" variable="listItem">
+<$vars userInput={{{ [<searchTiddler>get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}] }}} replaceRegexp="limit\[\d+\]">
 <$vars primaryListFilter={{{ [<configTiddler>get[first-search-filter]search-replace:g:regexp<replaceRegexp>,[]] }}} secondaryListFilter={{{ [<configTiddler>get[second-search-filter]search-replace:g:regexp<replaceRegexp>,[]] }}}>
 <$set name="resultCount" value="""<$count filter="[subfilter<primaryListFilter>] [subfilter<secondaryListFilter>]"/>""">
 {{$:/language/Search/Matches}}
@@ -19,9 +19,9 @@ tags: $:/tags/SideBarSegment
 </$button>
 \end
 
-\define search-results-list()
+\procedure search-results-list()
 \whitespace trim
-<$vars userInput={{$(searchTiddler)$}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}>
+<$vars userInput={{{ [<searchTiddler>get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}] }}}>
 <$list filter="[<userInput>minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
 
 <$tiddler tiddler=<<configTiddler>>>
@@ -34,30 +34,32 @@ tags: $:/tags/SideBarSegment
 </$vars>
 \end
 
-\define cancel-search-actions() <$list filter="[<searchTiddler>get[text]!match{$:/temp/search}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/search]] [<searchTiddler>] [<searchListState>]"/>"""><$action-setfield $tiddler="$:/temp/search" text={{{ [<searchTiddler>get[text]] }}}/><$action-setfield $tiddler="$:/temp/search/refresh" text="yes"/></$list>
+\procedure cancel-search-actions() <$list filter="[<searchTiddler>get[text]!match{$:/temp/search}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/search]] [<searchTiddler>] [<searchListState>]"/>"""><$action-setfield $tiddler="$:/temp/search" text={{{ [<searchTiddler>get[text]] }}}/><$action-setfield $tiddler="$:/temp/search/refresh" text="yes"/></$list>
 
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
+\procedure input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<tiddler>get[text]!is[missing]] :else[<tiddler>get[text]is[shadow]]"><$action-navigate $to={{{ [<tiddler>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<tiddler>get[text]] }}}/></$list>
 
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+\procedure input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<tiddler>get[text]!is[missing]] :else[<tiddler>get[text]is[shadow]]"><$list filter="[<tiddler>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<tiddler>get[text]] }}}/></$list></$list>"""><$list filter="[<tiddler>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<tiddler>get[text]] }}}/></$list></$list>
 
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<<nextTab>>/>"""/>
+\procedure set-next-input-tab() <$transclude $variable="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="after" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<<nextTab>>/>"""/>
 
-\define advanced-search-actions() <$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search/input}}/><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/search/input}}/><<delete-state-tiddlers>><$action-navigate $to="$:/AdvancedSearch"/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input""" preventScroll="true"/><$action-deletetiddler $filter="$:/temp/search $:/temp/search/input $:/temp/search/refresh [<searchListState>]"/>
+\procedure set-previous-input-tab() <$transclude $variable="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="before" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<<nextTab>>/>"""/>
+
+\procedure advanced-search-actions() <$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search/input}}/><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/search/input}}/><<delete-state-tiddlers>><$action-navigate $to="$:/AdvancedSearch"/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input""" preventScroll="true"/><$action-deletetiddler $filter="$:/temp/search $:/temp/search/input $:/temp/search/refresh [<searchListState>]"/>
 
 <div class="tc-sidebar-lists tc-sidebar-search">
 
 <$vars editTiddler="$:/temp/search" searchTiddler="$:/temp/search/input" searchListState=<<qualify "$:/state/search-list/selected-item">>>
 <div class="tc-search">
 <$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
+<$keyboard key="((input-tab-left))" actions=<<set-previous-input-tab>>>
 <$keyboard key="((advanced-search-sidebar))" actions=<<advanced-search-actions>>>
 <form class="tc-form-inline">
-<$macrocall $name="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>> 
+<$transclude $variable="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>> 
 		selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search" 
 		tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<<qualify "$:/state/popup/search-dropdown">> 
-		class="tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>> 
+		class="tc-tiny-gap-right tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>> 
 		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> cancelPopups="yes" 
-		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"/>
+		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}]"/>
 </form>
 </$keyboard>
 </$keyboard>

package/core/ui/TagManager.tid

@@ -46,6 +46,21 @@ color: #bbb
 </$reveal>
 \end
 
+\procedure color-picker-actions()
+\whitespace trim
+<$action-setfield $tiddler=<<currentTiddler>> color=<<colour-picker-value>>/>
+\end
+
+\procedure color-picker-button()
+\whitespace trim
+<div class="tc-drop-down-wrapper">
+<$button class="tc-btn-invisible" popup={{{ [[$:/state/tag-manager/color/]addsuffix<currentTiddler>] }}}>{{$:/core/images/palette}}</$button>
+<$reveal type="popup" tag="div" class="tc-drop-down tc-popup-keep" state={{{ [[$:/state/tag-manager/color/]addsuffix<currentTiddler>] }}}>
+<$transclude $variable="colour-picker" actions=<<color-picker-actions>>/>
+</$reveal>
+</div>
+\end
+
 \whitespace trim
 <table class="tc-tag-manager-table">
 <tbody>
@@ -58,7 +73,7 @@ color: #bbb
 	</tr>
 	<$list filter="[tags[]!is[system]sort[title]]">
 		<tr>
-			<td><$edit-text field="color" tag="input" type="color"/></td>
+			<td><$transclude $variable="color-picker-button"/></td>
 			<td>{{||$:/core/ui/TagTemplate}}</td>
 			<td><$count filter="[all[current]tagging[]]"/></td>
 			<td>
@@ -100,4 +115,4 @@ color: #bbb
 		<td></td>
 	</tr>
 </tbody>
-</table>
+</table>

package/core/ui/TagTemplate.tid

@@ -9,7 +9,7 @@ title: $:/core/ui/TagTemplate
 		colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
 		palette={{$:/palette}}
 		element-tag="$button"
-		element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter="[all[current]tagging[]]" tag='span'"""
+		element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter="[subfilter{$:/core/config/TagPillDragFilter}]" tag='span'"""
 	/>
 	<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes" class="tc-drop-down">
 		<$set name="tv-show-missing-links" value="yes">

package/core/ui/TestCaseTemplate.tid

@@ -13,7 +13,9 @@ title: $:/core/ui/TestCaseTemplate
 		testActions="Actions"
 		testHideIfPass=<<hideIfPass>>
 	>
+		<$data $filter={{!!import}}/>
+		<$data $compound-filter={{!!import-compound}}/>
 		<$data $compound-tiddler=<<currentTiddler>>/>
-		<$data title="Description" text={{!!description}}/>
+		<%if [{!!description}!is[blank]] %><$data title="Description" text={{!!description}}/><%endif%>
 	</$testcase>
 </$let>

package/core/ui/TestCases/DefaultTemplate.tid

@@ -1,91 +1,149 @@
 title: $:/core/ui/testcases/DefaultTemplate
+code-body: yes
 
 \whitespace trim
+
+\function tf.state() "$:/state/testcase"
+
 \procedure linkcatcherActions()
 <%if [<navigateTo>has[title]] %>
-	<$qualify title=<<state>> name="qualifiedState">
-		<$action-setfield $tiddler=<<qualifiedState>> text=<<navigateTo>>/>
-	</$qualify>
+	<$action-setfield $tiddler=<<tf.state>> text=<<navigateTo>>/>
 <%endif%>
 \end
 
-<$let
-	state={{{ [<qualify "$:/state/testcase">] }}}
->
-	<div class="tc-test-case-wrapper">
-		<div class="tc-test-case-header">
-			<h2>
-				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[span]] }}} to=<<testcaseTiddler>>>
-					<%if [<testResult>!match[]] %>
-						<span class={{{ tc-test-case-result-icon [<testResult>!match[fail]then[tc-test-case-result-icon-pass]] [<testResult>match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
-							<%if [<testResult>!match[fail]] %>
-								{{$:/core/images/done-button}}
-							<%else%>
-								{{$:/core/images/close-button}}
-							<%endif%>
-						</span>
+\procedure testcase-header()
+<div class="tc-test-case-header">
+	<h2>
+		<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[span]] }}} to=<<testcaseTiddler>>>
+			<%if [<testResult>!match[]] %>
+				<span class={{{ tc-test-case-result-icon
+					[<testResult>!match[fail]then[tc-test-case-result-icon-pass]]
+					[<testResult>match[fail]then[tc-test-case-result-icon-fail]]
+					+[join[ ]] }}}
+				>
+					<%if [<testResult>!match[fail]] %>
+						{{$:/core/images/done-button}}
+					<%else%>
+						{{$:/core/images/close-button}}
 					<%endif%>
-					<$view tiddler="Description" mode="inline"/>
-				</$genesis>
-				<span class="tc-test-case-toolbar">
-					<$button popup=`$(state)$-more`
-						tooltip={{$:/language/Buttons/More/Hint}}
-						aria-label={{$:/language/Buttons/More/Caption}}
-						class="tc-btn-invisible"
-						selectedClass="tc-selected"
-					>
-						{{$:/core/images/down-arrow}}
-					</$button>
-					<$let 
-						tv-config-toolbar-icons="yes"
-						tv-config-toolbar-text="yes"
-						tv-config-toolbar-class="tc-btn-invisible"
-					>
-						<$reveal state=`$(state)$-more` type="popup" position="belowleft" animate="yes">
-							<div class="tc-drop-down">
-								<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
-									variable="listItem"
-								>
-									<$transclude tiddler=<<listItem>> mode="inline"/>
-								</$list>
-							</div>
-						</$reveal>
-					</$let>
 				</span>
-			</h2>
-		</div>
-		<%if [[Narrative]is[tiddler]] %>
-			<div class="tc-test-case-narrative">
-				<$transclude $tiddler="Narrative" mode="block"/>
-			</div>
-		<%endif%>
-		<%if [<testResult>match[fail]] %>
-			<div class="tc-test-case-result-fail">
-				<div class="tc-test-case-result-fail-header">
-					TEST FAILED
-				</div>
-				<div class="tc-test-case-result-fail-body">
-					<$diff-text source=<<expectedHTML>> dest=<<outputHTML>>/>
-				</div>
-			</div>
-		<%endif%>
-		<div class="tc-test-case-panes">
-			<div class="tc-test-case-source">
-				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
-			</div>
-			<div class="tc-test-case-divider">
-			</div>
-			<div class="tc-test-case-output">
-				<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
-					<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
-				<%else%>
-					<$linkcatcher actions=<<linkcatcherActions>>>
-						<$tiddler tiddler="Output">
-							<$transclude $tiddler="Output" $mode="block"/>
-						</$tiddler>
-					</$linkcatcher>
-				<%endif%>
-			</div>
+			<%endif%>
+			<$view tiddler="Description" mode="inline"/>
+		</$genesis>
+		<span class="tc-test-case-toolbar">
+			<<testcase-toolbar>>
+		</span>
+	</h2>
+</div>
+\end
+
+\procedure testcase-toolbar()
+<$button popup=`$(tf.state)$-more`
+	tooltip={{$:/language/Buttons/More/Hint}}
+	aria-label={{$:/language/Buttons/More/Caption}}
+	class="tc-btn-invisible"
+	selectedClass="tc-selected"
+>
+	{{$:/core/images/down-arrow}}
+</$button>
+<$let
+	tv-config-toolbar-icons="yes"
+	tv-config-toolbar-text="yes"
+	tv-config-toolbar-class="tc-btn-invisible"
+>
+	<$reveal state=`$(tf.state)$-more` type="popup" position="belowleft" animate="yes">
+		<div class="tc-drop-down">
+			<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
+				variable="listItem"
+			>
+				<$transclude $tiddler=<<listItem>> $mode="inline"/>
+			</$list>
 		</div>
-	</div>
+	</$reveal>
 </$let>
+\end
+
+\procedure testcase-narrative()
+<div class="tc-test-case-narrative">
+	<$transclude $tiddler="Narrative" $mode="block"/>
+</div>
+\end
+
+\procedure testcase-fail()
+<div class="tc-test-case-result-fail">
+	<div class="tc-test-case-result-fail-header">
+		TEST FAILED
+	</div>
+	<div class="tc-test-case-result-fail-body">
+		<$diff-text source=<<expectedHTML>> dest=<<outputHTML>>/>
+	</div>
+</div>
+\end
+
+\procedure testcase-output-wikified()
+<$linkcatcher actions=<<linkcatcherActions>>>
+	<$tiddler tiddler="Output">
+		<$transclude $tiddler="Output" $mode="block"/>
+	</$tiddler>
+</$linkcatcher>
+\end
+
+\procedure testcase-output()
+<div class="tc-test-case-output">
+	<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
+		<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
+	<%else%>
+		<<testcase-output-wikified>>
+	<%endif%>
+</div>
+\end
+
+\procedure testcase-tabsList()
+[all[tiddlers]sort[]] Output +[putfirst[]]
+-Description
+-Narrative
+-[[$:/temp/testcase/draft-title]]
+-[has[plugin-type]]
+-[prefix<tf.state>]
+-[prefix[$:/state/popup/export]]
+-[prefix[$:/HistoryList]]
+-[prefix[$:/StoryList]]
+\end
+
+\procedure testcase-source()
+<div class="tc-test-case-source">
+	<$macrocall $name="tabs"
+		tabsList=<<testcase-tabsList>>
+		explicitState=<<tf.state>>
+		default="Output"
+		template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"
+	/>
+</div>
+\end
+
+\procedure testcase-panes()
+<div class="tc-test-case-panes">
+	<<testcase-source>>
+	<div class="tc-test-case-divider"></div>
+	<<testcase-output>>
+</div>
+\end
+
+\procedure testcase-body()
+<div class="tc-test-case-wrapper">
+	<<testcase-header>>
+	<$let testcase-source-state = <<tf.state>>>
+		<$navigator story="$:/StoryList" history="$:/HistoryList">
+			<%if [[Narrative]is[tiddler]] %>
+				<<testcase-narrative>>
+			<%endif%>
+			<%if [<testResult>match[fail]] %>
+				<<testcase-fail>>
+			<%endif%>
+			<<testcase-panes>>
+		</$navigator>
+	</$let>
+</div>
+\end
+
+<<testcase-body>>

package/core/ui/TestCases/DefaultTemplateSourceTabs.tid

@@ -1,6 +1,22 @@
 title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
 
 \whitespace trim
+
+\procedure testcaseNewTitle() $:/temp/testcase/draft-title
+
+\procedure saveActions()
+<$action-setfield $tiddler=<<currentTab>> $field="draft.title" $value=<<newTitle>>/>
+<$action-sendmessage $message="tm-save-tiddler" $param=<<title>> />
+<$action-setfield $tiddler=<<testcase-source-state>> text=<<newTitle>>/>
+<$action-deletetiddler $tiddler=<<testcaseNewTitle>>/>
+\end
+
+\procedure saveButton(title, newTitle)
+<$button class="tc-btn-invisible tc-test-case-save-button tc-small-gap-left" actions=<<saveActions>> disabled={{{ [<testcaseNewTitle>!has[text]then[yes]] }}}>
+{{$:/core/images/done-button}}
+</$button>
+\end
+
 \procedure body()
 <$list filter="[<currentTab>fields[]] -text +[limit[1]]" variable="ignore">
 	<table class="tc-field-table">
@@ -11,7 +27,12 @@ title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
 						<$text text=<<fieldName>>/>
 					</td>
 					<td>
-						<$view tiddler=<<currentTab>> field=<<fieldName>>/>
+						<%if [<fieldName>match[draft.title]]  %>
+							<$edit-text class="tc-edit-texteditor tc-max-width-80" tiddler=<<testcaseNewTitle>> focus="yes" tag="input"/>
+							<$macrocall $name="saveButton" newTitle={{{ [<testcaseNewTitle>get[text]] }}} title=<<currentTab>>/>
+						<%else%>
+							<$view tiddler=<<currentTab>> field=<<fieldName>>/>
+						<%endif%>
 					</td>
 				</tr>
 			</$list>

package/core/ui/TestCases/actions/Export.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/testcases/actions/Export
 tags: $:/tags/TestCase/Actions
 
-<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>
+<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>

package/core/ui/ViewTemplate/body/code.tid

@@ -1,3 +1,8 @@
 title: $:/core/ui/ViewTemplate/body/code
 
+<%if [<currentTiddler>is[missing]] :and[!is[shadow]] %>
+<$transclude tiddler="$:/language/MissingTiddler/Hint"/>
+<%else%>
+<$transclude $variable="copy-to-clipboard-above-right" src={{{ [<currentTiddler>get[text]] }}} />
 <$codeblock code={{{ [<currentTiddler>get[text]] }}} language={{{ [<currentTiddler>get[type]else[text/vnd.tiddlywiki]] }}}/>
+<%endif%>

package/core/ui/ViewTemplate/body/import.tid

@@ -6,6 +6,7 @@ title: $:/core/ui/ViewTemplate/body/import
 \whitespace trim
 <$action-confirm $message={{$:/language/Import/Listing/Cancel/Warning}} >
 <$action-deletetiddler $tiddler=<<currentTiddler>>/>
+<$action-deletetiddler $tiddler="$:/state/import/select-all"/>
 <$action-sendmessage $message="tm-close-tiddler" title=<<currentTiddler>>/>
 </$action-confirm>
 \end

package/core/ui/ViewTemplate/body.tid

@@ -3,7 +3,7 @@ tags: $:/tags/ViewTemplate
 
 \import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View/Body]!is[draft]]
 
-<$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
+<$reveal tag="div" class="tc-tiddler-body tc-clearfix" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
 
 <$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />
 

package/core/ui/ViewTemplate/lazy-loading.tid

@@ -0,0 +1,10 @@
+title: $:/core/ui/ViewTemplate/lazy-loading
+tags: $:/tags/ViewTemplate
+
+\whitespace trim
+<%if [<currentTiddler>has:field[_is_skinny]] %>
+  <!-- Render the text to trigger lazy-loading -->
+  {{||$:/core/ui/ViewTemplate/body/default}}
+  <!-- Indicator of loading state -->
+  <div class="tc-tiddler-lazy-loading" />
+<%endif%>

package/core/ui/ViewTemplate/subtitle/default.tid

@@ -0,0 +1,10 @@
+title: $:/core/ui/ViewTemplate/subtitle/default
+
+\whitespace trim
+<$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
+<div class="tc-subtitle tc-clearfix">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler">
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/>
+</$list>
+</div>
+</$reveal>

package/core/ui/ViewTemplate/subtitle/modifier.tid

@@ -1,4 +1,4 @@
 title: $:/core/ui/ViewTemplate/subtitle/modifier
 tags: $:/tags/ViewTemplate/Subtitle
 
-<$link to={{!!modifier}}/>
+<%if [{!!modifier}!is[blank]] %><$link to={{!!modifier}}/><%endif%>

package/core/ui/ViewTemplate/subtitle.tid

@@ -2,10 +2,4 @@ title: $:/core/ui/ViewTemplate/subtitle
 tags: $:/tags/ViewTemplate
 
 \whitespace trim
-<$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
-<div class="tc-subtitle">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler">
-<$transclude tiddler=<<subtitleTiddler>> mode="inline"/><$list-join>&nbsp;</$list-join>
-</$list>
-</div>
-</$reveal>
+<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateSubtitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/subtitle/default]] }}} />