Revert old page navigation back to a subtitle

Please reapply to trunk for inclusion in 1.19.

reverts r85322 & r90883

diff --git a/includes/Article.php b/includes/Article.php
index 040f119..585dfd9 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1764,7 +1764,7 @@ class Article extends Page {
                        "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsgExt( 'revision-nav', array( 'escapenoentities', 'parsemag', 'replaceafter' ),
                        $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t";
 
-               $wgOut->addHTML( $r );
+               $wgOut->setSubtitle( $r );
        }
 
        /* Caching functions */

diff --git a/skins/common/shared.css b/skins/common/shared.css
index 115ab74..d124860 100644 (file)
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -766,15 +766,8 @@ th.headerSortDown {
        unicode-bidi: embed;
 }
 
-#mw-revision-info, #revision-info-current, #mw-revision-nav {
+#mw-revision-info, #mw-revision-nav {
        direction: ltr;
-       text-align: center;
-}
-
-#mw-revision-nav {
-       border-bottom: 1px solid #aaa;
-       padding-bottom: 0.5em;
-       margin-bottom: 0.5em;
 }
 
 /* Images */

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index f27833b..f5f8ef9 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -237,11 +237,6 @@ pre {
        color: #7d7d7d;
        width: auto;
 }
-
-#contentSub:empty, #contentSub2:empty {
-       display: none;
-}
-
 span.subpages {
        display: block;
 }

diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index a3c849d..2bdf203 100644 (file)
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -997,11 +997,6 @@ img.thumbborder {
        color: #7d7d7d;
        width: auto;
 }
-
-#contentSub:empty, #contentSub2:empty {
-       display: none;
-}
-
 span.subpages {
        display: block;
 }