(bug 15928) Make special pages dropdown inline

There was a weird extra "|" at the end of lines in Nostalgia (probably other non-MonoBook skins too).  Upon investigation, I found that the special pages dropdown (which immediately followed that separator but on the next line) had a class="inline", which actually did nothing but whose intent was fairly obvious.  I removed the presentational class and just styled it using the id, so now the separator actually . . . separates.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a8e2e71..8fcba5c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -259,6 +259,7 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 15795) Special:Userrights is now listed on Special:SpecialPages when the
   user can only change his rights
 * (bug 15846) Categories "leak" from older revisions in certain circumstances
+* (bug 15928) Special pages dropdown should be inline in non-MonoBook skins
 
 === API changes in 1.14 ===
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a31329c..502120e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1385,7 +1385,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '180';
+$wgStyleVersion = '181';
 
 
 # Server-side caching:

diff --git a/includes/Skin.php b/includes/Skin.php
index f6ba839..765a35e 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1390,7 +1390,7 @@ END;
                $sp = wfMsg( 'specialpages' );
                $spp = $wgContLang->specialPage( 'Specialpages' );
 
-               $s = '<form id="specialpages" method="get" class="inline" ' .
+               $s = '<form id="specialpages" method="get" ' .
                  'action="' . htmlspecialchars( "{$wgServer}{$wgRedirectScript}" ) . "\">\n";
                $s .= "<select name=\"wpDropdown\">\n";
                $s .= "<option value=\"{$spp}\">{$sp}</option>\n";

diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css
index 4cc601d..d8534d5 100644 (file)
--- a/skins/common/oldshared.css
+++ b/skins/common/oldshared.css
@@ -416,3 +416,7 @@ table.multipageimage td {
        vertical-align: middle;
        font-size: 90%;
 }
+
+form#specialpages {
+       display: inline;
+}