diff options
Diffstat (limited to 'templates/editpage.tmpl')
| -rw-r--r-- | templates/editpage.tmpl | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 987531803..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,46 +1,6 @@ <br /> <TMPL_VAR JAVASCRIPT> -<TMPL_IF NAME="PAGE_CONFLICT"> -<p> -<b>Your changes conflict with other changes made to the page.</b> -</p> -<p> -Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. -</p> -</TMPL_IF> -<TMPL_IF NAME="FAILED_SAVE"> -<p> -<b>Failed to save your changes.</b> -</p> -<p> -Your changes were not able to be saved to disk. The system gave the error: -<blockquote> -<TMPL_VAR ERROR_MESSAGE> -</blockquote> -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 MESSAGE> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-SID> @@ -71,7 +31,7 @@ Optional comment about this change:<br /> <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr> </TMPL_LOOP> <TMPL_IF NAME="ATTACHMENT_LIST"> -<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-DELETE><TMPL_VAR FIELD-RENAME></td></tr> +<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr> </TMPL_IF> </table> </div> |