* Split off an IkiWiki.pm out of ikiwiki and have all the other modules use
[ikiwiki.git] / templates / editpage.tmpl
index c23630dfa6216a5e9226a3e95c131296aeb6a8a8..4724cd65fd6e3e551eacc00dfd5ff4acb4ea0d2b 100644 (file)
@@ -1,25 +1,51 @@
+<!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>
+<head>
+<TMPL_IF NAME="BASEURL">
+<base href="<TMPL_VAR BASEURL>" />
+</TMPL_IF>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title><TMPL_VAR FORM-TITLE></title>
+<link rel="stylesheet" href="<TMPL_VAR STYLEURL>" type="text/css" />
+</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>
+<div id="header">
+<h1>Page preview:</h1>
+</div>
+<div id="content">
 <TMPL_VAR PAGE_PREVIEW>
+</div>
+<TMPL_ELSE>
+<TMPL_VAR HELPONFORMATTINGLINK>
 </TMPL_IF>
 </body>
 </html>