/**
* Vector - Branch of MonoBook which has many usability improvements and
* somewhat cleaner code.
- *
+ *
* @todo document
* @file
* @ingroup Skins
class SkinVector extends SkinTemplate {
/* Functions */
+ var $skinname = 'vector', $stylename = 'vector',
+ $template = 'VectorTemplate', $useHeadElement = true;
/**
* Initializes output page and sets up skin-specific parameters
* @param object $out Output page object to initialize
*/
public function initPage( OutputPage $out ) {
- global $wgStylePath;
+ global $wgStylePath, $wgJsMimeType, $wgStyleVersion, $wgScriptPath, $wgVectorExtraStyles;
parent::initPage( $out );
- $this->skinname = 'vector';
- $this->stylename = 'vector';
- $this->template = 'VectorTemplate';
-
- // Append skin-specific styles
- $out->addStyle( 'vector/main-rtl.css', 'screen', '', 'rtl' );
- $out->addStyle( 'vector/main-ltr.css', 'screen', '', 'ltr' );
+
// 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.
'/vector/csshover.htc")}</style><![endif]-->'
);
}
+
+ /**
+ * Load skin and user css files in the correct order
+ * fixes bug 22916
+ * @param object $out OutputPage object
+ */
+
+ function setupSkinUserCss( OutputPage $out ){
+ global $wgStylePath, $wgVectorExtraStyles;
+
+ parent::setupSkinUserCss( $out );
+
+ // Append skin-specific styles
+ $out->addStyle( 'vector/main-rtl.css', 'screen', '', 'rtl' );
+ $out->addStyle( 'vector/main-ltr.css', 'screen', '', 'ltr' );
+
+ // Add extra stylesheets
+ // THIS IS ONLY USEFUL FOR EXPERIMENTING WITH DIFFERNT STYLE OPTIONS! THIS WILL BE REMOVED IN THE NEAR FUTURE.
+ if ( is_array( $wgVectorExtraStyles ) ) {
+ foreach ( $wgVectorExtraStyles as $style ) {
+ $out->addStyle( 'vector /' . $style, 'screen' );
+ }
+ }
+ }
+
/**
* Builds a structured array of links used for tabs and menus
* @return array
* @private
*/
function buildNavigationUrls() {
- global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
- global $wgDisableLangConversion;
+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle, $wgStylePath;
+ global $wgDisableLangConversion, $wgVectorUseIconWatch;
wfProfileIn( __METHOD__ );
'actions' => array(),
'variants' => array()
);
-
+
// Detects parameters
$action = $wgRequest->getVal( 'action', 'view' );
$section = $wgRequest->getVal( 'section' );
// Generates XML IDs from namespace names
$subjectId = $this->mTitle->getNamespaceKey( '' );
-
+
if ( $subjectId == 'main' ) {
$talkId = 'talk';
} else {
$talkId = "{$subjectId}_talk";
}
$currentId = $isTalk ? $talkId : $subjectId;
-
+
// Adds namespace links
$links['namespaces'][$subjectId] = $this->tabAction(
$subjectPage, 'vector-namespace-' . $subjectId, !$isTalk, '', true
$talkPage, 'vector-namespace-talk', $isTalk, '', true
);
$links['namespaces'][$talkId]['context'] = 'talk';
-
+
// Adds view view link
if ( $this->mTitle->exists() ) {
$links['views']['view'] = $this->tabAction(
'vector-view-view', ( $action == 'view' ), '', true
);
}
-
+
wfProfileIn( __METHOD__ . '-edit' );
-
+
// Checks if user can...
if (
// edit the current page
// Checks if we should ever show a new section link
if ( !$wgOut->forceHideNewSectionLink() ) {
// Adds new section link
- $links['actions']['addsection'] = array(
- 'class' => $section == 'new' ? 'selected' : false,
+ //$links['actions']['addsection']
+ $links['views']['addsection'] = array(
+ 'class' => 'collapsible ' . ( $section == 'new' ? 'selected' : false ),
'text' => wfMsg( 'vector-action-addsection' ),
'href' => $this->mTitle->getLocalUrl(
'action=edit§ion=new'
if ( $this->mTitle->exists() ) {
// Adds history view link
$links['views']['history'] = array(
- 'class' => ($action == 'history') ? 'selected' : false,
+ 'class' => 'collapsible ' . ( ($action == 'history') ? 'selected' : false ),
'text' => wfMsg( 'vector-view-history' ),
'href' => $this->mTitle->getLocalUrl( 'action=history' ),
'rel' => 'archives',
}
}
wfProfileOut( __METHOD__ . '-live' );
-
/**
* The following actions use messages which, if made particular to
* the Vector skin, would break the Ajax code which makes this
* the global versions.
*/
// Checks if the user is logged in
- if( $this->loggedin ) {
- // Checks if the user is watching this page
- if( !$this->mTitle->userIsWatching() ) {
- // Adds watch action link
- $links['actions']['watch'] = array(
- 'class' =>
- ( $action == 'watch' or $action == 'unwatch' ) ?
- 'selected' : false,
- 'text' => wfMsg( 'watch' ),
- 'href' => $this->mTitle->getLocalUrl( 'action=watch' )
- );
+ if ( $this->loggedin ) {
+ if ( $wgVectorUseIconWatch ) {
+ $class = 'icon ';
+ $place = 'views';
} else {
- // Adds unwatch action link
- $links['actions']['unwatch'] = array(
- 'class' =>
- ($action == 'unwatch' or $action == 'watch') ?
- 'selected' : false,
- 'text' => wfMsg( 'unwatch' ),
- 'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
- );
+ $class = '';
+ $place = 'actions';
}
+ $mode = $this->mTitle->userIsWatching() ? 'unwatch' : 'watch';
+ $links[$place][$mode] = array(
+ 'class' => $class . ( ( $action == 'watch' || $action == 'unwatch' ) ? ' selected' : false ),
+ 'text' => wfMsg( $mode ), // uses 'watch' or 'unwatch' message
+ 'href' => $this->mTitle->getLocalUrl( 'action=' . $mode )
+ );
}
-
// This is instead of SkinTemplateTabs - which uses a flat array
wfRunHooks( 'SkinTemplateNavigation', array( &$this, &$links ) );
-
+
// If it's not content, it's got to be a special page
} else {
$links['namespaces']['special'] = array(
* @ingroup Skins
*/
class VectorTemplate extends QuickTemplate {
-
+
/* Members */
-
+
/**
* @var Cached skin object
*/
var $skin;
-
+
/* Functions */
-
+
/**
* Outputs the entire contents of the XHTML page
*/
public function execute() {
global $wgRequest, $wgOut, $wgContLang;
-
+
$this->skin = $this->data['skin'];
$action = $wgRequest->getText( 'action' );
-
- // Suppress warnings to prevent notices about missing indexes in
- // $this->data (is this really the best way to handle this?)
- wfSuppressWarnings();
-
+
// Build additional attributes for navigation urls
$nav = $this->skin->buildNavigationUrls();
foreach ( $nav as $section => $links ) {
$this->data['variant_urls'] = $nav['variants'];
// Build additional attributes for personal_urls
foreach ( $this->data['personal_urls'] as $key => $item) {
- $this->data['personal_urls'][$key]['attributes'] =
+ $this->data['personal_urls'][$key]['attributes'] =
' id="' . Sanitizer::escapeId( "pt-$key" ) . '"';
- if ( $item['active'] ) {
+ if ( isset( $item['active'] ) && $item['active'] ) {
$this->data['personal_urls'][$key]['attributes'] .=
' class="active"';
}
$this->data['personal_urls'][$key]['key'] =
$this->skin->tooltipAndAccesskey('pt-'.$key);
}
-
+
// Generate additional footer links
$footerlinks = array(
'info' => array(
array_reverse( $this->data['personal_urls'] );
}
// Output HTML Page
- echo $wgOut->headElement( $this->skin );
+ $this->html( 'headelement' );
?>
- <body<?php if ( $this->data['body_ondblclick'] ): ?> ondblclick="<?php $this->text( 'body_ondblclick' ) ?>"<?php endif; ?> <?php if ( $this->data['body_onload'] ): ?> onload="<?php $this->text( 'body_onload' ) ?>"<?php endif; ?> class="mediawiki <?php $this->text( 'dir' ) ?> <?php $this->text( 'pageclass' ) ?> <?php $this->text( 'skinnameclass' ) ?>" dir="<?php $this->text( 'dir' ) ?>">
<div id="page-base" class="noprint"></div>
<div id="head-base" class="noprint"></div>
<!-- content -->
- <div id="content">
+ <div id="content" <?php $this->html('specialpageattributes') ?>>
<a id="top"></a>
- <div id="mw-js-message" style="display:none;"></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>
<h3 id="siteSub"><?php $this->msg( 'tagline' ) ?></h3>
<!-- /tagline -->
<!-- subtitle -->
- <div id="contentSub"><?php $this->html( 'subtitle' ) ?></div>
+ <div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html( 'subtitle' ) ?></div>
<!-- /subtitle -->
<?php if ( $this->data['undelete'] ): ?>
<!-- undelete -->
<!-- jumpto -->
<div id="jump-to-nav">
<?php $this->msg( 'jumpto' ) ?><a href="#head"><?php $this->msg( 'jumptonavigation' ) ?></a>,
- <a href="#search"><?php $this->msg( 'jumptosearch' ) ?></a>
+ <a href="#p-search"><?php $this->msg( 'jumptosearch' ) ?></a>
</div>
<!-- /jumpto -->
<?php endif; ?>
<!-- /header -->
<!-- panel -->
<div id="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 $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div>
+ <!-- /logo -->
<?php $this->renderPortals( $this->data['sidebar'] ); ?>
</div>
<!-- /panel -->
- <!-- foot -->
- <div id="foot">
+ <!-- footer -->
+ <div id="footer"<?php $this->html('userlangattributes') ?>>
<?php foreach( $validFooterLinks as $category => $links ): ?>
<?php if ( count( $links ) > 0 ): ?>
- <ul id="foot-<?php echo $category ?>">
+ <ul id="footer-<?php echo $category ?>">
<?php foreach( $links as $link ): ?>
<?php if( isset( $this->data[$link] ) && $this->data[$link] ): ?>
- <li id="foot-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li>
+ <li id="footer-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li>
<?php endif; ?>
<?php endforeach; ?>
</ul>
<?php endif; ?>
<?php endforeach; ?>
- <ul id="foot-icons" class="noprint">
+ <ul id="footer-icons" class="noprint">
<?php if ( $this->data['poweredbyico'] ): ?>
- <li id="foot-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li>
+ <li id="footer-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li>
<?php endif; ?>
<?php if ( $this->data['copyrightico'] ): ?>
- <li id="foot-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li>
+ <li id="footer-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li>
<?php endif; ?>
</ul>
<div style="clear:both"></div>
</div>
- <!-- /foot -->
- <!-- 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 $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div>
- <!-- /logo -->
+ <!-- /footer -->
<!-- fixalpha -->
<script type="<?php $this->text('jsmimetype') ?>"> if ( window.isMSIE55 ) fixalpha(); </script>
<!-- /fixalpha -->
</body>
</html>
<?php
- // We're done with abusing arrays now...
- wfRestoreWarnings();
}
-
+
/**
* Render a series of portals
*/
case 'TOOLBOX':
?>
<div class="portal" id="p-tb">
- <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg( 'toolbox' ) ?></h5>
+ <h5<?php $this->html('userlangattributes') ?>><?php $this->msg( 'toolbox' ) ?></h5>
<div class="body">
<ul>
<?php if( $this->data['notspecialpage'] ): ?>
<?php elseif ( $this->data['nav_urls']['permalink']['href'] === '' ): ?>
<li id="t-ispermalink"<?php echo $this->skin->tooltip( 't-ispermalink' ) ?>><?php $this->msg( 'permalink' ) ?></li>
<?php endif; ?>
- <?php wfRunHooks( 'VectorTemplateToolboxEnd', array( &$this ) ); ?>
<?php wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) ); ?>
</ul>
</div>
if ( $this->data['language_urls'] ) {
?>
<div class="portal" id="p-lang">
- <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg( 'otherlanguages' ) ?></h5>
+ <h5<?php $this->html('userlangattributes') ?>><?php $this->msg( 'otherlanguages' ) ?></h5>
<div class="body">
<ul>
<?php foreach ( $this->data['language_urls'] as $langlink ): ?>
default:
?>
<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $name ) ?>>
- <h5 <?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $name ); if ( wfEmptyMsg( $name, $out ) ) echo htmlspecialchars( $name ); else echo htmlspecialchars( $out ); ?></h5>
+ <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $name ); if ( wfEmptyMsg( $name, $out ) ) echo htmlspecialchars( $name ); else echo htmlspecialchars( $out ); ?></h5>
<div class="body">
<?php if ( is_array( $content ) ): ?>
<ul>
echo "\n<!-- /{$name} -->\n";
}
}
-
+
/**
* Render one or more navigations elements by name, automatically reveresed
* when UI is in RTL mode
*/
private function renderNavigation( $elements ) {
- global $wgContLang, $wgUseTwoButtonsSearchForm;
-
+ global $wgContLang, $wgVectorUseSimpleSearch, $wgStylePath;
+
// If only one element was given, wrap it in an array, allowing more
// flexible arguments
if ( !is_array( $elements ) ) {
echo "\n<!-- {$name} -->\n";
switch ( $element ) {
case 'NAMESPACES':
- if ( count( $this->data[ 'namespace_urls' ] ) > 0 ) {
?>
-<div id="namespaces" class="vectorTabs">
+<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') ?>>
+ <ul<?php $this->html('userlangattributes') ?>>
<?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
<li <?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><span><?php echo htmlspecialchars( $link['text'] ) ?></span></a></li>
<?php endforeach; ?>
</ul>
</div>
<?php
- }
break;
case 'VARIANTS':
- if ( count( $this->data[ 'variant_urls' ] ) > 0 ) {
?>
-<div id="variants" class="vectorMenu">
+<div id="p-variants" class="vectorMenu<?php if ( count( $this->data['variant_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
<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 $key => $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; ?>
</div>
</div>
<?php
- }
break;
case 'VIEWS':
- if ( count( $this->data[ 'view_urls' ] ) > 0 ) {
?>
-<div id="views" class="vectorTabs">
+<div id="p-views" class="vectorTabs<?php if ( count( $this->data['view_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
<h5><?php $this->msg('views') ?></h5>
- <ul <?php $this->html('userlangattributes') ?>>
+ <ul<?php $this->html('userlangattributes') ?>>
<?php foreach ($this->data['view_urls'] as $key => $link ): ?>
- <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><span><?php echo htmlspecialchars( $link['text'] ) ?></span></a></li>
+ <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo (array_key_exists('img',$link) ? '<img src="'.$link['img'].'" alt="'.$link['text'].'" />' : '<span>'.htmlspecialchars( $link['text'] ).'</span>') ?></a></li>
<?php endforeach; ?>
</ul>
</div>
<?php
- }
break;
case 'ACTIONS':
- if ( count( $this->data[ 'action_urls' ] ) > 0 ) {
?>
-<div id="p-cactions" class="vectorMenu">
+<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>
<div class="menu">
- <ul <?php $this->html('userlangattributes') ?>>
+ <ul<?php $this->html('userlangattributes') ?>>
<?php foreach ($this->data['action_urls'] as $key => $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; ?>
</div>
</div>
<?php
- }
break;
case 'PERSONAL':
- if ( count( $this->data['personal_urls'] ) > 0 ) {
?>
-<div id="p-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') ?>>
+ <ul<?php $this->html('userlangattributes') ?>>
<?php foreach($this->data['personal_urls'] as $key => $item): ?>
<li <?php echo $item['attributes'] ?>><a href="<?php echo htmlspecialchars($item['href']) ?>"<?php echo $item['key'] ?><?php if(!empty($item['class'])): ?> class="<?php echo htmlspecialchars($item['class']) ?>"<?php endif; ?>><?php echo htmlspecialchars($item['text']) ?></a></li>
<?php endforeach; ?>
</ul>
</div>
<?php
- }
break;
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 ): ?>
+ <div id="simpleSearch">
+ <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
+ <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>> </button>
+ </div>
+ <?php else: ?>
<input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
<input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg( 'searcharticle' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> />
- <?php if ( $wgUseTwoButtonsSearchForm ): ?>
<input type="submit" name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg( 'searchbutton' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
- <?php else: ?>
- <div><a href="<?php $this->text( 'searchaction' ) ?>" rel="search"><?php $this->msg( 'powersearch-legend' ) ?></a></div>
<?php endif; ?>
</form>
</div>
break;
}
echo "\n<!-- /{$name} -->\n";
- }
+ }
}
}
dépôts / lhc / web / wiklou.git / blobdiff