summaryrefslogtreecommitdiff
path: root/editpage.tmpl
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-20 23:45:13 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-20 23:45:13 +0200
commit83ade29837b194950b33ed9b3cfcf8efe1181e1f (patch)
tree5d751da265d7a021befbac631844c44e4135af38 /editpage.tmpl
parent14bb211648396f091577ab4599bbdf8d9e8da26d (diff)
parent306eb61d606fd1ab40ef74866a14267384e0b2d6 (diff)
Merge branch 'scs-da' into allinone-nonedit-da
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 8914e5e..00ec9e1 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">
-Sideplacering: <TMPL_VAR FIELD-PAGE>
-Sidetype: <TMPL_VAR FIELD-TYPE>
+<label for="page" class="inline">Sideplacering:</label><TMPL_VAR FIELD-PAGE>
+<label for="type" class="inline">Sidetype:</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">
-Valgfri kommentar om denne ændring:<br />
-<TMPL_VAR FIELD-COMMENTS><br />
+<label for="editmessage" class="block">Valgfri kommentar om denne ændring:</label>
+<TMPL_VAR FIELD-EDITMESSAGE><br />
</TMPL_IF>
<TMPL_VAR FORM-SUBMIT>
<TMPL_VAR HELPONFORMATTINGLINK>
@@ -37,6 +38,7 @@ Valgfri kommentar om denne ændring:<br />
</div>
</TMPL_IF>
<TMPL_VAR FORM-END>
+<TMPL_VAR WMD_PREVIEW>
<TMPL_IF NAME="PAGE_PREVIEW">
<hr />
@@ -47,3 +49,12 @@ Valgfri kommentar om denne ændring:<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>