X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=36076cb3534bfb269e2cb174784be90ceee88deb;hb=5e6aae48fd777b8735f97b9473146903c8e204c3;hp=89f01e6643ada046c38a6568edccf17be519ee45;hpb=03c98d3c79370157d94deef588415e778ab6ca87;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 89f01e664..36076cb35 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +1,67 @@ - - - - - - - -<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:
    +
  1. + + +
    2. +     -
    +
  2. +
    +
    +
    +
    3. -Optional comment about this change:
    +
  3. +
    +
    4.  +
+ + +Attachments +
+ + + + + + + + +
+
+ -
+ + +
Page preview:
-
+
- - - - + +
+
+Diff: +
+
+ +
+