| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -1345,10 +1345,6 @@ |
| 1346 | 1346 | margin-right: 0.33em; |
| 1347 | 1347 | } |
| 1348 | 1348 | |
| 1349 | | -#editform .editOptions { |
| 1350 | | - display: inline; |
| 1351 | | -} |
| 1352 | | - |
| 1353 | 1349 | #wpSave { |
| 1354 | 1350 | font-weight: bold; |
| 1355 | 1351 | } |
| Index: trunk/phase3/skins/modern/main.css |
| — | — | @@ -812,10 +812,6 @@ |
| 813 | 813 | margin-right: 0.33em; |
| 814 | 814 | } |
| 815 | 815 | |
| 816 | | -#editform .editOptions { |
| 817 | | - display: inline; |
| 818 | | -} |
| 819 | | - |
| 820 | 816 | #wpSave { |
| 821 | 817 | font-weight: bold; |
| 822 | 818 | } |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1265,15 +1265,15 @@ |
| 1266 | 1266 | $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary ); |
| 1267 | 1267 | $summaryhiddens .= Xml::hidden( 'wpAutoSummary', $autosumm ); |
| 1268 | 1268 | if( $this->section == 'new' ) { |
| 1269 | | - $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 />"; |
| 1270 | | - $editsummary = ''; |
| | 1269 | + $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 />"; |
| | 1270 | + $editsummary = "<div class='editOptions'>\n"; |
| 1271 | 1271 | global $wgParser; |
| 1272 | 1272 | $formattedSummary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $this->summary ) ); |
| 1273 | 1273 | $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').':'.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : ''; |
| 1274 | 1274 | $summarypreview = ''; |
| 1275 | 1275 | } else { |
| 1276 | 1276 | $commentsubject = ''; |
| 1277 | | - $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 />"; |
| | 1277 | + $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 />"; |
| 1278 | 1278 | $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : ''; |
| 1279 | 1279 | $subjectpreview = ''; |
| 1280 | 1280 | } |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1341,7 +1341,7 @@ |
| 1342 | 1342 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1343 | 1343 | * styles. |
| 1344 | 1344 | */ |
| 1345 | | -$wgStyleVersion = '156'; |
| | 1345 | +$wgStyleVersion = '158'; |
| 1346 | 1346 | |
| 1347 | 1347 | |
| 1348 | 1348 | # Server-side caching: |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -382,7 +382,9 @@ |
| 383 | 383 | * (bug 14572) Redirects listed on file links on image pages no longer redirect. |
| 384 | 384 | * (bug 14537) Change interwiki name for Old Church Slavonic (cu) |
| 385 | 385 | * (bug 14583) Fix regression in recent changes "limit to certain categories." |
| | 386 | +* (bug 14515) HTML nesting cleanup on edit form |
| 386 | 387 | |
| | 388 | + |
| 387 | 389 | === API changes in 1.13 === |
| 388 | 390 | |
| 389 | 391 | * Fixing main page display in meta=siteinfo |