X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=6fe495aa8d2843232ec6ab0c747ca7ec9f12f204;hp=6030fa2c14d650cd0af42b7c7528c159de79765c;hb=b66261d08bb978a1c5b1fe02ef25b49b4cd9d9e6;hpb=fb670513bf2372a6a88e5a5bc15eacfe4b88bf35
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 6030fa2c1..6fe495aa8 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,57 +1,131 @@
-
-
-
-
-
-<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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-