From 91c778a0bc0b537f9c7f57bfc9023043de92bb32 Mon Sep 17 00:00:00 2001
From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Sun, 9 Mar 2008 11:45:12 +0000
Subject: [PATCH] * (bug 13234) Do not show grey category box for pages with
 only hidden categories * Remove redundancy in monobook, chick and modern in
 use of <div id="catlinks"><div class="catlinks"></div></div> (necessary to
 make other part of commit work)

---
 includes/Skin.php       | 9 ++++++++-
 skins/Modern.php        | 2 +-
 skins/MonoBook.php      | 2 +-
 skins/chick/main.css    | 2 +-
 skins/common/preview.js | 3 +--
 skins/common/shared.css | 1 +
 skins/modern/main.css   | 2 +-
 skins/monobook/main.css | 2 +-
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index 5b03953f60..c6e0496c28 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -712,8 +712,15 @@ END;
 
 	function getCategories() {
 		$catlinks=$this->getCategoryLinks();
+		
+		$classes = 'catlinks';
+		
+		if(FALSE === strpos($catlinks,'<div id="mw-normal-catlinks">')) {
+			$classes .= ' catlinks-allhidden';
+		}
+		
 		if(!empty($catlinks)) {
-			return "<div class='catlinks'>{$catlinks}</div>";
+			return "<div class='$classes'>{$catlinks}</div>";
 		}
 	}
 
diff --git a/skins/Modern.php b/skins/Modern.php
index a8730666e2..3f4fd44af1 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -130,7 +130,7 @@ class ModernTemplate extends QuickTemplate {
 
 		<?php $this->html('bodytext') ?>
 		<div class='mw_clear'></div>
-		<?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
+		<?php if($this->data['catlinks']) { ?><?php       $this->html('catlinks') ?><?php } ?>
 	</div><!-- mw_contentholder -->
 	</div><!-- mw_content -->
 	</div><!-- mw_contentwrapper -->
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index e930a5e7ad..4061da8371 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -107,7 +107,7 @@ class MonoBookTemplate extends QuickTemplate {
 			<?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') ?>
-			<?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
+			<?php if($this->data['catlinks']) { ?><?php       $this->html('catlinks') ?><?php } ?>
 			<!-- end content -->
 			<div class="visualClear"></div>
 		</div>
diff --git a/skins/chick/main.css b/skins/chick/main.css
index 17849b9331..5fce24a73f 100644
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -198,7 +198,7 @@ span.subpages { display: block; }
     color: red;
     font-size: larger;
 }
-#catlinks {
+.catlinks {
     border:1px solid #aaaaaa;
     background-color:#f9f9f9;
     padding: 2px 5px;
diff --git a/skins/common/preview.js b/skins/common/preview.js
index ad096e2c6e..8c5c07d3dd 100644
--- a/skins/common/preview.js
+++ b/skins/common/preview.js
@@ -104,8 +104,7 @@ function lpStatusUpdate() {
 			categoryContainer.style.display = 'block';
 		} else {
 			/* Just dump them somewhere */
-	/*		previewContainer.innerHTML += '<div id="catlinks">' +
-				categoryElement.firstChild.data + '</div>';*/
+	/*		previewContainer.innerHTML += categoryElement.firstChild.data;*/
 		}
 	} else {
 		/* Nothing to show, hide old data */
diff --git a/skins/common/shared.css b/skins/common/shared.css
index e53ebc3ad5..d9e7624f98 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -82,6 +82,7 @@ body.ltr .magnify { float:right; }
  * Hidden categories
  */
 .mw-hidden-cats-hidden { display: none; }
+.catlinks-allhidden { display: none; }
 
 /* Convenience links to edit block and delete reasons */
 p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons {
diff --git a/skins/modern/main.css b/skins/modern/main.css
index e61935d4e0..0cabd8667b 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -579,7 +579,7 @@ img.thumbborder {
 	text-align: center;
 }
 
-#catlinks {
+.catlinks {
 	border: solid 1px #bbbbbb;
 	background-color: #f0f0f0;
 	padding: 0.5em 0.5em 0.5em 0.5em;
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index db6eb5805d..1f8015e4dc 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -303,7 +303,7 @@ span.subpages {
 	border: none;
 }
 
-#catlinks {
+.catlinks {
 	border: 1px solid #aaa;
 	background-color: #f9f9f9;
 	padding: 5px;
-- 
2.20.1