From ebc005b6a6e0602ad90ff4181205a3afcca6523f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 25 Jan 2008 23:48:17 +0000
Subject: [PATCH] Revert r30136, 30137 (bug 12681) -- new location of message
 bar interferes with lock, geolocation, etc magic templates in use on
 Wikimedia sites. Hold off on this until there's a system for properly
 handling those "out of content area" magicks.

---
 RELEASE-NOTES           | 2 --
 skins/MonoBook.php      | 2 +-
 skins/monobook/main.css | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 59a8b790a2..9699b883ac 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -143,8 +143,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11897) Add alias [[Special:CreateAccount]] & [[Special:Userlogin/signup]]
   for Special:Userlogin?type=signup
 * (bug 12214) Add a predefined list of delete reasons to the file deletion form
-* (bug 12681) New messages bar should appear above page title, for consistency
-  with other message boxes
 
 === Bug fixes in 1.12 ===
 
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index f41e0ae013..e930a5e7ad 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -98,12 +98,12 @@ class MonoBookTemplate extends QuickTemplate {
 	<div id="content">
 		<a name="top" id="top"></a>
 		<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-		<?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
 		<h1 class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
 		<div id="bodyContent">
 			<h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
 			<div id="contentSub"><?php $this->html('subtitle') ?></div>
 			<?php if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></div><?php } ?>
+			<?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
 			<?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?>
 			<!-- start content -->
 			<?php $this->html('bodytext') ?>
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 06bd9a9b42..ca6b465a42 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -262,7 +262,7 @@ span.subpages {
 	border: 1px solid #ffa500;
 	color: black;
 	font-weight: bold;
-	margin: .5em 0;
+	margin: 2em 0 1em;
 	padding: .5em 1em;
 	vertical-align: middle;
 }
-- 
2.20.1