Take the footer icon html building common to all 3 skins using r77741 $wgFooterIcons...

Also fix the location of the noprint class meant to be on footer-icons in vector.

diff --git a/includes/Skin.php b/includes/Skin.php
index 271e4f0..11a4651 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1630,6 +1630,29 @@ class Skin extends Linker {
                return $s;
        }
 
+       /**
+        * Renders a $wgFooterIcons icon acording to the method's arguments
+        * @param $icon Array: The icon to build the html for
+        * @param $useImg Boolean: Whether to use the icon's image or output a text-only footericon
+        */
+       function makeFooterIcon( $icon, $useImg = true ) {
+               if ( is_string($icon) ) {
+                       $html = $icon;
+               } else {
+                       $url = $icon["url"];
+                       unset($icon["url"]);
+                       if ( isset($icon["src"]) && $useImg ) {
+                               $html = Html::element( 'img', $icon ); // do this the lazy way, just pass icon data as an attribute array
+                       } else {
+                               $html = htmlspecialchars($icon["alt"]);
+                       }
+                       if ( $url ) {
+                               $html = Html::rawElement( 'a', array( "href" => $url ), $html );
+                       }
+               }
+               return $html;
+       }
+
        /**
         * Gets the link to the wiki's main page.
         * @return string

diff --git a/skins/Modern.php b/skins/Modern.php
index 086f8bf..27f958e 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -194,16 +194,10 @@ class ModernTemplate extends MonoBookTemplate {
                foreach ( $footericons as $blockName => $footerIcons ) { ?>
                        <div id="mw_<?php echo htmlspecialchars($blockName); ?>">
 <?php
-                       foreach ( $footerIcons as $icon ) { 
-                               if ( is_string($icon) ) {
-                                       $html = $icon;
-                               } else {
-                                       $html = htmlspecialchars($icon["alt"]);
-                                       if ( $icon["url"] ) {
-                                               $html = Html::element( 'a', array( "href" => $icon["url"] ), $html );
-                                       }
-                               }
-                               echo "                          $html\n";
+                       foreach ( $footerIcons as $icon ) { ?>
+                               <?php echo $this->skin->makeFooterIcon( $icon, false ); ?>
+
+<?php
                        } ?>
                        </div>
 <?php

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index e3e2e9a..8b0db5b 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -189,23 +189,11 @@ class MonoBookTemplate extends QuickTemplate {
 <div id="footer"<?php $this->html('userlangattributes') ?>>
 <?php foreach ( $footericons as $blockName => $footerIcons ) { ?>
        <div id="f-<?php echo htmlspecialchars($blockName); ?>ico">
-<?php  foreach ( $footerIcons as $icon ) { 
-                       if ( is_string($icon) ) {
-                               $html = $icon;
-                       } else {
-                               $url = $icon["url"];
-                               unset($icon["url"]);
-                               if ( isset($icon["src"]) ) {
-                                       $html = Html::element( 'img', $icon ); // do this the lazy way, just pass icon data as an attribute array
-                               } else {
-                                       $html = htmlspecialchars($icon["alt"]);
-                               }
-                               if ( $url ) {
-                                       $html = Html::rawElement( 'a', array( "href" => $url ), $html );
-                               }
-                       }
-                       echo "          $html\n";
-               } ?>
+<?php foreach ( $footerIcons as $icon ) { ?>
+               <?php echo $this->skin->makeFooterIcon( $icon ); ?>
+
+<?php }
+?>
        </div>
 <?php }
 

diff --git a/skins/Vector.php b/skins/Vector.php
index 057f205..f972101 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -545,26 +545,13 @@ class VectorTemplate extends QuickTemplate {
                                <?php endif; ?>
                        <?php endforeach; ?>
 <?php                  if ( count( $footericons ) > 0 ): ?>
-                               <ul id="footer-icons">
+                               <ul id="footer-icons" class="noprint">
 <?php                  foreach ( $footericons as $blockName => $footerIcons ): ?>
-                                       <li id="footer-<?php echo htmlspecialchars($blockName); ?>ico" class="noprint">
-<?php                                  foreach ( $footerIcons as $icon ):
-                                                       if ( is_string($icon) ) {
-                                                               $html = $icon;
-                                                       } else {
-                                                               $url = $icon["url"];
-                                                               unset($icon["url"]);
-                                                               if ( isset($icon["src"]) ) {
-                                                                       $html = Html::element( 'img', $icon ); // do this the lazy way, just pass icon data as an attribute array
-                                                               } else {
-                                                                       $html = htmlspecialchars($icon["alt"]);
-                                                               }
-                                                               if ( $url ) {
-                                                                       $html = Html::rawElement( 'a', array( "href" => $url ), $html );
-                                                               }
-                                                       }
-                                                       echo "                                          $html\n";
-                                               endforeach; ?>
+                                       <li id="footer-<?php echo htmlspecialchars($blockName); ?>ico">
+<?php                          foreach ( $footerIcons as $icon ): ?>
+                                               <?php echo $this->skin->makeFooterIcon( $icon ); ?>
+
+<?php                          endforeach; ?>
                                        </li>
 <?php                  endforeach; ?>
                                </ul>