| Index: branches/REL1_6/phase3/includes/EditPage.php |
| — | — | @@ -868,8 +868,8 @@ |
| 869 | 869 | if ( $wgUser->isAllowed('minoredit') ) { |
| 870 | 870 | $minoredithtml = |
| 871 | 871 | "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":""). |
| 872 | | - " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />". |
| 873 | | - "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>"; |
| | 872 | + " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />\n". |
| | 873 | + "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>\n"; |
| 874 | 874 | } |
| 875 | 875 | |
| 876 | 876 | $watchhtml = ''; |
| — | — | @@ -877,9 +877,9 @@ |
| 878 | 878 | if ( $wgUser->isLoggedIn() ) { |
| 879 | 879 | $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'". |
| 880 | 880 | ($this->watchthis?" checked='checked'":""). |
| 881 | | - " accesskey=\"".htmlspecialchars(wfMsg('accesskey-watch'))."\" id='wpWatchthis' />". |
| | 881 | + " accesskey=\"".htmlspecialchars(wfMsg('accesskey-watch'))."\" id='wpWatchthis' />\n". |
| 882 | 882 | "<label for='wpWatchthis' title=\"" . |
| 883 | | - htmlspecialchars(wfMsg('tooltip-watch'))."\">{$watchthis}</label>"; |
| | 883 | + htmlspecialchars(wfMsg('tooltip-watch'))."\">{$watchthis}</label>\n"; |
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | $checkboxhtml = $minoredithtml . $watchhtml; |
| — | — | @@ -902,11 +902,11 @@ |
| 903 | 903 | # Otherwise, show a summary field at the bottom |
| 904 | 904 | $summarytext = htmlspecialchars( $wgContLang->recodeForEdit( $this->summary ) ); # FIXME |
| 905 | 905 | if( $this->section == 'new' ) { |
| 906 | | - $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 />"; |
| | 906 | + $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 />"; |
| 907 | 907 | $editsummary = ''; |
| 908 | 908 | } else { |
| 909 | 909 | $commentsubject = ''; |
| 910 | | - $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 />"; |
| | 910 | + $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 />"; |
| 911 | 911 | } |
| 912 | 912 | |
| 913 | 913 | # Set focus to the edit box on load, except on preview or diff, where it would interfere with the display |
| — | — | @@ -1042,8 +1042,8 @@ |
| 1043 | 1043 | {$safemodehtml} |
| 1044 | 1044 | "); |
| 1045 | 1045 | |
| 1046 | | - $wgOut->addHTML(" |
| 1047 | | -<div class='editButtons'> |
| | 1046 | + $wgOut->addHTML( |
| | 1047 | +"<div class='editButtons'> |
| 1048 | 1048 | {$buttons['save']} |
| 1049 | 1049 | {$buttons['preview']} |
| 1050 | 1050 | {$buttons['live']} |
| Index: branches/REL1_6/phase3/RELEASE-NOTES |
| — | — | @@ -11,6 +11,7 @@ |
| 12 | 12 | * (bug 5586) <gallery> treated text as links |
| 13 | 13 | * (bug 5957) Update for Hebrew language (he) |
| 14 | 14 | * (bug 6025) SpecialImport: wrong message when no file selected |
| | 15 | +* (bug 6015) EditPage: add spacing in the boxes "edit is minor" and "watch this" |
| 15 | 16 | |
| 16 | 17 | == MediaWiki 1.6.5 == |
| 17 | 18 | |