* Added an interface message that controls the layout of action=edit

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 4e39380..b0cb2d6 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -866,17 +866,8 @@ END
 </textarea>
 
                " );
-               
-               $wgOut->addWikiText( $copywarn );
-
-               $wgOut->addHTML( "
-{$metadata}
-{$editsummary}
-{$checkboxhtml}
-{$safemodehtml}
-");
 
-               $wgOut->addHTML( "
+               $editbuttons = "
 <div class='editButtons'>
 <input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
 " title=\"".wfMsg('tooltip-save')."\"/>
@@ -884,17 +875,22 @@ END
 " title=\"".wfMsg('tooltip-preview')."\"/>
 <input tabindex='7' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"".
 " title=\"".wfMsg('tooltip-diff')."\"/> <span class='editHelp'>{$cancel} | {$edithelp}</span></div>
-</div>
-" );
-
-               $wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
-
-               $wgOut->addHTML( "
-<div class='templatesUsed'>
-{$templates}
-</div>
-" );
-
+</div>";
+
+               $wgOut->addHTML(
+                       wfMsgForContent( 'editpage-template',
+                               array(
+                                       'METADATA' => $metadata,
+                                       'SUMMARY' => $editsummary,
+                                       'CHECKBOXES' => $checkboxhtml . $safemodehtml,
+                                       'BUTTONS' => $editbuttons,
+                                       'EDITTOOLS' => $wgOut->parse( wfMsgForContent( 'edittools' ) ),
+                                       'COPYRIGHTWARNING' => $wgOut->parse( $copywarn ),
+                                       'TEMPLATES' => "<div class='templatesUsed'>$templates</div>"
+                               )
+                       )
+               );
+               
                if ( $wgUser->isLoggedIn() ) {
                        /**
                         * To make it harder for someone to slip a user a page

diff --git a/languages/Language.php b/languages/Language.php
index 5696884..53bca34 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -292,6 +292,15 @@ parent class in order maintain consistency across languages.
 ** sitesupport-url|sitesupport
 ',
 
+'editpage-template' => '
+$SUMMARY
+$CHECKBOXES
+$BUTTONS
+$EDITTOOLS
+$COPYRIGHTWARNING
+$TEMPLATES
+',
+
 # User preference toggles
 'tog-underline' => 'Underline links:',
 'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>).',