X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c20c4066311341e332dc425023f856b6414de9ae..f450b7ce99a782222545831b3280b2b3e826e573:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ec48df4c2..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,54 +1,88 @@ - - - - - - - -<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:
-
+
- - - - + +
+
+Diff: +
+
+ +
+