X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;ds=sidebyside;f=templates%2Feditpage.tmpl;h=118ca455046ad414f1e41366d7fbb16b33e984e4;hb=bf19c01f29a7e740f47354318629e61ad4ee5175;hp=1a27beb6f7dcdce9fd85c3d93b80b217f56757a2;hpb=c1e9e121b738909a84eba8be327b5eaca74e7964;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1a27beb6f..118ca4550 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,81 +1,49 @@ - -

-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.  +
-
-
- - +Attachments +
+
Attachments
+ - + -
 +
@@ -86,3 +54,12 @@ Optional comment about this change:
 + +
+
+Diff: +
+
+ +
+