<TMPL_VAR FORM-TITLE>

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

-Optional comment about this change:
-
+Optional comment about this change: +
+ + +Attachments +

+ + + + + + + + +

+ -

+ + +

- - - - + +

+ +