X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d4c61b72813b880d86b316770f2e3819a6428202..e36d81363d51f67820d5381c19349294d40d5171:/templates/editpage.tmpl?ds=sidebyside

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 68b7d1942..02951210f 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -33,6 +33,26 @@ 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_IF NAME="CREATION_CONFLICT">
+<p>
+<b>While you were creating this page, someone else independently created a page
+with the same name.</b>
+</p>
+<p>
+The edit box below contains the page's current content, followed by the 
+content you entered previously, to allow you to merge the two
+together before saving.
+</p>
+</TMPL_IF>
 <TMPL_VAR FORM-START>
 <div class="header">
 <span><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></span>
@@ -40,6 +60,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>