From ebcd5177ec2f74e44702d890643cbaf45cacbdd6 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Tue, 15 Oct 2013 14:32:45 +0100
Subject: [PATCH] Fix-ups to make the new edit widgets work

---
 core/ui/EditTemplate.tid             | 15 ++++++++-------
 core/ui/SideBar.tid                  |  4 ++--
 themes/tiddlywiki/snowwhite/base.tid |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
index 1f3c2041f..a2114a492 100644
--- a/core/ui/EditTemplate.tid
+++ b/core/ui/EditTemplate.tid
@@ -1,13 +1,14 @@
 title: $:/core/ui/EditTemplate
 modifier: JeremyRuston
 
-<span class="tw-tiddler-controls title"> <$button message="tw-delete-tiddler" class="btn-invisible">{{$:/core/images/delete-button}}</$button> <$button message="tw-cancel-tiddler" class="btn-invisible">{{$:/core/images/cancel-button}}</$button> <$button message="tw-save-tiddler" class="btn-invisible">{{$:/core/images/done-button}}</$button> </span>
+\define frame-classes()
+tw-tiddler-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$
+\end
+<div class=<<frame-classes>>><span class="tw-tiddler-controls title"> <$button message="tw-delete-tiddler" class="btn-invisible">{{$:/core/images/delete-button}}</$button> <$button message="tw-cancel-tiddler" class="btn-invisible">{{$:/core/images/cancel-button}}</$button> <$button message="tw-save-tiddler" class="btn-invisible">{{$:/core/images/done-button}}</$button> </span>
 
 <$view field="title"/>
 
-@@.title
-<$edit field="draft.title"/>
-@@
+<$edit-text field="draft.title" class="title tw-edit-texteditor"/>
 
 <$transclude title="$:/core/ui/TagsEditor"/>
 
@@ -18,13 +19,13 @@ modifier: JeremyRuston
 <$transclude />
 </div>
 <div class="tw-tiddler-preview-edit">
-<$edit field="text"/>
+<$edit field="text" class="tw-edit-texteditor"/>
 </div>
 </div>
 </$reveal>
 <$reveal state="$:/ShowEditPreview" type="nomatch" text="yes">
 <$transclude title="$:/core/ui/EditorHint"/> <$button type="set" set="$:/ShowEditPreview" setTo="yes">show preview</$button>
-<$edit field="text"/>
+<$edit field="text" class="tw-edit-texteditor"/>
 </$reveal>
 
-<$transclude title="$:/core/ui/FieldEditor"/>
+<$transclude title="$:/core/ui/FieldEditor"/></div>
diff --git a/core/ui/SideBar.tid b/core/ui/SideBar.tid
index edfed5b37..0aaa63c66 100644
--- a/core/ui/SideBar.tid
+++ b/core/ui/SideBar.tid
@@ -6,7 +6,7 @@ title: $:/core/ui/SideBar
 
 <$linkcatcher to="$:/temp/search">
 
-<div class="tw-search"><$edit tiddler="$:/temp/search" type="search" requireFocus="yes"/><$reveal state="$:/temp/search" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
+<div class="tw-search"><$edit-text title="$:/temp/search" type="search" tag="input"/><$reveal state="$:/temp/search" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
 
 </$linkcatcher>
 
@@ -16,7 +16,7 @@ title: $:/core/ui/SideBar
 
 //<small><$count filter="[!is[system]search{$:/temp/search}]"/> matches</small>//
 
-<$list filter="[!is[system]search{$:/temp/search}sort[title]limit[250]]"/>
+<$list filter="[!is[system]search{$:/temp/search}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 
 </div>
 
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 545c85fec..c31d336e2 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -524,7 +524,7 @@ a.tw-tiddlylink-external {
 	color: #888888;
 }
 
-.tw-tiddler-frame .tw-edit-texteditor input, .tw-tiddler-frame .tw-edit-texteditor textarea {
+.tw-tiddler-frame input.tw-edit-texteditor, .tw-tiddler-frame textarea.tw-edit-texteditor {
 	width: 100%;
 	padding: 3px 3px 3px 3px;
 	border: 1px solid #ccc;
@@ -533,7 +533,7 @@ a.tw-tiddlylink-external {
 	margin: 4px 0 4px 0;
 }
 
-.tw-tiddler-frame .tw-edit-texteditor input {
+.tw-tiddler-frame input.tw-edit-texteditor {
 	background-color: #f8f8f8;
 	<<box-shadow "inset 0 1px 8px rgba(0, 0, 0, 0.15)">>
 }