X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e41dd1e24e345c974fe4a070088f0d09d1b6ddac..c28d1b41712f3a0feb8a0ec4ee2695cb089738d2:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f77f45036..efe077f84 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,40 +1,90 @@ - - -<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: +
+
+ +
 - -