X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..936dc6fc8ed7bbb05ad858c04894e317924fef8f:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,60 @@ - -<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: +
+
+ +
 - -