| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -1533,4 +1533,8 @@ |
| 1534 | 1534 | .imagelist .TablePager_col_img_description { white-space: normal } |
| 1535 | 1535 | .imagelist th.TablePager_sort { background-color: #ccccff } |
| 1536 | 1536 | |
| 1537 | | -.templatesUsed { margin-top: 1.5em; } |
| \ No newline at end of file |
| | 1537 | +.templatesUsed { margin-top: 1.5em; } |
| | 1538 | + |
| | 1539 | +.mw-summary-preview { |
| | 1540 | + margin: 0.1em 0; |
| | 1541 | +} |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1021,9 +1021,11 @@ |
| 1022 | 1022 | if( $this->section == 'new' ) { |
| 1023 | 1023 | $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 />"; |
| 1024 | 1024 | $editsummary = ''; |
| | 1025 | + $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : ''; |
| 1025 | 1026 | } else { |
| 1026 | 1027 | $commentsubject = ''; |
| 1027 | 1028 | $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 />"; |
| | 1029 | + $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : ''; |
| 1028 | 1030 | } |
| 1029 | 1031 | |
| 1030 | 1032 | # Set focus to the edit box on load, except on preview or diff, where it would interfere with the display |
| — | — | @@ -1141,6 +1143,7 @@ |
| 1142 | 1144 | $wgOut->addHTML( <<<END |
| 1143 | 1145 | $recreate |
| 1144 | 1146 | {$commentsubject} |
| | 1147 | +{$subjectpreview} |
| 1145 | 1148 | <textarea tabindex='1' accesskey="," name="wpTextbox1" id="wpTextbox1" rows='{$rows}' |
| 1146 | 1149 | cols='{$cols}'{$ew} $hidden> |
| 1147 | 1150 | END |
| — | — | @@ -1153,6 +1156,7 @@ |
| 1154 | 1157 | $wgOut->addHTML( " |
| 1155 | 1158 | {$metadata} |
| 1156 | 1159 | {$editsummary} |
| | 1160 | +{$summarypreview} |
| 1157 | 1161 | {$checkboxhtml} |
| 1158 | 1162 | {$safemodehtml} |
| 1159 | 1163 | "); |
| — | — | @@ -1237,6 +1241,7 @@ |
| 1238 | 1242 | */ |
| 1239 | 1243 | function showPreview() { |
| 1240 | 1244 | global $wgOut; |
| | 1245 | + |
| 1241 | 1246 | $wgOut->addHTML( '<div id="wikiPreview">' ); |
| 1242 | 1247 | if($this->mTitle->getNamespace() == NS_CATEGORY) { |
| 1243 | 1248 | $this->mArticle->openShowCategory(); |
| — | — | @@ -1246,7 +1251,6 @@ |
| 1247 | 1252 | if($this->mTitle->getNamespace() == NS_CATEGORY) { |
| 1248 | 1253 | $this->mArticle->closeShowCategory(); |
| 1249 | 1254 | } |
| 1250 | | - $wgOut->addHTML( "<br style=\"clear:both;\" />\n" ); |
| 1251 | 1255 | $wgOut->addHTML( '</div>' ); |
| 1252 | 1256 | } |
| 1253 | 1257 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -181,8 +181,9 @@ |
| 182 | 182 | * (bug 3687) Add distinct heading for media files in category display. |
| 183 | 183 | * (bug 1578) Add different icons for external links to audio, video, or PDF in |
| 184 | 184 | Monobook. |
| 185 | | -* Made autoblocks block account creation if the user block has that bit set. |
| | 185 | +* Made autoblocks block account creation if the user block has that option enabled. |
| 186 | 186 | * Add auto-summaries to blankings and large removals without summaries. |
| | 187 | +* (bug 7811) Allow preview of edit summaries. |
| 187 | 188 | |
| 188 | 189 | == Languages updated == |
| 189 | 190 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -889,6 +889,8 @@ |
| 890 | 890 | 'missingsummary' => "'''Reminder:''' You have not provided an edit summary. If you click Save again, your edit will be saved without one.", |
| 891 | 891 | 'missingcommenttext' => 'Please enter a comment below.', |
| 892 | 892 | 'missingcommentheader' => "'''Reminder:''' You have not provided a subject/headline for this comment. If you click Save again, your edit will be saved without one.", |
| | 893 | +'summary-preview' => 'Summary preview', |
| | 894 | +'subject-preview' => 'Subject/headline preview', |
| 893 | 895 | 'blockedtitle' => 'User is blocked', |
| 894 | 896 | 'blockedtext' => "<big>'''Your user name or IP address has been blocked.'''</big> |
| 895 | 897 | |