X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=d6ad8061420f2c8056b6c1d12f3da6223ba0582f;hp=f77f450364c30af85589d522d3a8243557fefe77;hb=252e3f600670040b2a184e5ca0581db720096a80;hpb=e41dd1e24e345c974fe4a070088f0d09d1b6ddac diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f77f45036..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,40 +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: +
+
+ +
 - -