| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -866,8 +866,17 @@ |
| 867 | 867 | </textarea> |
| 868 | 868 | |
| 869 | 869 | " ); |
| | 870 | + |
| | 871 | + $wgOut->addWikiText( $copywarn ); |
| 870 | 872 | |
| 871 | | - $editbuttons = " |
| | 873 | + $wgOut->addHTML( " |
| | 874 | +{$metadata} |
| | 875 | +{$editsummary} |
| | 876 | +{$checkboxhtml} |
| | 877 | +{$safemodehtml} |
| | 878 | +"); |
| | 879 | + |
| | 880 | + $wgOut->addHTML( " |
| 872 | 881 | <div class='editButtons'> |
| 873 | 882 | <input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"". |
| 874 | 883 | " title=\"".wfMsg('tooltip-save')."\"/> |
| — | — | @@ -875,22 +884,17 @@ |
| 876 | 885 | " title=\"".wfMsg('tooltip-preview')."\"/> |
| 877 | 886 | <input tabindex='7' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"". |
| 878 | 887 | " title=\"".wfMsg('tooltip-diff')."\"/> <span class='editHelp'>{$cancel} | {$edithelp}</span></div> |
| 879 | | -</div>"; |
| | 888 | +</div> |
| | 889 | +" ); |
| 880 | 890 | |
| 881 | | - $wgOut->addHTML( |
| 882 | | - wfMsgForContent( 'editpage-template', |
| 883 | | - array( |
| 884 | | - 'METADATA' => $metadata, |
| 885 | | - 'SUMMARY' => $editsummary, |
| 886 | | - 'CHECKBOXES' => $checkboxhtml . $safemodehtml, |
| 887 | | - 'BUTTONS' => $editbuttons, |
| 888 | | - 'EDITTOOLS' => $wgOut->parse( wfMsgForContent( 'edittools' ) ), |
| 889 | | - 'COPYRIGHTWARNING' => $wgOut->parse( $copywarn ), |
| 890 | | - 'TEMPLATES' => "<div class='templatesUsed'>$templates</div>" |
| 891 | | - ) |
| 892 | | - ) |
| 893 | | - ); |
| 894 | | - |
| | 891 | + $wgOut->addWikiText( wfMsgForContent( 'edittools' ) ); |
| | 892 | + |
| | 893 | + $wgOut->addHTML( " |
| | 894 | +<div class='templatesUsed'> |
| | 895 | +{$templates} |
| | 896 | +</div> |
| | 897 | +" ); |
| | 898 | + |
| 895 | 899 | if ( $wgUser->isLoggedIn() ) { |
| 896 | 900 | /** |
| 897 | 901 | * To make it harder for someone to slip a user a page |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -292,15 +292,6 @@ |
| 293 | 293 | ** sitesupport-url|sitesupport |
| 294 | 294 | ', |
| 295 | 295 | |
| 296 | | -'editpage-template' => ' |
| 297 | | -$SUMMARY |
| 298 | | -$CHECKBOXES |
| 299 | | -$BUTTONS |
| 300 | | -$EDITTOOLS |
| 301 | | -$COPYRIGHTWARNING |
| 302 | | -$TEMPLATES |
| 303 | | -', |
| 304 | | - |
| 305 | 296 | # User preference toggles |
| 306 | 297 | 'tog-underline' => 'Underline links:', |
| 307 | 298 | 'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>).', |