Merge commit 'ecdfd1b8644bc926db008054ab6192e18351afed' into sipb

[ikiwiki.git] / templates / editpage.tmpl

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 4b54db2d15b9344ef14eb1fde87948d676b97ab4..70bbfb28f06237c2ddfb9235386b7882453c0768 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/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>
@@ -36,7 +37,17 @@ Optional comment about this change:<br />
 </table>
 </div>
 </TMPL_IF>
+<div class="license">
+    <p>By submitting content to this wiki, you agree to release your work under
+    the dual license of</p>
+    <ul>
+      <li>the Creative Commons Attribution-Share Alike license, and</li>
+      <li>the GNU Free Documentation License, with no Invariant Sections, no
+         Front-Cover Texts, and no Back-Cover-Texts.</li>
+    </ul>
+</div>
 <TMPL_VAR FORM-END>
+<TMPL_VAR WMD_PREVIEW>
 
 <TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
@@ -47,3 +58,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>