From 7c34362c70ebbaed28d44463b6597cf8f94abf04 Mon Sep 17 00:00:00 2001
From: MatmaRex <matma.rex@gmail.com>
Date: Thu, 27 Sep 2012 19:38:33 +0200
Subject: [PATCH] CologneBlue rewrite: fix beforeContent() and afterContent()

No functional changes here. The generated HTML is almost the same, changes
involve mostly whitespace.

Change-Id: I1455a49f0583440498bae7d328b8d182e92e7c8d
---
 skins/CologneBlue.php | 129 +++++++++++++++++++++---------------------
 1 file changed, 66 insertions(+), 63 deletions(-)

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 6cff67d499..65bdb2547c 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -431,90 +431,93 @@ class CologneBlueTemplate extends BaseTemplate {
 	
 	/**
 	 * @return string
+	 * 
+	 * @fixed
 	 */
 	function beforeContent() {
-		$mainPageObj = Title::newMainPage();
-
-		$s = "\n<div id='content'>\n";
 		ob_start();
 ?>
-<div id="topbar">
-	<p id="sitetitle">
-		<a href="<?php echo htmlspecialchars( $mainPageObj->getLocalURL() ) ?>">
-			<?php echo wfMessage( 'sitetitle' )->escaped() ?>
-		</a>
-	</p>
-	<p id="sitesub">
-		<?php echo wfMessage( 'sitesubtitle' )->escaped() ?>
-	</p>
-	
-	<p id="toplinks">
-		<span id="syslinks"><?php echo $this->sysLinks() ?></span>
-		<span id="variantlinks"><?php echo $this->variantLinks() ?></span>
-	</p>
-	<div id="linkcollection">
-		<div id="langlinks"><?php echo str_replace( '<br />', '', $this->otherLanguages() ) ?></div>
-		<?php echo $this->getSkin()->getCategories() ?>
-		<div id="titlelinks"><?php echo $this->pageTitleLinks() ?></div>
-		<?php if ( $this->data['newtalk'] ) { ?>
-		<div class="usermessage"><strong><?php echo $this->data['newtalk'] ?></strong></div>
-		<?php } ?>
+<div id="content">
+	<div id="topbar">
+		<p id="sitetitle">
+			<a href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>">
+				<?php echo wfMessage( 'sitetitle' )->escaped() ?>
+			</a>
+		</p>
+		<p id="sitesub"><?php echo wfMessage( 'sitesubtitle' )->escaped() ?></p>
+		
+		<p id="toplinks">
+			<span id="syslinks"><?php echo $this->sysLinks() ?></span>
+			<span id="variantlinks"><?php echo $this->variantLinks() ?></span>
+		</p>
+		<div id="linkcollection">
+			<div id="langlinks"><?php echo str_replace( '<br />', '', $this->otherLanguages() ) ?></div>
+			<?php echo $this->getSkin()->getCategories() ?>
+			<div id="titlelinks"><?php echo $this->pageTitleLinks() ?></div>
+			<?php if ( $this->data['newtalk'] ) { ?>
+			<div class="usermessage"><strong><?php echo $this->data['newtalk'] ?></strong></div>
+			<?php } ?>
+		</div>
 	</div>
-</div>
+	<div id="article">
+		<?php if ( $this->getSkin()->getSiteNotice() ) { ?>
+		<div id="siteNotice"><?php echo $this->getSkin()->getSiteNotice() ?></div>
+		<?php } ?>
+		<h1 id="firstHeading"><span dir="auto"><?php echo $this->data['title'] ?></span></h1>
+		<?php if ( $this->translator->translate( 'tagline' ) ) { ?>
+		<p class="tagline"><?php echo htmlspecialchars( $this->translator->translate( 'tagline' ) ) ?></p>
+		<?php } ?>
+		<?php if ( $this->getSkin()->getOutput()->getSubtitle() ) { ?>
+		<p class="subtitle"><?php echo $this->getSkin()->getOutput()->getSubtitle() ?></p>
+		<?php } ?>
+		<?php if ( $this->getSkin()->subPageSubtitle() ) { ?>
+		<p class="subpages"><?php echo $this->getSkin()->subPageSubtitle() ?></p>
+		<?php } ?>
 <?php
-		$s .= ob_get_contents();
+		$s = ob_get_contents();
 		ob_end_clean();
 		
-		$s .= "\n<div id='article'>";
-
-		$notice = $this->getSkin()->getSiteNotice();
-		if( $notice ) {
-			$s .= "\n<div id='siteNotice'>$notice</div>\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;
 	}
 
 	/**
 	 * @return string
+	 * 
+	 * @fixed
 	 */
-	function afterContent(){
-		$s = "\n</div>\n";
-
-		$s .= "\n<div id='footer'>";
-
-		$s .= $this->bottomLinks();
-		$s .= $this->getSkin()->getLanguage()->pipeList( array(
-			"\n<br />" . Linker::linkKnown(
-				Title::newMainPage()
-			),
+	function afterContent() {
+		ob_start();
+?>
+	</div>
+	<div id='footer'>
+<?php
+		// Page-related links
+		echo $this->bottomLinks();
+		echo "\n<br />";
+		
+		// Footer and second searchbox
+		echo $this->getSkin()->getLanguage()->pipeList( array(
+			$this->getSkin()->mainPageLink(),
 			$this->getSkin()->aboutLink(),
-			$this->searchForm( 'afterContent' )
+			$this->searchForm( 'footer' )
 		) );
+		echo "\n<br />";
 		
-		$s .= "\n<br />";
+		// Standard footer info
 		$footlinks = $this->getFooterLinks();
 		if ( $footlinks['info'] ) {
 			foreach ( $footlinks['info'] as $item ) {
-				$s .= $this->data[$item] . ' ';
+				echo $this->data[$item] . ' ';
 			}
 		}
+?>
+	</div>
+</div>
+<?php echo $this->quickBar() ?>
+<?php
+		$s = ob_get_contents();
+		ob_end_clean();
 
-		$s .= "\n</div>\n</div>\n";
-
-		$s .= $this->quickBar();
 		return $s;
 	}
 
@@ -703,13 +706,13 @@ class CologneBlueTemplate extends BaseTemplate {
 		$search = $this->getSkin()->getRequest()->getText( 'search' );
 		$action = $this->data['searchaction'];
 		$s = "<form id=\"searchform-" . htmlspecialchars($which) . "\" method=\"get\" class=\"inline\" action=\"$action\">";
-		if( $which == 'afterContent' ) {
+		if( $which == 'footer' ) {
 			$s .= wfMessage( 'qbfind' )->text() . ": ";
 		}
 
 		$s .= "<input type='text' class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\""
 			. htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />"
-			. ($which == 'afterContent' ? " " : "<br />")
+			. ($which == 'footer' ? " " : "<br />")
 			. "<input type='submit' class=\"searchButton\" name=\"go\" value=\"" . wfMessage( 'searcharticle' )->escaped() . "\" />";
 
 		if( $wgUseTwoButtonsSearchForm ) {
-- 
2.20.1