X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/96eb9bb3fa1d805df967f44d13876f57b8ea121d..6655fbb991051d2af8965bfcc0d899a25b7e478f:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ad1faa3a5..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,12 @@ - - - - - -<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: Page type: @@ -41,17 +20,30 @@ Page type: Optional comment about this change:

 - + + +Attachments +
+ + + + + + + + +
+
+ +
Page preview:
-
+
- -