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