From 6f46775e9474fe43939958ec03c57f65ef884418 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 5 Oct 2023 13:50:02 +0100 Subject: [PATCH] Use the tour step caption as the heading --- plugins/tiddlywiki/tour/tour-panel.tid | 3 +++ .../introduction-to-tiddlywiki/steps/close-control-panel.tid | 4 +--- .../introduction-to-tiddlywiki/steps/closing-tiddlers.tid | 2 -- .../tours/introduction-to-tiddlywiki/steps/create-tiddler.tid | 4 +--- .../introduction-to-tiddlywiki/steps/end-of-fullscreen.tid | 4 +--- .../tour/tours/introduction-to-tiddlywiki/steps/finished.tid | 4 +--- .../tour/tours/introduction-to-tiddlywiki/steps/links.tid | 2 -- .../introduction-to-tiddlywiki/steps/open-control-panel.tid | 4 +--- .../tour/tours/introduction-to-tiddlywiki/steps/recent.tid | 4 +--- .../tour/tours/introduction-to-tiddlywiki/steps/search.tid | 2 -- .../tour/tours/introduction-to-tiddlywiki/steps/tiddlers.tid | 4 +--- .../tour/tours/introduction-to-tiddlywiki/steps/welcome.tid | 2 -- plugins/tiddlywiki/tour/tours/using-tags/finished.tid | 4 ++-- plugins/tiddlywiki/tour/tours/using-tags/welcome.tid | 2 -- 14 files changed, 12 insertions(+), 33 deletions(-) diff --git a/plugins/tiddlywiki/tour/tour-panel.tid b/plugins/tiddlywiki/tour/tour-panel.tid index ad85f5ebe..f8a35b6cb 100644 --- a/plugins/tiddlywiki/tour/tour-panel.tid +++ b/plugins/tiddlywiki/tour/tour-panel.tid @@ -55,6 +55,9 @@ tags: $:/tags/PageTemplate currentTourStep={{$:/state/tour/step}} condition-var={{{ [get[condition-var]] :map[subfilter] }}} > + <$list filter="[has[caption]]" variable="ignore"> +

<$transclude $tiddler=<> $field="caption" mode="inline"/>

+ <$list filter="[!has[condition]]" variable="ignore"> <$transclude tiddler=<> mode="block"/> diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/close-control-panel.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/close-control-panel.tid index 8fc20fd1a..b70f6ec95 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/close-control-panel.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/close-control-panel.tid @@ -1,9 +1,7 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/steps/close-control-panel -caption: Closing the control panel +caption: Close the control panel tags: $:/tags/Tour/IntroductionToTiddlyWiki selector: .tc-story-river div[data-tiddler-title='$:/ControlPanel'] .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fclose condition: [[$:/StoryList]!contains[$:/ControlPanel]] -! Close the control panel - Your task now is to close the control panel. diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/closing-tiddlers.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/closing-tiddlers.tid index 1f99a15a3..b86840765 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/closing-tiddlers.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/closing-tiddlers.tid @@ -7,8 +7,6 @@ condition: [list[$:/temp/Tour/DemoStoryList]count[]match[0]] \define tour-simplified-tiddler-close-button() yes -! Closing tiddlers - In the top right corner of each tiddler there is a button marked {{$:/core/images/close-button|0.65em}} that can be used to close them when you are finished with them. Try closing both these tiddlers. diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/create-tiddler.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/create-tiddler.tid index 45fcbde99..22def452f 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/create-tiddler.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/create-tiddler.tid @@ -1,11 +1,9 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/steps/create-tiddler -caption: Creating a tiddler +caption: Creating Tiddlers tags: $:/tags/Tour/IntroductionToTiddlyWiki selector: .tc-story-river div[data-tiddler-title="Draft of 'New Tiddler'"] input[value]:not([value="Congratulations"]) selector-fallback-1: .tc-story-river div[data-tiddler-title='Draft of \'New Tiddler\''] .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fsave selector-fallback-2: .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fnew-tiddler condition: [list[$:/StoryList]match[Congratulations]] -! Creating Tiddlers - Your task is to create and open a tiddler titled "Congratulations" diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/end-of-fullscreen.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/end-of-fullscreen.tid index 7ed2f63ff..fbf778d0f 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/end-of-fullscreen.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/end-of-fullscreen.tid @@ -1,10 +1,8 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/steps/end-of-fullscreen -caption: End of first part +caption: Going Deeper tags: $:/tags/Tour/IntroductionToTiddlyWiki display-mode: fullscreen -! Going deeper - Congratulations! You have completed the first part of this tour. diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/finished.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/finished.tid index 343bc5a0b..16cdd6509 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/finished.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/finished.tid @@ -1,9 +1,7 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/steps/finished -caption: Finished +caption: Congratulations tags: $:/tags/Tour/IntroductionToTiddlyWiki -! Congratulations - You have completed the tour. You can choose to take another tour: diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/links.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/links.tid index 328a9b5a4..622a2829f 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/links.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/links.tid @@ -5,8 +5,6 @@ display-mode: fullscreen enter-actions: <$action-setfield $tiddler="$:/temp/Tour/DemoStoryList" list="$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Jupiter"/> condition: [[$:/temp/Tour/DemoStoryList]contains[$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Saturn]] -! How do links work? - Links allow you to decide if you want more information on a particular area or term as you go. Try clicking the link to "Saturn". diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/open-control-panel.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/open-control-panel.tid index 5bd4841a4..78f1889d2 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/open-control-panel.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/open-control-panel.tid @@ -4,6 +4,4 @@ tags: $:/tags/Tour/IntroductionToTiddlyWiki selector: .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fcontrol-panel condition: [[$:/StoryList]contains[$:/ControlPanel]] -! Welcome to {{$:/config/Tours/IntroductionToTiddlyWiki/ProductName}} - -Your task is to open the control panel. +Your task is to open the control panel by clicking the icon that looks like a cog in the sidebar. diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/recent.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/recent.tid index ac9b90c34..a9670f079 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/recent.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/recent.tid @@ -1,11 +1,9 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/steps/recent -caption: Locating recent tiddlers +caption: Finding recent tiddlers tags: $:/tags/Tour/IntroductionToTiddlyWiki selector: .tc-sidebar-tabs-main .tc-timeline > .tc-menu-list-item:nth-child(1) .tc-menu-list-subitem:nth-child(1) .tc-tiddlylink selector-fallback-1: .tc-sidebar-tabs-main button:nth-child(3) condition: [list[$:/StoryList]match] condition-var: [all[tiddlers]!is[system]!sort[modified]] -! Searching - Your task is to use the "Recent" tab of the sidebar to open the most recently editted tiddler. diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/search.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/search.tid index 96bde07dd..0843397c0 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/search.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/search.tid @@ -4,6 +4,4 @@ tags: $:/tags/Tour/IntroductionToTiddlyWiki selector: .tc-sidebar-search .tc-popup-handle condition: [{$:/temp/search}match[help]] -! Searching - Your task is to search for the phrase "help". diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/tiddlers.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/tiddlers.tid index 95527b906..4b4046e78 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/tiddlers.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/tiddlers.tid @@ -1,10 +1,8 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/steps/tiddlers -caption: Tiddlers +caption: How does {{$:/config/Tours/IntroductionToTiddlyWiki/ProductName}} work? tags: $:/tags/Tour/IntroductionToTiddlyWiki display-mode: fullscreen -! How does {{$:/config/Tours/IntroductionToTiddlyWiki/ProductName}} work? - {{$:/config/Tours/IntroductionToTiddlyWiki/ProductName}} lets you collect and organise all kinds of information into interconnected bite-sized pieces called ''tiddlers''. A tiddler is like an index card. diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/welcome.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/welcome.tid index a93dbd7db..19738f54c 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/welcome.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/welcome.tid @@ -3,8 +3,6 @@ caption: Welcome tags: $:/tags/Tour/IntroductionToTiddlyWiki display-mode: fullscreen -! Hello! - !! An interactive tour of {{$:/config/Tours/IntroductionToTiddlyWiki/ProductName}} Welcome to our tour of {{$:/config/Tours/IntroductionToTiddlyWiki/ProductName}}. diff --git a/plugins/tiddlywiki/tour/tours/using-tags/finished.tid b/plugins/tiddlywiki/tour/tours/using-tags/finished.tid index 936446f75..6d8a9e4f9 100644 --- a/plugins/tiddlywiki/tour/tours/using-tags/finished.tid +++ b/plugins/tiddlywiki/tour/tours/using-tags/finished.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/tour/using-tags/finished -caption: Finished +caption: Congratulations tags: $:/tags/Tour/UsingTags -! Congratulations +<]">> diff --git a/plugins/tiddlywiki/tour/tours/using-tags/welcome.tid b/plugins/tiddlywiki/tour/tours/using-tags/welcome.tid index 748538674..852273629 100644 --- a/plugins/tiddlywiki/tour/tours/using-tags/welcome.tid +++ b/plugins/tiddlywiki/tour/tours/using-tags/welcome.tid @@ -2,6 +2,4 @@ title: $:/plugins/tiddlywiki/tour/using-tags/welcome caption: Welcome tags: $:/tags/Tour/UsingTags -! Hello! - !! An introduction to using tags in ~TiddlyWiki