X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=696c8dcad197134bb7264d17d9f5cf950c24aba0;hb=ad02a40b3b253984078514696291a06b28a12844;hp=6ab9882618d2c843bb462b8b4618c06dd5ee513c;hpb=6b6fd778c7b35961736e9087f56e3872f6d9bdc9;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6ab988261..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,36 +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:

+
+
+Page preview: +
+
+
+ + +
+
+Diff: +
+
+ +
 - -