diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-24 00:39:06 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-24 00:39:06 +0000 |
| commit | 072967e62a06936dd082f02ae5d8fd6103f2e16c (patch) | |
| tree | 332d211f93ebc556254ad8b10045efb8013f7144 /templates | |
| parent | 2dfe3efcb7c99cb60c893387db0f21b734e1fbc8 (diff) | |
| download | ikiwiki-072967e62a06936dd082f02ae5d8fd6103f2e16c.tar ikiwiki-072967e62a06936dd082f02ae5d8fd6103f2e16c.tar.gz | |
* 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.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/editpage.tmpl | 10 |
1 files changed, 10 insertions, 0 deletions
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> |