add NEWS about template change

[ikiwiki.git] / templates / editpage.tmpl

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index fdb142c709e27fa2cca269439d3e64cfbd6127cb..6d8a902a23c656a8d40f4d535eb27c09c486157e 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,51 +1,13 @@
-<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>
+<br />
+<TMPL_VAR JAVASCRIPT>
+<TMPL_VAR MESSAGE>
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<TMPL_IF NAME="PAGE_SELECT">
+<TMPL_IF PAGE_SELECT>
 Page location: <TMPL_VAR FIELD-PAGE>
 Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_ELSE>
@@ -54,30 +16,30 @@ Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <TMPL_VAR FIELD-EDITCONTENT><br />
-<TMPL_IF NAME="CAN_COMMIT">
+<TMPL_IF CAN_COMMIT>
 Optional comment about this change:<br />
 <TMPL_VAR FIELD-COMMENTS><br />
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
+<TMPL_IF FIELD-ATTACHMENT>
 <a class="toggle" href="#attachments">Attachments</a>
-<TMPL_IF NAME="FIELD-ATTACHMENT">
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <table>
-<tr><td colspan=5><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-<TMPL_LOOP NAME="ATTACHMENT_LIST">
+<tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
+<TMPL_LOOP ATTACHMENT_LIST>
 <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>
+<TMPL_IF ATTACHMENT_LIST>
+<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
 </TMPL_IF>
-</tr>
 </table>
 </div>
 </TMPL_IF>
 <TMPL_VAR FORM-END>
+<TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF NAME="PAGE_PREVIEW">
+<TMPL_IF PAGE_PREVIEW>
 <hr />
 <div class="header">
 <span>Page preview:</span>
@@ -86,5 +48,3 @@ Optional comment about this change:<br />
 <TMPL_VAR PAGE_PREVIEW>
 </div>
 </TMPL_IF>
-
-<TMPL_VAR JAVASCRIPT>