From 28d0bb9ae805f0b0b6320c406478e3d2fec99c80 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Thu, 10 Feb 2011 19:46:36 +0000
Subject: [PATCH] Kill calls to tooltip() and tooltipAndAccesskeyAttribs() from
 MonoBook and Modern

---
 skins/Modern.php   | 22 +----------------
 skins/MonoBook.php | 59 +++++++++++++++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/skins/Modern.php b/skins/Modern.php
index 6c315b9eb5..062d571f0d 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -58,27 +58,7 @@ class ModernTemplate extends MonoBookTemplate {
 	<div id="mw_main">
 	<div id="mw_contentwrapper">
 	<!-- navigation portlet -->
-	<div id="p-cactions" class="portlet">
-		<h5><?php $this->msg('views') ?></h5>
-		<div class="pBody">
-			<ul>
-	<?php		foreach($this->data['content_actions'] as $key => $tab) {
-					echo '
-				 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
-					if( $tab['class'] ) {
-						echo ' class="'.htmlspecialchars($tab['class']).'"';
-					}
-					echo'><a href="'.htmlspecialchars($tab['href']).'"';
-				 	if( isset($tab["tooltiponly"]) && $tab["tooltiponly"] ) {
-				 		echo $skin->tooltip( "ca-$key" );
-				 	} else {
-				 		echo $skin->tooltipAndAccesskey( "ca-$key" );
-				 	}
-				 	echo '>'.htmlspecialchars($tab['text']).'</a></li>';
-				} ?>
-			</ul>
-		</div>
-	</div>
+<?php $this->cactions( $skin ); ?>
 
 	<!-- content -->
 	<div id="mw_content">
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index ff8ee12c70..2711a1afc6 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -96,28 +96,7 @@ class MonoBookTemplate extends BaseTemplate {
 	</div>
 </div></div>
 <div id="column-one"<?php $this->html('userlangattributes')  ?>>
-	<div id="p-cactions" class="portlet">
-		<h5><?php $this->msg('views') ?></h5>
-		<div class="pBody">
-			<ul><?php
-				foreach($this->data['content_actions'] as $key => $tab) {
-					echo '
-				 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
-					if( $tab['class'] ) {
-						echo ' class="'.htmlspecialchars($tab['class']).'"';
-					}
-					echo '><a href="'.htmlspecialchars($tab['href']).'"';
-				 	if( $tab["tooltiponly"] ) {
-				 		echo $skin->tooltip( "ca-$key" );
-				 	} else {
-				 		echo $skin->tooltipAndAccesskey( "ca-$key" );
-				 	}
-				 	echo '>'.htmlspecialchars($tab['text']).'</a></li>';
-				} ?>
-
-			</ul>
-		</div>
-	</div>
+<?php $this->cactions( $skin ); ?>
 	<div class="portlet" id="p-personal">
 		<h5><?php $this->msg('personaltools') ?></h5>
 		<div class="pBody">
@@ -213,6 +192,42 @@ class MonoBookTemplate extends BaseTemplate {
 <?php
 	}
 
+	/**
+	 * Prints the cactions bar.
+	 * Shared between MonoBook and Modern
+	 */
+	function cactions( Skin $skin ) {
+?>
+	<div id="p-cactions" class="portlet">
+		<h5><?php $this->msg('views') ?></h5>
+		<div class="pBody">
+			<ul><?php
+				foreach($this->data['content_actions'] as $key => $tab) {
+					echo '
+				 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
+					if( $tab['class'] ) {
+						echo ' class="'.htmlspecialchars($tab['class']).'"';
+					}
+					echo '>';
+					$linkAttribs = array( 'href' => $tab['href'] );
+					
+				 	if( isset( $tab["tooltiponly"] ) && $tab["tooltiponly"] ) {
+						$title = $skin->titleAttrib( "ca-$key" );
+						if ( $title !== false ) {
+							$linkAttribs['title'] = $title;
+						}
+				 	} else {
+						$linkAttribs += $skin->tooltipAndAccesskeyAttribs( "ca-$key" );
+				 	}
+				 	echo Html::element( 'a', $linkAttribs, $tab['text'] );
+				 	echo '</li>';
+				} ?>
+
+			</ul>
+		</div>
+	</div>
+<?php
+	}
 	/*************************************************************************************************/
 	function toolbox() {
 ?>
-- 
2.20.1