X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=b1cf015a2b2aa67adbc3b568d68102632a0a832f;hb=21997387d40326e623cddb10a93dcb208025b77a;hp=ec48df4c223995ddd70001a79b6e6d1ab77e332b;hpb=c20c4066311341e332dc425023f856b6414de9ae;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ec48df4c2..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,36 +1,19 @@ - - - - - - - -<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: +Page type:
+

@@ -38,17 +21,30 @@ Optional comment about this change:

+ + +Attachments +
+ + + + + + + + +
+
+
-
+ + +
Page preview:
-
+
- - - -