From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Fri, 9 Sep 2011 15:37:20 +0000 (+0000)
Subject: Add a class to the normal and hidden categories blocks. If non-positioning styles... 
X-Git-Tag: 1.31.0-rc.0~27765
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=39ed02fc9e0ec9aaca9d87af83493982e5d7c592;p=lhc%2Fweb%2Fwiklou.git

Add a class to the normal and hidden categories blocks. If non-positioning styles are going to be applied then they should be applied on classes, not ids. It's bad enough that we include a catlinks id in catlinks and make the process to attempt to have two catlinks blocks rediculous.
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 6b1365cfad..dea428dc50 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -414,7 +414,7 @@ abstract class Skin extends ContextSource {
 			$t = $embed . implode( "{$pop}{$embed}" , $allCats['normal'] ) . $pop;
 
 			$msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) );
-			$s .= '<div id="mw-normal-catlinks">' .
+			$s .= '<div id="mw-normal-catlinks" class="mw-normal-catlinks">' .
 				Linker::link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
 				. $colon . '<ul>' . $t . '</ul>' . '</div>';
 		}
@@ -422,14 +422,14 @@ abstract class Skin extends ContextSource {
 		# Hidden categories
 		if ( isset( $allCats['hidden'] ) ) {
 			if ( $this->getUser()->getBoolOption( 'showhiddencats' ) ) {
-				$class = 'mw-hidden-cats-user-shown';
+				$class = ' mw-hidden-cats-user-shown';
 			} elseif ( $this->getTitle()->getNamespace() == NS_CATEGORY ) {
-				$class = 'mw-hidden-cats-ns-shown';
+				$class = ' mw-hidden-cats-ns-shown';
 			} else {
-				$class = 'mw-hidden-cats-hidden';
+				$class = ' mw-hidden-cats-hidden';
 			}
 
-			$s .= "<div id=\"mw-hidden-catlinks\" class=\"$class\">" .
+			$s .= "<div id=\"mw-hidden-catlinks\" class=\"mw-hidden-catlinks$class\">" .
 				wfMsgExt( 'hidden-categories', array( 'parsemag', 'escapenoentities' ), count( $allCats['hidden'] ) ) .
 				$colon . '<ul>' . $embed . implode( "{$pop}{$embed}" , $allCats['hidden'] ) . $pop . '</ul>' .
 				'</div>';