From: Platonides <platonides@users.mediawiki.org>
Date: Tue, 8 Jun 2010 20:32:16 +0000 (+0000)
Subject: Move icons  footer into $footerlinks. A couple of ids which weren't used anywhere... 
X-Git-Tag: 1.31.0-rc.0~36576
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=02d8f27ccece6d17566b05d1325e8acdbc4e86b7;p=lhc%2Fweb%2Fwiklou.git

Move icons  footer into $footerlinks. A couple of ids which weren't used anywhere get slightly renamed.
---

diff --git a/skins/Vector.php b/skins/Vector.php
index c7d69df2da..4c30eec7bc 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -439,7 +439,15 @@ class VectorTemplate extends QuickTemplate {
 				'about',
 				'disclaimer',
 			),
+			'icons' => array(
+				'poweredbyico',
+				'copyrightico',
+			),
+		);
+		$footerlinksClasses = array(
+			'icons' => array( 'noprint' )
 		);
+		
 		// Reduce footer links down to only those which are being used
 		$validFooterLinks = array();
 		foreach( $footerlinks as $category => $links ) {
@@ -543,7 +551,7 @@ class VectorTemplate extends QuickTemplate {
 		<div id="footer"<?php $this->html('userlangattributes') ?>>
 			<?php foreach( $validFooterLinks as $category => $links ): ?>
 				<?php if ( count( $links ) > 0 ): ?>
-				<ul id="footer-<?php echo $category ?>">
+				<ul id="footer-<?php echo $category ?>"<?php if (isset($footerlinksClasses[$category])) echo ' class="' . implode(" ", $footerlinksClasses[$category]) . '"'; ?>>
 					<?php foreach( $links as $link ): ?>
 						<?php if( isset( $this->data[$link] ) && $this->data[$link] ): ?>
 						<li id="footer-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li>
@@ -552,14 +560,6 @@ class VectorTemplate extends QuickTemplate {
 				</ul>
 				<?php endif; ?>
 			<?php endforeach; ?>
-			<ul id="footer-icons" class="noprint">
-				<?php if ( $this->data['poweredbyico'] ): ?>
-				<li id="footer-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li>
-				<?php endif; ?>
-				<?php if ( $this->data['copyrightico'] ): ?>
-				<li id="footer-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li>
-				<?php endif; ?>
-			</ul>
 			<div style="clear:both"></div>
 		</div>
 		<!-- /footer -->