From 957b17a78cade5173731a820e65fc5f1cea6b9ae Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sun, 15 Jul 2012 22:35:39 +0100
Subject: [PATCH] Introduce edit mode

There's a wizard for switching into edit mode, and selective display of
UI elements
---
 core/templates/PageTemplate.tid | 17 ++++++++++++-----
 core/templates/ViewTemplate.tid |  3 +--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index 8b76b5735..e757a5b1e 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -7,7 +7,9 @@ title: $:/templates/PageTemplate
 	<<list all>>
 >>
 }}}
+
 <<zoomer>>
+
 <div class="navbar navbar-fixed-top">
 <div class="navbar-inner">
 <div class="container">
@@ -17,13 +19,18 @@ title: $:/templates/PageTemplate
 * [[Docs]]
 *{{divider-vertical}}
 
-{{btn btn-danger{
-<<button popup:ViewDropDownState><View <span class="caret"></span>>>
+<<button popup:ViewDropDownState class:"btn btn-danger"><View <span class="caret"></span>>>
+
+{{pull-right{
+<<reveal state:[[$:/EditMode]] type:nomatch text:yes><
+<<button modal param:[[$:/messages/EnterEditMode]] set:[[$:/EditMode]] setTo:yes class:"btn btn-success"><Edit>>
+>>
+
+<<reveal state:[[$:/EditMode]] type:match text:yes><
+<<button save-wiki class:"btn pull-right"><Save Changes>>
+>>
 }}}
 
-
-<<button save-wiki class:"btn"><Save Changes>>
-
 }}}
 
 <<navigator set:[[$:/CurrentView]]><
diff --git a/core/templates/ViewTemplate.tid b/core/templates/ViewTemplate.tid
index bfda951de..ad2285179 100644
--- a/core/templates/ViewTemplate.tid
+++ b/core/templates/ViewTemplate.tid
@@ -2,8 +2,7 @@ title: $:/templates/ViewTemplate
 modifier: JeremyRuston
 
 <div class="title">
-	<span><<view title>></span>
-	<<button EditTiddler class:"btn-invisible"><[img[$:/core/images/edit-button.svg]]>>
+	<span><<view title>></span> <<reveal state:[[$:/EditMode]] type:match text:yes>< <<button EditTiddler class:"btn-invisible"><[img[$:/core/images/edit-button.svg]]>> >>
 	<<button close class:"btn-invisible pull-right"><[img[$:/core/images/close-button.svg]]>>
 </div>
 <div class="small">