From: MatmaRex <matma.rex@gmail.com>
Date: Thu, 27 Sep 2012 17:01:49 +0000 (+0200)
Subject: CologneBlue rewrite: #toplinks fixes
X-Git-Tag: 1.31.0-rc.0~22151
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=49d072f3f1acab0941ed6839a56ebe4ae8ca79bf;p=lhc%2Fweb%2Fwiklou.git

CologneBlue rewrite: #toplinks fixes

* use getPersonalTools()
* loop over stuff
* CSS cleanup

Change-Id: Ibb68cde6e837eec0fcaeea8a11088749ce2df1c2
---

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index a0b704b2d9..12bd85a13b 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -433,10 +433,10 @@ class CologneBlueTemplate extends BaseTemplate {
 		</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="toplinks">
+			<p id="syslinks"><?php echo $this->sysLinks() ?></p>
+			<p id="variantlinks"><?php echo $this->variantLinks() ?></p>
+		</div>
 		<div id="linkcollection">
 			<div id="langlinks"><?php echo str_replace( '<br />', '', $this->otherLanguages() ) ?></div>
 			<?php echo $this->getSkin()->getCategories() ?>
@@ -530,18 +530,10 @@ class CologneBlueTemplate extends BaseTemplate {
 			),
 		);
 
-		$personalUrls = $this->data['personal_urls'];
-		if ( $this->data['loggedin'] ) {
-			$s[] = $this->makeLink( 'logout', $personalUrls['logout'] );
-		} else {
-			if ( $personalUrls['createaccount'] ) { // Controlled by $wgUseCombinedLoginLink
-				$s[] = $this->makeLink( 'createaccount', $personalUrls['createaccount'] );
-			}
-			if ( $personalUrls['login'] ) {
-				$s[] = $this->makeLink( 'login', $personalUrls['login'] );
-			}
-			if ( $personalUrls['anonlogin'] ) {
-				$s[] = $this->makeLink( 'anonlogin', $personalUrls['anonlogin'] );
+		$personalUrls = $this->getPersonalTools();
+		foreach ( array ( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
+			if ( $personalUrls[$key] ) {
+				$s[] = $this->makeListItem( $key, $personalUrls[$key], array( 'tag' => 'span' ) );
 			}
 		}
 
@@ -622,10 +614,9 @@ class CologneBlueTemplate extends BaseTemplate {
 					
 					// Personal tools ("My pages")
 					$bar['qbmyoptions'] = $this->getPersonalTools();
-					$bar['qbmyoptions']['login'] = false;
-					$bar['qbmyoptions']['anonlogin'] = false;
-					$bar['qbmyoptions']['logout'] = false;
-					$bar['qbmyoptions']['createaccount'] = false;
+					foreach ( array ( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
+						$bar['qbmyoptions'][$key] = false;
+					}
 					
 					$additions_done = true;
 				}
diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css
index 5ba118fe7f..a6f9f8ce31 100644
--- a/skins/cologneblue/screen.css
+++ b/skins/cologneblue/screen.css
@@ -216,19 +216,18 @@ input.mw-searchInput {
 #toplinks a {
 	font-size: 10pt;
 }
-#toplinks #syslinks {
+#toplinks p {
 	position: absolute;
-	right: 0; 
-	bottom: 0;
+	right: 0;
+	margin: 0;
 	width: 100%;
 	text-align: right;
 }
+#toplinks #syslinks {
+	bottom: 0;
+}
 #toplinks #variantlinks {
-	position: absolute;
-	right: 0; 
 	bottom: 12pt;
-	width: 100%;
-	text-align: right;
 }
 
 #sitesub {