* @param $out OutputPage object to initialize
*/
public function initPage( OutputPage $out ) {
- global $wgLocalStylePath, $wgRequest;
+ global $wgLocalStylePath;
parent::initPage( $out );
-
+
// Append CSS which includes IE only behavior fixes for hover support -
// this is better than including this in a CSS fille since it doesn't
// wait for the CSS file to load before fetching the HTC file.
- $min = $wgRequest->getFuzzyBool( 'debug' ) ? '' : '.min';
+ $min = $this->getRequest()->getFuzzyBool( 'debug' ) ? '' : '.min';
$out->addHeadItem( 'csshover',
'<!--[if lt IE 7]><style type="text/css">body{behavior:url("' .
htmlspecialchars( $wgLocalStylePath ) .
"/{$this->stylename}/csshover{$min}.htc\")}</style><![endif]-->"
);
-
+
$out->addModuleScripts( 'skins.vector' );
}
*/
class VectorTemplate extends BaseTemplate {
- /* Members */
-
- /**
- * @var Skin Cached skin object
- */
- var $skin;
-
/* Functions */
/**
* Outputs the entire contents of the (X)HTML page
*/
public function execute() {
- global $wgLang, $wgVectorUseIconWatch;
-
- $this->skin = $this->data['skin'];
+ global $wgVectorUseIconWatch;
// Build additional attributes for navigation urls
- //$nav = $this->skin->buildNavigationUrls();
$nav = $this->data['content_navigation'];
-
+
if ( $wgVectorUseIconWatch ) {
- $mode = $this->skin->getTitle()->userIsWatching() ? 'unwatch' : 'watch';
- if ( isset($nav['actions'][$mode]) ) {
+ $mode = $this->getSkin()->getTitle()->userIsWatching() ? 'unwatch' : 'watch';
+ if ( isset( $nav['actions'][$mode] ) ) {
$nav['views'][$mode] = $nav['actions'][$mode];
- $nav['views'][$mode]['class'] = rtrim('icon ' . $nav['views'][$mode]['class'], ' ');
+ $nav['views'][$mode]['class'] = rtrim( 'icon ' . $nav['views'][$mode]['class'], ' ' );
$nav['views'][$mode]['primary'] = true;
- unset($nav['actions'][$mode]);
+ unset( $nav['actions'][$mode] );
}
}
$xmlID = '';
foreach ( $nav as $section => $links ) {
foreach ( $links as $key => $link ) {
- if ( $section == "views" && !(isset($link["primary"]) && $link["primary"]) ) {
- $link['class'] = rtrim('collapsible ' . $link['class'], ' ');
+ if ( $section == 'views' && !( isset( $link['primary'] ) && $link['primary'] ) ) {
+ $link['class'] = rtrim( 'collapsible ' . $link['class'], ' ' );
}
-
- $xmlID = isset($link["id"]) ? $link["id"] : 'ca-' . $xmlID;
+
+ $xmlID = isset( $link['id'] ) ? $link['id'] : 'ca-' . $xmlID;
$nav[$section][$key]['attributes'] =
' id="' . Sanitizer::escapeId( $xmlID ) . '"';
if ( $link['class'] ) {
' class="' . htmlspecialchars( $link['class'] ) . '"';
unset( $nav[$section][$key]['class'] );
}
- if ( isset($link['tooltiponly']) && $link['tooltiponly'] ) {
+ if ( isset( $link['tooltiponly'] ) && $link['tooltiponly'] ) {
$nav[$section][$key]['key'] =
Linker::tooltip( $xmlID );
} else {
$nav[$section][$key]['key'] =
- Linker::tooltipAndAccesskey( $xmlID );
+ Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
}
}
}
$this->data['variant_urls'] = $nav['variants'];
// Reverse horizontally rendered navigation elements
- if ( $wgLang->isRTL() ) {
+ if ( $this->data['rtl'] ) {
$this->data['view_urls'] =
array_reverse( $this->data['view_urls'] );
$this->data['namespace_urls'] =
<div id="mw-page-base" class="noprint"></div>
<div id="mw-head-base" class="noprint"></div>
<!-- content -->
- <div id="content"<?php $this->html('specialpageattributes') ?>>
+ <div id="content" class="mw-body">
<a id="top"></a>
- <div id="mw-js-message" style="display:none;"<?php $this->html('userlangattributes') ?>></div>
+ <div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
<?php if ( $this->data['sitenotice'] ): ?>
<!-- sitenotice -->
<div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div>
<!-- /sitenotice -->
<?php endif; ?>
<!-- firstHeading -->
- <h1 id="firstHeading" class="firstHeading"><?php $this->html( 'title' ) ?></h1>
+ <h1 id="firstHeading" class="firstHeading">
+ <span dir="auto"><?php $this->html( 'title' ) ?></span>
+ </h1>
<!-- /firstHeading -->
<!-- bodyContent -->
<div id="bodyContent">
<!-- /tagline -->
<?php endif; ?>
<!-- subtitle -->
- <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html( 'subtitle' ) ?></div>
+ <div id="contentSub"<?php $this->html( 'userlangattributes' ) ?>><?php $this->html( 'subtitle' ) ?></div>
<!-- /subtitle -->
<?php if ( $this->data['undelete'] ): ?>
<!-- undelete -->
<div id="contentSub2"><?php $this->html( 'undelete' ) ?></div>
<!-- /undelete -->
<?php endif; ?>
- <?php if($this->data['newtalk'] ): ?>
+ <?php if( $this->data['newtalk'] ): ?>
<!-- newtalk -->
<div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
<!-- /newtalk -->
<?php endif; ?>
<?php if ( $this->data['showjumplinks'] ): ?>
<!-- jumpto -->
- <div id="jump-to-nav">
+ <div id="jump-to-nav" class="mw-jump">
<?php $this->msg( 'jumpto' ) ?> <a href="#mw-head"><?php $this->msg( 'jumptonavigation' ) ?></a>,
<a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
</div>
<!-- /jumpto -->
<?php endif; ?>
- <!-- bodytext -->
- <?php $this->html( 'bodytext' ) ?>
- <!-- /bodytext -->
+ <!-- bodycontent -->
+ <?php $this->html( 'bodycontent' ) ?>
+ <!-- /bodycontent -->
<?php if ( $this->data['printfooter'] ): ?>
<!-- printfooter -->
<div class="printfooter">
</div>
<!-- /printfooter -->
<?php endif; ?>
- <!-- debughtml -->
- <?php $this->html('debughtml'); ?>
- <!-- /debughtml -->
<?php if ( $this->data['catlinks'] ): ?>
<!-- catlinks -->
<?php $this->html( 'catlinks' ); ?>
<!-- /dataAfterContent -->
<?php endif; ?>
<div class="visualClear"></div>
+ <!-- debughtml -->
+ <?php $this->html( 'debughtml' ); ?>
+ <!-- /debughtml -->
</div>
<!-- /bodyContent -->
</div>
<!-- panel -->
<div id="mw-panel" class="noprint">
<!-- logo -->
- <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo Linker::tooltipAndAccesskey( 'p-logo' ) ?>></a></div>
+ <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) ) ?>></a></div>
<!-- /logo -->
<?php $this->renderPortals( $this->data['sidebar'] ); ?>
</div>
<!-- /panel -->
<!-- footer -->
- <div id="footer"<?php $this->html('userlangattributes') ?>>
+ <div id="footer"<?php $this->html( 'userlangattributes' ) ?>>
<?php foreach( $this->getFooterLinks() as $category => $links ): ?>
<ul id="footer-<?php echo $category ?>">
<?php foreach( $links as $link ): ?>
if ( count( $footericons ) > 0 ): ?>
<ul id="footer-icons" class="noprint">
<?php foreach ( $footericons as $blockName => $footerIcons ): ?>
- <li id="footer-<?php echo htmlspecialchars($blockName); ?>ico">
+ <li id="footer-<?php echo htmlspecialchars( $blockName ); ?>ico">
<?php foreach ( $footerIcons as $icon ): ?>
- <?php echo $this->skin->makeFooterIcon( $icon ); ?>
+ <?php echo $this->getSkin()->makeFooterIcon( $icon ); ?>
<?php endforeach; ?>
</li>
<div style="clear:both"></div>
</div>
<!-- /footer -->
- <!-- fixalpha -->
- <script type="<?php $this->text('jsmimetype') ?>"> if ( window.isMSIE55 ) fixalpha(); </script>
- <!-- /fixalpha -->
<?php $this->printTrail(); ?>
</body>
/**
* Render a series of portals
+ *
+ * @param $portals array
*/
- private function renderPortals( $portals ) {
+ protected function renderPortals( $portals ) {
// Force the rendering of the following portals
- if ( !isset( $portals['SEARCH'] ) ) $portals['SEARCH'] = true;
- if ( !isset( $portals['TOOLBOX'] ) ) $portals['TOOLBOX'] = true;
- if ( !isset( $portals['LANGUAGES'] ) ) $portals['LANGUAGES'] = true;
+ if ( !isset( $portals['SEARCH'] ) ) {
+ $portals['SEARCH'] = true;
+ }
+ if ( !isset( $portals['TOOLBOX'] ) ) {
+ $portals['TOOLBOX'] = true;
+ }
+ if ( !isset( $portals['LANGUAGES'] ) ) {
+ $portals['LANGUAGES'] = true;
+ }
// Render portals
foreach ( $portals as $name => $content ) {
+ if ( $content === false )
+ continue;
+
echo "\n<!-- {$name} -->\n";
switch( $name ) {
case 'SEARCH':
break;
case 'TOOLBOX':
- $this->renderPortal( "tb", $this->getToolbox(), "toolbox", "SkinTemplateToolboxEnd" );
+ $this->renderPortal( 'tb', $this->getToolbox(), 'toolbox', 'SkinTemplateToolboxEnd' );
break;
case 'LANGUAGES':
if ( $this->data['language_urls'] ) {
- $this->renderPortal("lang", $this->data['language_urls'], "otherlanguages");
+ $this->renderPortal( 'lang', $this->data['language_urls'], 'otherlanguages' );
}
break;
default:
- $this->renderPortal($name, $content);
+ $this->renderPortal( $name, $content );
break;
}
echo "\n<!-- /{$name} -->\n";
}
}
- private function renderPortal($name, $content, $msg=null, $hook=null) {
- if ( !isset($msg) ) {
+ /**
+ * @param $name string
+ * @param $content array
+ * @param $msg null|string
+ * @param $hook null|string|array
+ */
+ protected function renderPortal( $name, $content, $msg = null, $hook = null ) {
+ if ( $msg === null ) {
$msg = $name;
}
?>
<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::tooltip( 'p-' . $name ) ?>>
- <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $msg ); if ( wfEmptyMsg( $msg ) ) echo htmlspecialchars( $msg ); else echo htmlspecialchars( $out ); ?></h5>
+ <h5<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj = wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg ); ?></h5>
<div class="body">
<?php
if ( is_array( $content ) ): ?>
<ul>
<?php
foreach( $content as $key => $val ): ?>
- <?php echo $this->makeListItem($key, $val); ?>
+ <?php echo $this->makeListItem( $key, $val ); ?>
<?php
endforeach;
- if ( isset($hook) ) {
- wfRunHooks( $hook, array( &$this ) );
+ if ( $hook !== null ) {
+ wfRunHooks( $hook, array( &$this, true ) );
}
?>
</ul>
/**
* Render one or more navigations elements by name, automatically reveresed
* when UI is in RTL mode
+ *
+ * @param $elements array
*/
- private function renderNavigation( $elements ) {
- global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser;
+ protected function renderNavigation( $elements ) {
+ global $wgVectorUseSimpleSearch;
// If only one element was given, wrap it in an array, allowing more
// flexible arguments
if ( !is_array( $elements ) ) {
$elements = array( $elements );
// If there's a series of elements, reverse them when in RTL mode
- } else if ( wfUILang()->isRTL() ) {
+ } elseif ( $this->data['rtl'] ) {
$elements = array_reverse( $elements );
}
// Render elements
case 'NAMESPACES':
?>
<div id="p-namespaces" class="vectorTabs<?php if ( count( $this->data['namespace_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
- <h5><?php $this->msg('namespaces') ?></h5>
- <ul<?php $this->html('userlangattributes') ?>>
- <?php foreach ($this->data['namespace_urls'] as $link ): ?>
+ <h5><?php $this->msg( 'namespaces' ) ?></h5>
+ <ul<?php $this->html( 'userlangattributes' ) ?>>
+ <?php foreach ( $this->data['namespace_urls'] as $link ): ?>
<li <?php echo $link['attributes'] ?>><span><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></span></li>
<?php endforeach; ?>
</ul>
case 'VARIANTS':
?>
<div id="p-variants" class="vectorMenu<?php if ( count( $this->data['variant_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
- <?php if ( $wgVectorShowVariantName ): ?>
- <h4>
- <?php foreach ( $this->data['variant_urls'] as $link ): ?>
- <?php if ( stripos( $link['attributes'], 'selected' ) !== false ): ?>
- <?php echo htmlspecialchars( $link['text'] ) ?>
- <?php endif; ?>
- <?php endforeach; ?>
- </h4>
- <?php endif; ?>
- <h5><span><?php $this->msg('variants') ?></span><a href="#"></a></h5>
+ <h4>
+ <?php foreach ( $this->data['variant_urls'] as $link ): ?>
+ <?php if ( stripos( $link['attributes'], 'selected' ) !== false ): ?>
+ <?php echo htmlspecialchars( $link['text'] ) ?>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </h4>
+ <h5><span><?php $this->msg( 'variants' ) ?></span><a href="#"></a></h5>
<div class="menu">
- <ul<?php $this->html('userlangattributes') ?>>
+ <ul<?php $this->html( 'userlangattributes' ) ?>>
<?php foreach ( $this->data['variant_urls'] as $link ): ?>
<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
<?php endforeach; ?>
case 'ACTIONS':
?>
<div id="p-cactions" class="vectorMenu<?php if ( count( $this->data['action_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
- <h5><span><?php $this->msg(
'actions') ?></span><a href="#"></a></h5>
+ <h5><span><?php $this->msg(
'actions' ) ?></span><a href="#"></a></h5>
<div class="menu">
- <ul<?php $this->html('userlangattributes') ?>>
- <?php foreach ($this->data['action_urls'] as $link ): ?>
+ <ul<?php $this->html( 'userlangattributes' ) ?>>
+ <?php foreach ( $this->data['action_urls'] as $link ): ?>
<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
<?php endforeach; ?>
</ul>
case 'PERSONAL':
?>
<div id="p-personal" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
- <h5><?php $this->msg('personaltools') ?></h5>
- <ul<?php $this->html('userlangattributes') ?>>
-<?php foreach($this->getPersonalTools() as $key => $item) { ?>
- <?php echo $this->makeListItem($key, $item); ?>
+ <h5><?php $this->msg( 'personaltools' ) ?></h5>
+ <ul<?php $this->html( 'userlangattributes' ) ?>>
+<?php foreach( $this->getPersonalTools() as $key => $item ) { ?>
+ <?php echo $this->makeListItem( $key, $item ); ?>
<?php } ?>
</ul>
case 'SEARCH':
?>
<div id="p-search">
- <h5<?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
+ <h5<?php $this->html( 'userlangattributes' ) ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
<form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
- <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
- <?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?>
+ <?php if ( $wgVectorUseSimpleSearch && $this->getSkin()->getUser()->getOption( 'vector-simplesearch' ) ): ?>
<div id="simpleSearch">
<?php if ( $this->data['rtl'] ): ?>
- <?php echo $this->makeSearchButton("image", array( "id" => "searchButton", "src" => $this->skin->getSkinStylePath('images/search-rtl.png') )); ?>
+ <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-rtl.png' ) ) ); ?>
<?php endif; ?>
- <?php echo $this->makeSearchInput(array( "id" => "searchInput", "type" => "text" )); ?>
+ <?php echo $this->makeSearchInput( array( 'id' => 'searchInput', 'type' => 'text' ) ); ?>
<?php if ( !$this->data['rtl'] ): ?>
- <?php echo $this->makeSearchButton("image", array( "id" => "searchButton", "src" => $this->skin->getSkinStylePath('images/search-ltr.png') )); ?>
+ <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-ltr.png' ) ) ); ?>
<?php endif; ?>
- </div>
<?php else: ?>
- <?php echo $this->makeSearchInput(array( "id" => "searchInput" )); ?>
- <?php echo $this->makeSearchButton("go", array( "id" => "searchGoButton", "class" => "searchButton" )); ?>
- <?php echo $this->makeSearchButton("fulltext", array( "id" => "mw-searchButton", "class" => "searchButton" )); ?>
+ <div>
+ <?php echo $this->makeSearchInput( array( 'id' => 'searchInput' ) ); ?>
+ <?php echo $this->makeSearchButton( 'go', array( 'id' => 'searchGoButton', 'class' => 'searchButton' ) ); ?>
+ <?php echo $this->makeSearchButton( 'fulltext', array( 'id' => 'mw-searchButton', 'class' => 'searchButton' ) ); ?>
<?php endif; ?>
+ <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
+ </div>
</form>
</div>
<?php
dépôts / lhc / web / wiklou.git / blobdiff