html validation fixes:

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

index d02eaad707dca9834fbb8f12ad64cc5e120574c4..f77f450364c30af85589d522d3a8243557fefe77 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,26 +1,40 @@
+<!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>
  <TMPL_VAR FORM-START>
  <h1><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></h1>
  <TMPL_VAR FIELD-DO>
  <TMPL_VAR FIELD-FROM>
+<TMPL_VAR FIELD-RCSINFO>
  <TMPL_IF NAME="PAGE_SELECT">
-Page location: <TMPL_VAR FIELD-PAGE><br>
+Page location: <TMPL_VAR FIELD-PAGE><br />
  <TMPL_ELSE>
  <TMPL_VAR FIELD-PAGE>
  </TMPL_IF>
-<TMPL_VAR FIELD-CONTENT><br>
+<TMPL_VAR FIELD-CONTENT><br />
  <TMPL_IF NAME="CAN_COMMIT">
-Optional comment about this change:</br>
-<TMPL_VAR FIELD-COMMENTS><br>
+Optional comment about this change:<br />
+<TMPL_VAR FIELD-COMMENTS><br />
  </TMPL_IF>
  <TMPL_VAR FORM-SUBMIT>
  <TMPL_VAR FORM-END>
+<hr />
  <TMPL_IF NAME="PAGE_PREVIEW">
-<hr>
  <h1>Page preview:</h1>
  <TMPL_VAR PAGE_PREVIEW>
+<TMPL_ELSE>
+<TMPL_VAR HELPONFORMATTINGLINK>
  </TMPL_IF>
  </body>
  </html>