X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1452b3adf30145e8fd1208ac73da9d12967863bc..63fe022602b622eb80bd38d64ee272b543ce0418:/templates/editpage.tmpl?ds=inline diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index cf4520575..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:
+

@@ -39,15 +22,28 @@ Optional comment about this change:
+ +Attachments +
+ + + + + + + + +
+
+
+
Page preview:
-
+
- -