/**
* 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 = $stylename = 'vector',
+ var $skinname = 'vector', $stylename = 'vector',
$template = 'VectorTemplate';
/**
*/
public function initPage( OutputPage $out ) {
global $wgStylePath, $wgJsMimeType, $wgStyleVersion;
-
+
parent::initPage( $out );
-
+
// Append skin-specific styles
$out->addStyle( 'vector/main-rtl.css', 'screen', '', 'rtl' );
$out->addStyle( 'vector/main-ltr.css', 'screen', '', 'ltr' );
'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(
+ //$links['actions']['addsection']
+ $links['views']['addsection'] = array(
'class' => $section == 'new' ? 'selected' : false,
'text' => wfMsg( 'vector-action-addsection' ),
'href' => $this->mTitle->getLocalUrl(
}
}
wfProfileOut( __METHOD__ . '-live' );
-
+
/**
* The following actions use messages which, if made particular to
* the Vector skin, would break the Ajax code which makes this
);
}
}
-
+
// 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(
<!-- 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 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
*/
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, $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') ?>>
<?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
</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') ?>>
<?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 str_replace( ' ', ' ', htmlspecialchars( $link['text'] ) ) ?></a></li>
+ <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>
</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') ?>>
<?php foreach ($this->data['view_urls'] as $key => $link ): ?>
</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') ?>>
<?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 str_replace( ' ', ' ', htmlspecialchars( $link['text'] ) ) ?></a></li>
+ <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>
</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') ?>>
<?php foreach($this->data['personal_urls'] as $key => $item): ?>
</ul>
</div>
<?php
- }
break;
case 'SEARCH':
?>
<?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='fulltext' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>> </button>
+ <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; ?> />
break;
}
echo "\n<!-- /{$name} -->\n";
- }
+ }
}
}
dépôts / lhc / web / wiklou.git / blobdiff