Revert r30136, 30137 (bug 12681) -- new location of message bar interferes with lock...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 59a8b79..9699b88 100644 (file)
--- 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 f41e0ae..e930a5e 100644 (file)
--- 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 06bd9a9..ca6b465 100644 (file)
--- 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;
 }