* (bug 14515) HTML nesting cleanup on edit form

The edit form was being a bit wonky about how it nested certain things, splitting the "summary" *label* from the input form and following check boxes with a <div> boundary... which was then forced to be inline.

This maybe made sense long ago, but seems pretty silly now. The div boundary made even less sense when in 'add comment' mode, and when hiding #edit-form via custom JS or css it would abut the <textarea> directly against the following checkboxes, leading to intermittent layout problems.

Moved the <div> to surround the summary box (for regular editing) and down below the textarea (for add-comment mode) so editOptions makes some kind of sense... hopefully....

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2e59116..017d100 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -382,6 +382,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14572) Redirects listed on file links on image pages no longer redirect.
 * (bug 14537) Change interwiki name for Old Church Slavonic (cu)
 * (bug 14583) Fix regression in recent changes "limit to certain categories."
+* (bug 14515) HTML nesting cleanup on edit form
+
 
 === API changes in 1.13 ===
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b740811..7a75a21 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1341,7 +1341,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '156';
+$wgStyleVersion = '158';
 
 
 # Server-side caching:

diff --git a/includes/EditPage.php b/includes/EditPage.php
index d94ba49..67eaa5a 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1265,15 +1265,15 @@ class EditPage {
                $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary );
                $summaryhiddens .= Xml::hidden( 'wpAutoSummary', $autosumm );
                if( $this->section == 'new' ) {
-                       $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span>\n<div class='editOptions'>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
-                       $editsummary = '';
+                       $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
+                       $editsummary = "<div class='editOptions'>\n";
                        global $wgParser;
                        $formattedSummary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $this->summary ) );
                        $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').':'.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : '';
                        $summarypreview = '';
                } else {
                        $commentsubject = '';
-                       $editsummary="<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span>\n<div class='editOptions'>\n<input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
+                       $editsummary="<div class='editOptions'>\n<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span>\n<input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
                        $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
                        $subjectpreview = '';
                }

diff --git a/skins/modern/main.css b/skins/modern/main.css
index 6374988..85bdf33 100644 (file)
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -812,10 +812,6 @@ input#wpSave, input#wpDiff {
        margin-right: 0.33em;
 }
 
-#editform .editOptions {
-       display: inline;
-}
-
 #wpSave {
        font-weight: bold;
 }

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index c052e32..ad44933 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1345,10 +1345,6 @@ input#wpSave, input#wpDiff {
        margin-right: 0.33em;
 }
 
-#editform .editOptions {
-       display: inline;
-}
-
 #wpSave {
        font-weight: bold;
 }