response

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

index c23630dfa6216a5e9226a3e95c131296aeb6a8a8..b215d9df32d44cd08e8b3ebc738419f89ffa26f4 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,25 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html>
  <html>
-<head><title><TMPL_VAR FORM-TITLE></title></head>
+<head>
+<base href="<TMPL_VAR BASEURL>" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title><TMPL_VAR FORM-TITLE></title>
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+</head>
  <body>
  <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>
  <TMPL_VAR FORM-START>
-<h1><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></h1>
+<div class="header">
+<span><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></span>
+</div>
  <TMPL_VAR FIELD-DO>
  <TMPL_VAR FIELD-FROM>
  <TMPL_VAR FIELD-DO>
  <TMPL_VAR FIELD-FROM>
+<TMPL_VAR FIELD-RCSINFO>
  <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">
  <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_IF>
  <TMPL_VAR FORM-SUBMIT>
+<TMPL_VAR HELPONFORMATTINGLINK>
  <TMPL_VAR FORM-END>
  <TMPL_IF NAME="PAGE_PREVIEW">
  <TMPL_VAR FORM-END>
  <TMPL_IF NAME="PAGE_PREVIEW">
-<hr>
+<hr />
+<div class="header">
+<span>Page preview:</span>
+</div>
+<div id="content">
  <TMPL_VAR PAGE_PREVIEW>
  <TMPL_VAR PAGE_PREVIEW>
+</div>
  </TMPL_IF>
  </body>
  </html>
  </TMPL_IF>
  </body>
  </html>