From 072967e62a06936dd082f02ae5d8fd6103f2e16c Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 24 Feb 2007 00:39:06 +0000
Subject: * Patch from Ethan to improve behavior if a page is deleted or moved
 while   someone is editing it. * Some cleanup of field setting in the failed
 edit and conflict handling   code.

---
 templates/editpage.tmpl | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'templates/editpage.tmpl')

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 68b7d1942..15a4069c0 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -33,6 +33,15 @@ Your changes were not able to be saved to disk. The system gave the error:
 Your changes are preserved below, and you can try again to save them.
 </p>
 </TMPL_IF>
+<TMPL_IF NAME="PAGE_GONE">
+<p>
+<b>The page you were editing has disappeared.</b>
+</p>
+<p>
+Perhaps someone else has deleted it or moved it. If you want to recreate
+this page with your text, click "Save Page" again.
+</p>
+</TMPL_IF>
 <TMPL_VAR FORM-START>
 <div class="header">
 <span><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></span>
@@ -40,6 +49,7 @@ Your changes are preserved below, and you can try again to save them.
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
+<TMPL_VAR FIELD-NEWFILE>
 <TMPL_IF NAME="PAGE_SELECT">
 Page location: <TMPL_VAR FIELD-PAGE>
 Page type: <TMPL_VAR FIELD-TYPE>
-- 
cgit v1.2.3