remove obsolete ol class=form for editpage and editcomment

The styling of labels on the form largely obsoleted the special styled ol,
so just a few br's sufficed. Using an ol like that was not too semantically
right (probably?) and could cause problems with customized local.css.

diff --git a/doc/style.css b/doc/style.css
index 22c68bd7a84211dd8f44da8198be2975fbb4a9e4..7c97a518c6679b871505cdd8fd7fda8cb2b4568e 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -338,13 +338,6 @@ label.block {
 label.inline {    
        display: inline;
 }
 label.inline {    
        display: inline;
 }

-ol.form {
-       list-style: none;
-       padding: 0;
-}
-li.form {
-       padding-bottom: 1em;
-}

 input#openid_identifier {
        background: url(wikiicons/openidlogin-bg.gif) no-repeat;
        background-color: #fff;
 input#openid_identifier {
        background: url(wikiicons/openidlogin-bg.gif) no-repeat;
        background-color: #fff;

diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index f3a8e7395244e09d917d40fdc60954616bca9463..a2edc691e7cf98dedbfe6195f10791f678842f07 100644 (file)
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -1,35 +1,27 @@
 <div class="editcomment">
 <TMPL_VAR MESSAGE>
 <div class="editcomment">
 <TMPL_VAR MESSAGE>

+<br />

 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>

-<ol class="form">

 <TMPL_UNLESS NAME=USERNAME>
 <TMPL_IF NAME=ALLOWAUTHOR>
 <TMPL_UNLESS NAME=USERNAME>
 <TMPL_IF NAME=ALLOWAUTHOR>

-<li>

 <label for="author" class="block">Name:</label>
 <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>)
 <label for="author" class="block">Name:</label>
 <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>)

-</li>
-<li>
+<br/>

 <label for="url" class="block">Website:</label>
 <TMPL_VAR NAME=FIELD-URL> (optional)
 <label for="url" class="block">Website:</label>
 <TMPL_VAR NAME=FIELD-URL> (optional)

-</li>
+<br />

 <TMPL_ELSE>
 <TMPL_ELSE>

-<li>

 (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)
 (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)

-</li>
+<br />

 </TMPL_IF>
 </TMPL_UNLESS>
 </TMPL_IF>
 </TMPL_UNLESS>

-<li>

 <label for="subject" class="block">Subject:</label>
 <TMPL_VAR FIELD-SUBJECT><br />
 <label for="subject" class="block">Subject:</label>
 <TMPL_VAR FIELD-SUBJECT><br />

-</li>
-<li>

 <label for="editcontent" class="block">Comment:</label>
 <TMPL_VAR FIELD-EDITCONTENT><br />
 <label for="editcontent" class="block">Comment:</label>
 <TMPL_VAR FIELD-EDITCONTENT><br />

-</li>
-</ol>

 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
 <TMPL_VAR NAME="FORM-END">
 <TMPL_VAR WMD_PREVIEW>
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
 <TMPL_VAR NAME="FORM-END">
 <TMPL_VAR WMD_PREVIEW>

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index b4b0d05dfd12fb9feaf38e18a18b682e8ded50a1..d6ad8061420f2c8056b6c1d12f3da6223ba0582f 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,33 +1,26 @@
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>

+<br />

 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>

-<ol class="form">

 <TMPL_IF NAME="PAGE_SELECT">
 <TMPL_IF NAME="PAGE_SELECT">

-<li>

 <label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE>
 <label for="type" class="inline">Page type:</label><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>

-</li>

 <TMPL_ELSE>
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <TMPL_ELSE>
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>

-<li>

 <div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
 </div>
 <div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
 </div>

-</li>

 <TMPL_IF NAME="CAN_COMMIT">
 <TMPL_IF NAME="CAN_COMMIT">

-<li>

 <label for="editmessage" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-EDITMESSAGE><br />
 <label for="editmessage" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-EDITMESSAGE><br />

-</li>

 </TMPL_IF>
 </TMPL_IF>

-</ol>

 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_IF NAME="FIELD-ATTACHMENT">
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_IF NAME="FIELD-ATTACHMENT">