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

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