X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1d82816082b2a3dee97a1812410962a41f1b6e79..f6ccf2fdefea28e1826cea244b907d035eb3c469:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c1e7113b4..4736c95d0 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,38 +1,91 @@ - -<TMPL_VAR FORM-TITLE> - - -

-Your changes confict with other changes made to the page. -

-

-Conflict markers have been inserted into the page content. Reconcile the -confict and commit again to save your changes. -

- + + +
-

/

+ + -Page location:
+ + + -
+
+
+
-Optional comment about this change:
-
+ +
 + + +Attachments + + + +
+
+ + + +
+ + + + +
" />
+
+ + + +
+
+ -
+ -

Page preview:

+
+
+Page preview: +
+
- - +
+ + +
+
+Diff: +
+
+ +
 - -