editpage: Rename "comments" field to avoid CSS conflict with the comments div.

[git.ikiwiki.info.git] / templates / editpage.tmpl

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 1e2d070ed530601fcf7967571e2053d39a553c73..b4b0d05dfd12fb9feaf38e18a18b682e8ded50a1 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -17,12 +17,14 @@
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <li>
+<div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</div>
 </li>
 <TMPL_IF NAME="CAN_COMMIT">
 <li>
-<label for="comments" class="block">Optional comment about this change:</label>
-<TMPL_VAR FIELD-COMMENTS><br />
+<label for="editmessage" class="block">Optional comment about this change:</label>
+<TMPL_VAR FIELD-EDITMESSAGE><br />
 </li>
 </TMPL_IF>
 </ol>
@@ -54,3 +56,12 @@
 <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>