From da4cdf2d3bd1a935037011a31a5181425f5b3793 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Fri, 15 Nov 2013 22:55:32 +0000
Subject: [PATCH] Refactor edit template to be driven by `$:/tags/EditTemplate`
 tag

---
 core/ui/EditTemplate.tid                      | 26 +------------------
 core/ui/EditTemplate/body.tid                 | 18 +++++++++++++
 core/ui/EditTemplate/controls.tid             |  4 +++
 .../fields.tid}                               |  3 ++-
 .../{TagsEditor.tid => EditTemplate/tags.tid} |  3 ++-
 core/ui/EditTemplate/title.tid                |  6 +++++
 core/wiki/tags/EditTemplate.tid               |  2 ++
 7 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 core/ui/EditTemplate/body.tid
 create mode 100644 core/ui/EditTemplate/controls.tid
 rename core/ui/{FieldEditor.tid => EditTemplate/fields.tid} (94%)
 rename core/ui/{TagsEditor.tid => EditTemplate/tags.tid} (96%)
 create mode 100644 core/ui/EditTemplate/title.tid
 create mode 100644 core/wiki/tags/EditTemplate.tid

diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
index ceb5cd085..dd775b7bc 100644
--- a/core/ui/EditTemplate.tid
+++ b/core/ui/EditTemplate.tid
@@ -4,28 +4,4 @@ modifier: JeremyRuston
 \define frame-classes()
 tw-tiddler-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$
 \end
-<div class=<<frame-classes>>><span class="tw-tiddler-controls titlebar"> <$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"/>
-
-<$edit-text field="draft.title" class="titlebar tw-edit-texteditor"/>
-
-<$transclude tiddler="$:/core/ui/TagsEditor"/>
-
-<$reveal state="$:/ShowEditPreview" type="match" text="yes">
-<$transclude tiddler="$:/core/ui/EditorHint"/> <$button type="set" set="$:/ShowEditPreview" setTo="no">hide preview</$button>
-<div class="tw-tiddler-preview">
-<div class="tw-tiddler-preview-preview">
-<$transclude />
-</div>
-<div class="tw-tiddler-preview-edit">
-<$edit field="text" class="tw-edit-texteditor"/>
-</div>
-</div>
-</$reveal>
-<$reveal state="$:/ShowEditPreview" type="nomatch" text="yes">
-<$transclude tiddler="$:/core/ui/EditorHint"/> <$button type="set" set="$:/ShowEditPreview" setTo="yes">show preview</$button>
-<$edit field="text" class="tw-edit-texteditor"/>
-</$reveal>
-
-<$transclude tiddler="$:/core/ui/FieldEditor"/></div>
+<div class=<<frame-classes>>><$list filter="[is[shadow]!has[draft.of]tag[$:/tags/EditTemplate]] [!is[shadow]!has[draft.of]tag[$:/tags/EditTemplate]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list></div>
diff --git a/core/ui/EditTemplate/body.tid b/core/ui/EditTemplate/body.tid
new file mode 100644
index 000000000..3b4f0e4d3
--- /dev/null
+++ b/core/ui/EditTemplate/body.tid
@@ -0,0 +1,18 @@
+title: $:/core/ui/EditTemplate/body
+tags: $:/tags/EditTemplate
+
+<$reveal state="$:/ShowEditPreview" type="match" text="yes">
+<$transclude tiddler="$:/core/ui/EditorHint"/> <$button type="set" set="$:/ShowEditPreview" setTo="no">hide preview</$button>
+<div class="tw-tiddler-preview">
+<div class="tw-tiddler-preview-preview">
+<$transclude />
+</div>
+<div class="tw-tiddler-preview-edit">
+<$edit field="text" class="tw-edit-texteditor"/>
+</div>
+</div>
+</$reveal>
+<$reveal state="$:/ShowEditPreview" type="nomatch" text="yes">
+<$transclude tiddler="$:/core/ui/EditorHint"/> <$button type="set" set="$:/ShowEditPreview" setTo="yes">show preview</$button>
+<$edit field="text" class="tw-edit-texteditor"/>
+</$reveal>
diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid
new file mode 100644
index 000000000..38ad6cd60
--- /dev/null
+++ b/core/ui/EditTemplate/controls.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/EditTemplate/controls
+tags: $:/tags/EditTemplate
+
+<span class="tw-tiddler-controls titlebar"> <$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>
diff --git a/core/ui/FieldEditor.tid b/core/ui/EditTemplate/fields.tid
similarity index 94%
rename from core/ui/FieldEditor.tid
rename to core/ui/EditTemplate/fields.tid
index 89b7be097..efc8f30ae 100644
--- a/core/ui/FieldEditor.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -1,4 +1,5 @@
-title: $:/core/ui/FieldEditor
+title: $:/core/ui/EditTemplate/fields
+tags: $:/tags/EditTemplate
 
 <$fieldmangler><div class="tw-edit-fields">
 <table class="tw-edit-fields"><tbody><$list filter="[is[current]fields[]] -title -tags -text -creator -created -modified -modifier -[[draft.title]] -[[draft.of]]" variable="currentField"><tr class="tw-edit-field"><td class="tw-edit-field-name"><<currentField>>:</td><td class="tw-edit-field-value"><$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder="field value"/></td><td class="tw-edit-field-remove"><$button message="tw-remove-field" param=<<currentField>> class="btn-invisible">{{$:/core/images/delete-button}}</$button></td>
diff --git a/core/ui/TagsEditor.tid b/core/ui/EditTemplate/tags.tid
similarity index 96%
rename from core/ui/TagsEditor.tid
rename to core/ui/EditTemplate/tags.tid
index df6f6d378..1c2985775 100644
--- a/core/ui/TagsEditor.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -1,4 +1,5 @@
-title: $:/core/ui/TagsEditor
+title: $:/core/ui/EditTemplate/tags
+tags: $:/tags/EditTemplate
 
 \define tag-styles()
 background-color:$(backgroundColor)$;
diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid
new file mode 100644
index 000000000..af0ebced0
--- /dev/null
+++ b/core/ui/EditTemplate/title.tid
@@ -0,0 +1,6 @@
+title: $:/core/ui/EditTemplate/title
+tags: $:/tags/EditTemplate
+
+<$view field="title"/>
+
+<$edit-text field="draft.title" class="titlebar tw-edit-texteditor"/>
diff --git a/core/wiki/tags/EditTemplate.tid b/core/wiki/tags/EditTemplate.tid
new file mode 100644
index 000000000..526fe1fc7
--- /dev/null
+++ b/core/wiki/tags/EditTemplate.tid
@@ -0,0 +1,2 @@
+title: $:/tags/EditTemplate
+list: [[$:/core/ui/EditTemplate/controls]] [[$:/core/ui/EditTemplate/title]] [[$:/core/ui/EditTemplate/tags]] [[$:/core/ui/EditTemplate/body]] [[$:/core/ui/EditTemplate/fields]]