summaryrefslogtreecommitdiff
path: root/editpage.tmpl
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-20 23:30:56 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-20 23:30:56 +0200
commit842324297a6a9ca98eb496b217d26b119465af40 (patch)
tree64a3a1de845476fb9132279743742ca4d5bfd15a /editpage.tmpl
parente310666f0122eed6767fbc6f36c8895f8c8b713f (diff)
parent3e2f923e92cf5757631a0ed28223a68d38e71f6f (diff)
Merge branch 'scs' into allinone
Conflicts (manually resolved): misc.tmpl page.tmpl
Diffstat (limited to 'editpage.tmpl')
-rw-r--r--editpage.tmpl23
1 files changed, 17 insertions, 6 deletions
diff --git a/editpage.tmpl b/editpage.tmpl
index 4b54db2..d6ad806 100644
--- a/editpage.tmpl
+++ b/editpage.tmpl
@@ -1,6 +1,6 @@
-<br />
<TMPL_VAR JAVASCRIPT>
<TMPL_VAR MESSAGE>
+<br />
<TMPL_VAR FORM-START>
<TMPL_VAR FIELD-DO>
<TMPL_VAR FIELD-SID>
@@ -8,17 +8,18 @@
<TMPL_VAR FIELD-RCSINFO>
<TMPL_VAR FIELD-NEWFILE>
<TMPL_IF NAME="PAGE_SELECT">
-Page location: <TMPL_VAR FIELD-PAGE>
-Page type: <TMPL_VAR FIELD-TYPE>
+<label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE>
+<label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE>
<TMPL_ELSE>
-<br />
<TMPL_VAR FIELD-PAGE>
<TMPL_VAR FIELD-TYPE>
</TMPL_IF>
+<div class="editcontentdiv">
<TMPL_VAR FIELD-EDITCONTENT><br />
+</div>
<TMPL_IF NAME="CAN_COMMIT">
-Optional comment about this change:<br />
-<TMPL_VAR FIELD-COMMENTS><br />
+<label for="editmessage" class="block">Optional comment about this change:</label>
+<TMPL_VAR FIELD-EDITMESSAGE><br />
</TMPL_IF>
<TMPL_VAR FORM-SUBMIT>
<TMPL_VAR HELPONFORMATTINGLINK>
@@ -37,6 +38,7 @@ Optional comment about this change:<br />
</div>
</TMPL_IF>
<TMPL_VAR FORM-END>
+<TMPL_VAR WMD_PREVIEW>
<TMPL_IF NAME="PAGE_PREVIEW">
<hr />
@@ -47,3 +49,12 @@ Optional comment about this change:<br />
<TMPL_VAR PAGE_PREVIEW>
</div>
</TMPL_IF>
+<TMPL_IF NAME="PAGE_DIFF">
+<hr />
+<div class="header">
+<span>Diff:</span>
+</div>
+<div id="diff">
+<TMPL_VAR PAGE_DIFF>
+</div>
+</TMPL_IF>