X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=696c8dcad197134bb7264d17d9f5cf950c24aba0;hp=68b7d19427aa80ca8fbd6d2270d295489e34c86f;hb=cf8a46b761ab4131fa08aade85b840bbfd4d2ba1;hpb=d4c61b72813b880d86b316770f2e3819a6428202 diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 68b7d1942..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,69 +1,88 @@ - - - - - -<TMPL_VAR FORM-TITLE> - - - - - - - - -

-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. -

- + + +
-
-/ -
+ + -Page location: -Page type: + + -
 +

+
-Optional comment about this change:
-
+ +
 - + + +Attachments +
+
+ + + +
+ + + + +
" />
+
+ + + +
+
+ +
Page preview:
-
+
- - + +
+
+Diff: +
+
+ +
+