| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -893,8 +893,8 @@ |
| 894 | 894 | if ( $wgUser->isAllowed('minoredit') ) { |
| 895 | 895 | $minoredithtml = |
| 896 | 896 | "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":""). |
| 897 | | - " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />". |
| 898 | | - "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>"; |
| | 897 | + " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />\n". |
| | 898 | + "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>\n"; |
| 899 | 899 | } |
| 900 | 900 | |
| 901 | 901 | $watchhtml = ''; |
| — | — | @@ -902,9 +902,9 @@ |
| 903 | 903 | if ( $wgUser->isLoggedIn() ) { |
| 904 | 904 | $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'". |
| 905 | 905 | ($this->watchthis?" checked='checked'":""). |
| 906 | | - " accesskey=\"".htmlspecialchars(wfMsg('accesskey-watch'))."\" id='wpWatchthis' />". |
| | 906 | + " accesskey=\"".htmlspecialchars(wfMsg('accesskey-watch'))."\" id='wpWatchthis' />\n". |
| 907 | 907 | "<label for='wpWatchthis' title=\"" . |
| 908 | | - htmlspecialchars(wfMsg('tooltip-watch'))."\">{$watchthis}</label>"; |
| | 908 | + htmlspecialchars(wfMsg('tooltip-watch'))."\">{$watchthis}</label>\n"; |
| 909 | 909 | } |
| 910 | 910 | |
| 911 | 911 | $checkboxhtml = $minoredithtml . $watchhtml; |
| — | — | @@ -927,11 +927,11 @@ |
| 928 | 928 | # Otherwise, show a summary field at the bottom |
| 929 | 929 | $summarytext = htmlspecialchars( $wgContLang->recodeForEdit( $this->summary ) ); # FIXME |
| 930 | 930 | if( $this->section == 'new' ) { |
| 931 | | - $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span> <div class='editOptions'><input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />"; |
| | 931 | + $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' /><br />"; |
| 932 | 932 | $editsummary = ''; |
| 933 | 933 | } else { |
| 934 | 934 | $commentsubject = ''; |
| 935 | | - $editsummary="<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span> <div class='editOptions'><input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />"; |
| | 935 | + $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' /><br />"; |
| 936 | 936 | } |
| 937 | 937 | |
| 938 | 938 | # Set focus to the edit box on load, except on preview or diff, where it would interfere with the display |
| — | — | @@ -1066,8 +1066,8 @@ |
| 1067 | 1067 | {$safemodehtml} |
| 1068 | 1068 | "); |
| 1069 | 1069 | |
| 1070 | | - $wgOut->addHTML(" |
| 1071 | | -<div class='editButtons'> |
| | 1070 | + $wgOut->addHTML( |
| | 1071 | +"<div class='editButtons'> |
| 1072 | 1072 | {$buttons['save']} |
| 1073 | 1073 | {$buttons['preview']} |
| 1074 | 1074 | {$buttons['live']} |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -301,6 +301,7 @@ |
| 302 | 302 | * (bug 6017) Update list of bookstores in German localisation files |
| 303 | 303 | * (bug 5187) Allow programmatically bypassing username validation, for scripts |
| 304 | 304 | * (bug 6025) SpecialImport: wrong message when no file selected |
| | 305 | +* (bug 6015) EditPage: add spacing in the boxes "edit is minor" and "watch this" |
| 305 | 306 | |
| 306 | 307 | == Compatibility == |
| 307 | 308 | |