From e18a9832090adbb8f47389612896a7941d4bb7c0 Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Sat, 2 Oct 2021 17:22:24 +0100
Subject: [PATCH] Update dynaview demo viewtemplate with latest core changes

---
 editions/dynaviewdemo/tiddlers/ViewTemplate.tid | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/editions/dynaviewdemo/tiddlers/ViewTemplate.tid b/editions/dynaviewdemo/tiddlers/ViewTemplate.tid
index 881c7aaff..cbf6eca2a 100644
--- a/editions/dynaviewdemo/tiddlers/ViewTemplate.tid
+++ b/editions/dynaviewdemo/tiddlers/ViewTemplate.tid
@@ -1,15 +1,13 @@
 title: $:/core/ui/ViewTemplate
 
 \whitespace trim
-\define frame-classes()
-tc-tiddler-frame tc-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ $(tiddlerTagClasses)$ $(userClass)$
-\end
 \define folded-state()
 $:/state/folded/$(currentTiddler)$
 \end
-<$vars storyTiddler=<<currentTiddler>> tiddlerInfoState=<<qualify "$:/state/popup/tiddler-info">> userClass={{!!class}}>
-<$tiddler tiddler=<<currentTiddler>>>
-<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class=<<frame-classes>>>
+\define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/>
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]]
+<$vars storyTiddler=<<currentTiddler>> tiddlerInfoState=<<qualify "$:/state/popup/tiddler-info">>>
+<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
 <$set name="state" value={{{ [[$:/state/viewtemplate/visibility/]addsuffix<currentTiddler>] }}}>
 <$reveal stateTitle=<<state>> type="nomatch" text="" default="" tag="div">
 <div class="tc-dynaview-track-tiddler-when-visible" data-dynaview-track-tiddler=<<state>>>
@@ -24,5 +22,4 @@ $:/state/folded/$(currentTiddler)$
 </$reveal>
 </$set>
 </div>
-</$tiddler>
 </$vars>