From: MatmaRex <matma.rex@gmail.com>
Date: Wed, 26 Sep 2012 19:19:16 +0000 (+0200)
Subject: CologneBlue rewrite: kill pageStats() and rewrite pageTitleLinks()
X-Git-Tag: 1.31.0-rc.0~22158
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=97ab61be36a033e2dabbfade973c64ea54bd5da2;p=lhc%2Fweb%2Fwiklou.git

CologneBlue rewrite: kill pageStats() and rewrite pageTitleLinks()

Use getFooterLinks instead. This removes "Printable version" from the
header links and add a "About" link instead.

Change-Id: I69ee93a9ce900651711274972f4dd79b766df78c
---

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 7b3202212a..723278d678 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -161,29 +161,17 @@ class CologneBlueTemplate extends BaseTemplate {
 		return $s;
 	}
 
+	// @fixed
 	function pageTitleLinks() {
-		global $wgOut, $wgUser, $wgRequest, $wgLang;
-
-		$oldid = $wgRequest->getVal( 'oldid' );
-		$diff = $wgRequest->getVal( 'diff' );
-		$action = $wgRequest->getText( 'action' );
-
-		$skin = $this->getSkin();
-		$title = $skin->getTitle();
-
-		$s[] = $this->printableLink();
-		$disclaimer = $skin->disclaimerLink(); # may be empty
-
-		if ( $disclaimer ) {
-			$s[] = $disclaimer;
-		}
-
-		$privacy = $skin->privacyLink(); # may be empty too
-
-		if ( $privacy ) {
-			$s[] = $privacy;
+		global $wgLang;
+		
+		$s = array();
+		$footlinks = $this->getFooterLinks();
+		
+		foreach ( $footlinks['places'] as $item ) {
+			$s[] = $this->data[$item];
 		}
-
+		
 		return $wgLang->pipeList( $s );
 	}
 
@@ -517,23 +505,6 @@ class CologneBlueTemplate extends BaseTemplate {
 
 		return $s;
 	}
-
-	function pageStats() {
-		$ret = array();
-		$items = array( 'viewcount', 'credits', 'lastmod', 'numberofwatchingusers', 'copyright' );
-
-		foreach( $items as $item ) {
-			if ( $this->data[$item] !== false ) {
-				$ret[] = $this->data[$item];
-			}
-		}
-
-		return implode( ' ', $ret );
-	}
-
-
-
-
 	
 	/**
 	 * @return string
@@ -597,8 +568,14 @@ class CologneBlueTemplate extends BaseTemplate {
 			$this->getSkin()->aboutLink(),
 			$this->searchForm( 'afterContent' )
 		) );
-
-		$s .= "\n<br />" . $this->pageStats();
+		
+		$s .= "\n<br />";
+		$footlinks = $this->getFooterLinks();
+		if ( $footlinks['info'] ) {
+			foreach ( $footlinks['info'] as $item ) {
+				$s .= $this->data[$item] . ' ';
+			}
+		}
 
 		$s .= "\n</div>\n</div>\n";