http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88764
Revision: 88764
Author: platonides
Date: 2011-05-24 22:56:42 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Don't generate the footer div if there isn't any footer link.
Removed blank line between the <li>s of $validFooterLinks
Modified Paths:
--------------
trunk/phase3/skins/MonoBook.php
Modified: trunk/phase3/skins/MonoBook.php
===================================================================
--- trunk/phase3/skins/MonoBook.php 2011-05-24 22:21:55 UTC (rev 88763)
+++ trunk/phase3/skins/MonoBook.php 2011-05-24 22:56:42 UTC (rev 88764)
@@ -141,8 +141,18 @@
?>
</div><!-- end of the left (by default at least) column -->
<div class="visualClear"></div>
+<?php
+ $validFooterIcons = $this->getFooterIcons( "icononly" );
+ $validFooterLinks = $this->getFooterLinks( "flat" ); // Additional
footer links
+
+ if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 0 ) { ?>
<div id="footer"<?php $this->html('userlangattributes') ?>>
-<?php foreach ( $this->getFooterIcons("icononly") as $blockName =>
$footerIcons ) { ?>
+<?php
+ $footerEnd = '</div>';
+ } else {
+ $footerEnd = '';
+ }
+ foreach ( $validFooterIcons as $blockName => $footerIcons ) { ?>
<div id="f-<?php echo htmlspecialchars($blockName); ?>ico">
<?php foreach ( $footerIcons as $icon ) { ?>
<?php echo $this->skin->makeFooterIcon( $icon ); ?>
@@ -152,22 +162,20 @@
</div>
<?php }
- // Generate additional footer links
- $validFooterLinks = $this->getFooterLinks("flat");
if ( count( $validFooterLinks ) > 0 ) {
?> <ul id="f-list">
<?php
foreach( $validFooterLinks as $aLink ) { ?>
<li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
-
<?php
}
?>
</ul>
<?php }
+echo $footerEnd;
?>
+
</div>
-</div>
<?php
$this->printTrail();
echo Html::closeElement( 'body' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
