X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c20c4066311341e332dc425023f856b6414de9ae..b2439a3e5193022c7ed52a726dd5906643ca45c7:/templates/editpage.tmpl?ds=inline diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ec48df4c2..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,36 +1,19 @@ - - - - - - - -<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:
+

@@ -38,17 +21,29 @@ Optional comment about this change:

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