Report XML::Feed bug and provide a workaround for IkiWiki; please review

[git.ikiwiki.info.git] / templates / editpage.tmpl
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl

index f77f450364c30af85589d522d3a8243557fefe77..4b54db2d15b9344ef14eb1fde87948d676b97ab4 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,40 +1,49 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head><title><TMPL_VAR FORM-TITLE></title></head>
-<body>
-<TMPL_IF NAME="PAGE_CONFLICT">
-<p>
-<b>Your changes confict with other changes made to the page.</b>
-</p>
-<p>
-Conflict markers have been inserted into the page content. Reconcile the
-confict and commit again to save your changes.
-</p>
-</TMPL_IF>
+<br />
+<TMPL_VAR JAVASCRIPT>
+<TMPL_VAR MESSAGE>
  <TMPL_VAR FORM-START>
  <TMPL_VAR FORM-START>
-<h1><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></h1>
  <TMPL_VAR FIELD-DO>
  <TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-SID>
  <TMPL_VAR FIELD-FROM>
  <TMPL_VAR FIELD-RCSINFO>
  <TMPL_VAR FIELD-FROM>
  <TMPL_VAR FIELD-RCSINFO>
+<TMPL_VAR FIELD-NEWFILE>
  <TMPL_IF NAME="PAGE_SELECT">
  <TMPL_IF NAME="PAGE_SELECT">
-Page location: <TMPL_VAR FIELD-PAGE><br />
+Page location: <TMPL_VAR FIELD-PAGE>
+Page type: <TMPL_VAR FIELD-TYPE>
  <TMPL_ELSE>
  <TMPL_ELSE>
+<br />
  <TMPL_VAR FIELD-PAGE>
  <TMPL_VAR FIELD-PAGE>
+<TMPL_VAR FIELD-TYPE>
  </TMPL_IF>
  </TMPL_IF>
-<TMPL_VAR FIELD-CONTENT><br />
+<TMPL_VAR FIELD-EDITCONTENT><br />
  <TMPL_IF NAME="CAN_COMMIT">
  Optional comment about this change:<br />
  <TMPL_VAR FIELD-COMMENTS><br />
  </TMPL_IF>
  <TMPL_VAR FORM-SUBMIT>
  <TMPL_IF NAME="CAN_COMMIT">
  Optional comment about this change:<br />
  <TMPL_VAR FIELD-COMMENTS><br />
  </TMPL_IF>
  <TMPL_VAR FORM-SUBMIT>
+<TMPL_VAR HELPONFORMATTINGLINK>
+<TMPL_IF NAME="FIELD-ATTACHMENT">
+<a class="toggle" href="#attachments">Attachments</a>
+<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><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-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
+</TMPL_IF>
+</table>
+</div>
+</TMPL_IF>
  <TMPL_VAR FORM-END>
  <TMPL_VAR FORM-END>
-<hr />
+
  <TMPL_IF NAME="PAGE_PREVIEW">
  <TMPL_IF NAME="PAGE_PREVIEW">
-<h1>Page preview:</h1>
+<hr />
+<div class="header">
+<span>Page preview:</span>
+</div>
+<div id="preview">
  <TMPL_VAR PAGE_PREVIEW>
  <TMPL_VAR PAGE_PREVIEW>
-<TMPL_ELSE>
-<TMPL_VAR HELPONFORMATTINGLINK>
+</div>
  </TMPL_IF>
  </TMPL_IF>
-</body>
-</html>