diff options
Diffstat (limited to 'skins/MonoBook.php')
| -rw-r--r-- | skins/MonoBook.php | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 0b9619a2..50d7f00f 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -6,8 +6,7 @@ * dependency on PHPTAL. * * @todo document - * @package MediaWiki - * @subpackage Skins + * @addtogroup Skins */ if( !defined( 'MEDIAWIKI' ) ) @@ -19,8 +18,7 @@ require_once('includes/SkinTemplate.php'); /** * Inherit main code from SkinTemplate, set the CSS and template filter. * @todo document - * @package MediaWiki - * @subpackage Skins + * @addtogroup Skins */ class SkinMonoBook extends SkinTemplate { /** Using monobook. */ @@ -34,8 +32,7 @@ class SkinMonoBook extends SkinTemplate { /** * @todo document - * @package MediaWiki - * @subpackage Skins + * @addtogroup Skins */ class MonoBookTemplate extends QuickTemplate { /** @@ -47,6 +44,9 @@ class MonoBookTemplate extends QuickTemplate { * @access private */ function execute() { + global $wgUser; + $skin = $wgUser->getSkin(); + // Suppress warnings to prevent notices about missing indexes in $this->data wfSuppressWarnings(); @@ -89,7 +89,7 @@ class MonoBookTemplate extends QuickTemplate { <?php } if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?> <!-- Head Scripts --> - <?php $this->html('headscripts') ?> +<?php $this->html('headscripts') ?> </head> <body <?php if($this->data['body_ondblclick']) { ?>ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?> <?php if($this->data['body_onload' ]) { ?>onload="<?php $this->text('body_onload') ?>"<?php } ?> @@ -120,9 +120,9 @@ class MonoBookTemplate extends QuickTemplate { <div class="pBody"> <ul> <?php foreach($this->data['content_actions'] as $key => $tab) { ?> - <li id="ca-<?php echo Sanitizer::escapeId($key) ?>"<?php + <li id="ca-<?php echo Sanitizer::escapeId($key) ?>"<?php if($tab['class']) { ?> class="<?php echo htmlspecialchars($tab['class']) ?>"<?php } - ?>><a href="<?php echo htmlspecialchars($tab['href']) ?>"><?php + ?>><a href="<?php echo htmlspecialchars($tab['href']) ?>"<?php echo $skin->tooltipAndAccesskey('ca-'.$key) ?>><?php echo htmlspecialchars($tab['text']) ?></a></li> <?php } ?> </ul> @@ -135,7 +135,7 @@ class MonoBookTemplate extends QuickTemplate { <?php foreach($this->data['personal_urls'] as $key => $item) { ?> <li id="pt-<?php echo Sanitizer::escapeId($key) ?>"<?php if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php - echo htmlspecialchars($item['href']) ?>"<?php + echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php if(!empty($item['class'])) { ?> class="<?php echo htmlspecialchars($item['class']) ?>"<?php } ?>><?php echo htmlspecialchars($item['text']) ?></a></li> @@ -145,19 +145,19 @@ class MonoBookTemplate extends QuickTemplate { </div> <div class="portlet" id="p-logo"> <a style="background-image: url(<?php $this->text('logopath') ?>);" <?php - ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>" <?php - ?>title="<?php $this->msg('mainpage') ?>"></a> + ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php + echo $skin->tooltipAndAccesskey('n-mainpage') ?>></a> </div> <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script> <?php foreach ($this->data['sidebar'] as $bar => $cont) { ?> - <div class='portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'> + <div class='portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $skin->tooltip('p-'.$bar) ?>> <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5> <div class='pBody'> <ul> <?php foreach($cont as $key => $val) { ?> <li id="<?php echo Sanitizer::escapeId($val['id']) ?>"<?php if ( $val['active'] ) { ?> class="active" <?php } - ?>><a href="<?php echo htmlspecialchars($val['href']) ?>"><?php echo htmlspecialchars($val['text']) ?></a></li> + ?>><a href="<?php echo htmlspecialchars($val['href']) ?>"<?php echo $skin->tooltipAndAccesskey($val['id']) ?>><?php echo htmlspecialchars($val['text']) ?></a></li> <?php } ?> </ul> </div> @@ -167,9 +167,7 @@ class MonoBookTemplate extends QuickTemplate { <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5> <div id="searchBody" class="pBody"> <form action="<?php $this->text('searchaction') ?>" id="searchform"><div> - <input id="searchInput" name="search" type="text" <?php - if($this->haveMsg('accesskey-search')) { - ?>accesskey="<?php $this->msg('accesskey-search') ?>"<?php } + <input id="searchInput" name="search" type="text"<?php echo $skin->tooltipAndAccesskey('search'); if( isset( $this->data['search'] ) ) { ?> value="<?php $this->text('search') ?>"<?php } ?> /> <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>" /> @@ -185,23 +183,23 @@ class MonoBookTemplate extends QuickTemplate { if($this->data['notspecialpage']) { ?> <li id="t-whatlinkshere"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['whatlinkshere']['href']) - ?>"><?php $this->msg('whatlinkshere') ?></a></li> + ?>"<?php echo $skin->tooltipAndAccesskey('t-whatlinkshere') ?>><?php $this->msg('whatlinkshere') ?></a></li> <?php if( $this->data['nav_urls']['recentchangeslinked'] ) { ?> <li id="t-recentchangeslinked"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['recentchangeslinked']['href']) - ?>"><?php $this->msg('recentchangeslinked') ?></a></li> + ?>"<?php echo $skin->tooltipAndAccesskey('t-recentchangeslinked') ?>><?php $this->msg('recentchangeslinked') ?></a></li> <?php } } if(isset($this->data['nav_urls']['trackbacklink'])) { ?> <li id="t-trackbacklink"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['trackbacklink']['href']) - ?>"><?php $this->msg('trackbacklink') ?></a></li> + ?>"<?php echo $skin->tooltipAndAccesskey('t-trackbacklink') ?>><?php $this->msg('trackbacklink') ?></a></li> <?php } if($this->data['feeds']) { ?> <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) { ?><span id="feed-<?php echo Sanitizer::escapeId($key) ?>"><a href="<?php - echo htmlspecialchars($feed['href']) ?>"><?php echo htmlspecialchars($feed['text'])?></a> </span> + echo htmlspecialchars($feed['href']) ?>"<?php echo $skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a> </span> <?php } ?></li><?php } @@ -209,20 +207,20 @@ class MonoBookTemplate extends QuickTemplate { if($this->data['nav_urls'][$special]) { ?><li id="t-<?php echo $special ?>"><a href="<?php echo htmlspecialchars($this->data['nav_urls'][$special]['href']) - ?>"><?php $this->msg($special) ?></a></li> + ?>"<?php echo $skin->tooltipAndAccesskey('t-'.$special) ?>><?php $this->msg($special) ?></a></li> <?php } } if(!empty($this->data['nav_urls']['print']['href'])) { ?> <li id="t-print"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['print']['href']) - ?>"><?php $this->msg('printableversion') ?></a></li><?php + ?>"<?php echo $skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php } if(!empty($this->data['nav_urls']['permalink']['href'])) { ?> <li id="t-permalink"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['permalink']['href']) - ?>"><?php $this->msg('permalink') ?></a></li><?php + ?>"<?php echo $skin->tooltipAndAccesskey('t-permalink') ?>><?php $this->msg('permalink') ?></a></li><?php } elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?> - <li id="t-ispermalink"><?php $this->msg('permalink') ?></li><?php + <li id="t-ispermalink"<?php echo $skin->tooltip('t-ispermalink') ?>><?php $this->msg('permalink') ?></li><?php } wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) ); |