X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=118ca455046ad414f1e41366d7fbb16b33e984e4;hp=1c30d1d8513a0484c2d6577ac3118e1f9b9cb876;hb=60ed2aa9e45f0652430483398bc39db1d09c6d38;hpb=96c529826d3104bee299b4d3ea09c95229b9b64d diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1c30d1d85..118ca4550 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,65 +1,31 @@ -
- -

-Your changes conflict with other changes made to the page. -

-

-Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. -

- - -

-Failed to save your changes. -

-

-Your changes were not able to be saved to disk. The system gave the error: -

- -
-Your changes are preserved below, and you can try again to save them. -

- - -

-The page you were editing has disappeared. -

-

-Perhaps someone else has deleted it or moved it. If you want to recreate -this page with your text, click "Save Page" again. -

- - -

-While you were creating this page, someone else independently created a page -with the same name. -

-

-The edit box below contains the page's current content, followed by the -content you entered previously, to allow you to merge the two -together before saving. -

- + +
    -Page location: -Page type: +
  1. + + +
    2. -
     +

  2. +
    3. -Optional comment about this change:
    +
  3. +
    +
    4.  +
@@ -77,6 +43,7 @@ Optional comment about this change:
 +
@@ -87,3 +54,12 @@ Optional comment about this change:
 + +
+
+Diff: +
+
+ +
+