diff --git a/plugins/tiddlywiki/tour/tour-panel.tid b/plugins/tiddlywiki/tour/tour-panel.tid index 6b9165bf5..b8e3ac1f7 100644 --- a/plugins/tiddlywiki/tour/tour-panel.tid +++ b/plugins/tiddlywiki/tour/tour-panel.tid @@ -45,8 +45,22 @@ next <$let currentTour={{$:/config/CurrentTour}} currentTourStep={{$:/state/tour/step}} + condition-var={{{ [get[condition-var]] :map[subfilter] }}} > - <$transclude tiddler=<> mode="block"/> + + <$list filter="[!has[condition]]" variable="ignore"> + <$transclude tiddler=<> mode="block"/> + <> + + + <$list filter="[has[condition]]" variable="ignore"> + <$transclude tiddler=<> mode="block"/> + <$list filter={{{ [get[condition]] }}} limit="1" variable="ignore"> + <$confetti/> + Congratulations, you may proceed + <> + + <$list filter="[{$:/state/tour/step}has[selector]]" variable="ignore"> <$button class="tc-btn-big-green" style="background-color: green;"> diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/close-control-panel.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/close-control-panel.tid index 426beafa1..85e2cbf9f 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/close-control-panel.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/close-control-panel.tid @@ -1,17 +1,8 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/close-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. - -<$list filter="[[$:/StoryList]!contains[$:/ControlPanel]limit[1]]" variable="ignore"> - -<$confetti/> - -Congratulations, you may proceed - -<> - - \ No newline at end of file diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/closing-tiddlers.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/closing-tiddlers.tid index e76bf74bd..bcb05a2a4 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/closing-tiddlers.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/closing-tiddlers.tid @@ -2,6 +2,7 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/closing-tiddlers tags: $:/tags/Tour/IntroductionToTiddlyWiki display-mode: fullscreen enter-actions: <$action-setfield $tiddler="$:/temp/Tour/DemoStoryList" list="$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Jupiter $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Saturn"/> +condition: [list[$:/temp/Tour/DemoStoryList]count[]match[0]] \define tour-simplified-tiddler-close-button() yes @@ -21,13 +22,3 @@ Try closing both these tiddlers. /> - -<$list filter="[list[$:/temp/Tour/DemoStoryList]count[]match[0]]" variable="ignore"> - -<$confetti/> - -Congratulations, you may proceed - -<> - - \ No newline at end of file diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/create-tiddler.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/create-tiddler.tid index 1d7ff3859..274fd04ce 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/create-tiddler.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/create-tiddler.tid @@ -3,17 +3,8 @@ 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" - -<$list filter="[list[$:/StoryList]match[Congratulations]]" variable="ignore"> - -<$confetti/> - -Congratulations, you may proceed - -<> - - \ No newline at end of file diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/end-of-fullscreen.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/end-of-fullscreen.tid index bc86591b9..73395b804 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/end-of-fullscreen.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/end-of-fullscreen.tid @@ -9,5 +9,3 @@ Congratulations! You have completed the first part of this tour. Now we are going guide you through using ~TiddlyWiki. - -<> diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/links.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/links.tid index b6baf0c21..c465dbe7c 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/links.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/links.tid @@ -2,6 +2,7 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/links tags: $:/tags/Tour/IntroductionToTiddlyWiki 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 in ~TiddlyWiki? @@ -19,13 +20,3 @@ Try clicking the link to "Saturn". /> - -<$list filter="[[$:/temp/Tour/DemoStoryList]contains[$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/Saturn]limit[1]]" variable="ignore"> - -<$confetti/> - -Congratulations, you may proceed - -<> - - \ No newline at end of file diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/open-control-panel.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/open-control-panel.tid index 2d85becef..b3711e119 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/open-control-panel.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/open-control-panel.tid @@ -1,17 +1,8 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/open-control-panel tags: $:/tags/Tour/IntroductionToTiddlyWiki selector: .tc-btn-\%24\%3A\%2Fcore\%2Fui\%2FButtons\%2Fcontrol-panel +condition: [[$:/StoryList]contains[$:/ControlPanel]] ! Welcome to ~TiddlyWiki Your task is to open the control panel. - -<$list filter="[[$:/StoryList]contains[$:/ControlPanel]limit[1]]" variable="ignore"> - -<$confetti/> - -Congratulations, you may proceed - -<> - - \ No newline at end of file diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/recent.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/recent.tid index ca3527ef7..5e505dfed 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/recent.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/recent.tid @@ -2,21 +2,9 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/recent 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. - -<$let recentTiddler={{{ [all[tiddlers]!is[system]!sort[modified]] }}}> - -<$list filter="[list[$:/StoryList]match]" variable="ignore"> - -<$confetti/> - -Congratulations! You may now proceed - -<> - - - - diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/search.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/search.tid index f027670b6..1510fc50d 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/search.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/search.tid @@ -1,17 +1,8 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/search 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". - -<$list filter="[{$:/temp/search}match[help]]" variable="ignore"> - -<$confetti/> - -Congratulations! You may now proceed - -<> - - \ No newline at end of file diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers.tid index c0f4205b7..b0c4364cc 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/tiddlers.tid @@ -15,5 +15,3 @@ A tiddler is like an index card. Each tiddler must have a unique title that is used to distinguish it. - -<> diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/welcome.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/welcome.tid index 3668ce9f5..8ff5e681f 100644 --- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/welcome.tid +++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/welcome.tid @@ -9,5 +9,3 @@ display-mode: fullscreen Welcome to our tour of ~TiddlyWiki. We hope you'll find ~TiddlyWiki a helpful and supportive tool. Let's get started! - -<> diff --git a/plugins/tiddlywiki/tour/tours/using-tags/welcome.tid b/plugins/tiddlywiki/tour/tours/using-tags/welcome.tid index a92bc6cac..886fbee0c 100644 --- a/plugins/tiddlywiki/tour/tours/using-tags/welcome.tid +++ b/plugins/tiddlywiki/tour/tours/using-tags/welcome.tid @@ -4,5 +4,3 @@ tags: $:/tags/Tour/UsingTags ! Hello! !! An introduction to using tags in ~TiddlyWiki - -<>