From a1b46bc0883e96bf8ac461b712f276d15bddc6e5 Mon Sep 17 00:00:00 2001
From: MatmaRex <matma.rex@gmail.com>
Date: Wed, 26 Sep 2012 21:53:58 +0200
Subject: [PATCH] CologneBlue rewrite: kill pageTitle(), pageSubtitle(),
 printableLink()

Change-Id: I8280e882f312854cc8a8ee86106bbbd31cb897d3
---
 skins/CologneBlue.php        | 64 ++++++++----------------------------
 skins/cologneblue/screen.css |  4 +--
 2 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 723278d678..b172fd2d50 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -175,55 +175,6 @@ class CologneBlueTemplate extends BaseTemplate {
 		return $wgLang->pipeList( $s );
 	}
 
-	function printableLink() {
-		global $wgOut, $wgRequest, $wgLang;
-
-		$s = array();
-
-		if ( !$wgOut->isPrintable() ) {
-			$printurl = htmlspecialchars( $this->getSkin()->getTitle()->getLocalUrl(
-				$wgRequest->appendQueryValue( 'printable', 'yes', true ) ) );
-			$s[] = "<a href=\"$printurl\" rel=\"alternate\">"
-				. wfMessage( 'printableversion' )->text() . '</a>';
-		}
-
-		if ( $wgOut->isSyndicated() ) {
-			foreach ( $wgOut->getSyndicationLinks() as $format => $link ) {
-				$feedurl = htmlspecialchars( $link );
-				$s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
-						. " class=\"feedlink\">" . wfMessage( "feed-$format" )->escaped() . "</a>";
-			}
-		}
-		return $wgLang->pipeList( $s );
-	}
-
-	/**
-	 * Gets the h1 element with the page title.
-	 * @return string
-	 */
-	function pageTitle() {
-		global $wgOut;
-		$s = '<h1 class="pagetitle"><span dir="auto">' . $wgOut->getPageTitle() . '</span></h1>';
-		return $s;
-		}
-
-	function pageSubtitle() {
-		global $wgOut;
-
-		$sub = $wgOut->getSubtitle();
-
-		if ( $sub == '' ) {
-			global $wgExtraSubtitle;
-			$sub = wfMessage( 'tagline' )->parse() . $wgExtraSubtitle;
-		}
-
-		$subpages = $this->getSkin()->subPageSubtitle();
-		$sub .= !empty( $subpages ) ? "</p><p class='subpages'>$subpages" : '';
-		$s = "<p class='subtitle'>{$sub}</p>\n";
-
-		return $s;
-	}
-
 	function bottomLinks() {
 		global $wgOut, $wgUser;
 		$sep = wfMessage( 'pipe-separator' )->escaped() . "\n";
@@ -547,8 +498,19 @@ class CologneBlueTemplate extends BaseTemplate {
 		if( $notice ) {
 			$s .= "\n<div id='siteNotice'>$notice</div>\n";
 		}
-		$s .= $this->pageTitle();
-		$s .= $this->pageSubtitle() . "\n";
+
+		$s .= '<h1 id="firstHeading"><span dir="auto">' . $this->data['title'] . '</span></h1>';
+
+		if ( $this->translator->translate( 'tagline' ) ) {
+			$s .= "<p class='tagline'>" . htmlspecialchars( $this->translator->translate( 'tagline' ) ) . "</p>";
+		}
+		if ( $this->getSkin()->getOutput()->getSubtitle() ) {
+			$s .= "<p class='subtitle'>" . $this->getSkin()->getOutput()->getSubtitle() . "</p>";
+		}
+		if ( $this->getSkin()->subPageSubtitle() ) {
+			$s .= "<p class='subpages'>" . $this->getSkin()->subPageSubtitle() . "</p>";
+		}
+		
 		return $s;
 	}
 
diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css
index 4716c38b87..511c81a34a 100644
--- a/skins/cologneblue/screen.css
+++ b/skins/cologneblue/screen.css
@@ -120,12 +120,12 @@ h1 .editsection {
 	font-size: 55.6%;
 }
 
-h1.pagetitle {
+h1#firstHeading {
 	padding-bottom: 0;
 	margin-bottom: 0;
 }
 
-#article p.subtitle {
+#article p.subtitle, #article p.subpages, #article p.tagline {
 	color: #666666;
 	font-size: 11pt;
 	font-weight: bold;
-- 
2.20.1