From: Rob Moen <rmoen@wikimedia.org>
Date: Wed, 29 Aug 2012 01:50:15 +0000 (-0700)
Subject: Move copyright warning to directly above buttons.
X-Git-Tag: 1.31.0-rc.0~22545^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=e404ff710869aa9dc0b4df5e1952724aa329e3e5;p=lhc%2Fweb%2Fwiklou.git

Move copyright warning to directly above buttons.

Please see:
http://www.mediawiki.org/wiki/Micro_Design_Improvements

Change-Id: Ida02149880aae00f790cb414ae3d632aac351651
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 038916861e..48ac32bc93 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1886,10 +1886,6 @@ class EditPage {
 
 		$wgOut->addHTML( $this->editFormTextAfterContent );
 
-		$wgOut->addWikiText( $this->getCopywarn() );
-
-		$wgOut->addHTML( $this->editFormTextAfterWarn );
-
 		$this->showStandardInputs();
 
 		$this->showFormAfterText();
@@ -2478,6 +2474,11 @@ HTML
 		$checkboxes = $this->getCheckboxes( $tabindex,
 			array( 'minor' => $this->minoredit, 'watch' => $this->watchthis ) );
 		$wgOut->addHTML( "<div class='editCheckboxes'>" . implode( $checkboxes, "\n" ) . "</div>\n" );
+
+		// Show copyright warning.
+		$wgOut->addWikiText( $this->getCopywarn() );
+		$wgOut->addHTML( $this->editFormTextAfterWarn );
+
 		$wgOut->addHTML( "<div class='editButtons'>\n" );
 		$wgOut->addHTML( implode( $this->getEditButtons( $tabindex ), "\n" ) . "\n" );