From: MatmaRex <matma.rex@gmail.com>
Date: Sat, 6 Apr 2013 14:24:21 +0000 (+0200)
Subject: add basic print styles to CologneBlue
X-Git-Tag: 1.31.0-rc.0~19680^2
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=ff207f24805e7d90a303be299380a924666bf3bf;p=lhc%2Fweb%2Fwiklou.git

add basic print styles to CologneBlue

* Call parent method in setupSkinUserCss() to add standard print
  styles. It also adds mediawiki.legacy.shared, so we can remove
  explicit include of that one.
* Split #footer into #footer-navigation and #footer-info. These parts
  of footer have very different functions and the navigation should be
  hidden in print mode.
* Added skins/cologneblue/print.css hiding some non-standard
  navigation elements.

Bug: 42844
Change-Id: Iae67a06ff3a6efdc9a5084226c1c80634b806cfb
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 0db3e200bf..61b8820a97 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -61,7 +61,10 @@ return array(
 	 * See Vector for an example.
 	 */
 	'skins.cologneblue' => array(
-		'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ),
+		'styles' => array(
+			'cologneblue/screen.css' => array( 'media' => 'screen' ),
+			'cologneblue/print.css' => array( 'media' => 'print' ),
+		),
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 21b07f7d32..8b2bbb8fee 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -39,7 +39,7 @@ class SkinCologneBlue extends SkinTemplate {
 	 * @param $out OutputPage
 	 */
 	function setupSkinUserCss( OutputPage $out ) {
-		$out->addModuleStyles( 'mediawiki.legacy.shared' );
+		parent::setupSkinUserCss( $out );
 		$out->addModuleStyles( 'mediawiki.legacy.oldshared' );
 		$out->addModuleStyles( 'skins.cologneblue' );
 	}
@@ -316,7 +316,8 @@ class CologneBlueTemplate extends BaseTemplate {
 		ob_start();
 ?>
 	</div>
-	<div id="footer" role="contentinfo">
+	<div id="footer">
+		<div id="footer-navigation" role="navigation">
 <?php
 		// Page-related links
 		echo $this->bottomLinks();
@@ -328,8 +329,10 @@ class CologneBlueTemplate extends BaseTemplate {
 			$this->getSkin()->aboutLink(),
 			$this->searchForm( 'footer' )
 		) );
-		echo "\n<br />";
-
+?>
+		</div>
+		<div id="footer-info" role="contentinfo">
+<?php
 		// Standard footer info
 		$footlinks = $this->getFooterLinks();
 		if ( $footlinks['info'] ) {
@@ -338,6 +341,7 @@ class CologneBlueTemplate extends BaseTemplate {
 			}
 		}
 ?>
+		</div>
 	</div>
 </div>
 <div id="mw-navigation">
diff --git a/skins/cologneblue/print.css b/skins/cologneblue/print.css
new file mode 100644
index 0000000000..d4b055185a
--- /dev/null
+++ b/skins/cologneblue/print.css
@@ -0,0 +1,6 @@
+#sitetitle,
+#sitesub,
+#titlelinks,
+#footer-navigation {
+	display: none;
+}