X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2FVector.php;h=6afd587dfeb21d9f4d128191fe18887eda245b0b;hb=c08158368cf30db10ea4b01c068f48bda3d11c2e;hp=479d06db06b57c607e54b90fcde5431f8aa9f4ab;hpb=39c005ca7948d4935aa26539121ed9c13fe82363;p=lhc%2Fweb%2Fwiklou.git diff --git a/skins/Vector.php b/skins/Vector.php index 479d06db06..6afd587dfe 100644 --- a/skins/Vector.php +++ b/skins/Vector.php @@ -1,7 +1,7 @@ addScript( + $min = $wgRequest->getFuzzyBool( 'debug' ) ? '' : '.min'; + $out->addHeadItem( 'csshover', '" + "/{$this->stylename}/csshover{$min}.htc\")}" ); } @@ -50,401 +50,74 @@ class SkinVector extends SkinTemplate { parent::setupSkinUserCss( $out ); $out->addModuleStyles( 'skins.vector' ); } - - /** - * 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, $wgVectorUseIconWatch; - - wfProfileIn( __METHOD__ ); - - $links = array( - 'namespaces' => array(), - 'views' => array(), - 'actions' => array(), - 'variants' => array() - ); - - // Detects parameters - $action = $wgRequest->getVal( 'action', 'view' ); - $section = $wgRequest->getVal( 'section' ); - - // Checks if page is some kind of content - if( $this->iscontent ) { - // Gets page objects for the related namespaces - $subjectPage = $this->mTitle->getSubjectPage(); - $talkPage = $this->mTitle->getTalkPage(); - - // Determines if this is a talk page - $isTalk = $this->mTitle->isTalkPage(); - - // Generates XML IDs from namespace names - $subjectId = $this->mTitle->getNamespaceKey( '' ); - - if ( $subjectId == 'main' ) { - $talkId = 'talk'; - } else { - $talkId = "{$subjectId}_talk"; - } - - // Adds namespace links - $links['namespaces'][$subjectId] = $this->tabAction( - $subjectPage, 'nstab-' . $subjectId, !$isTalk, '', true - ); - $links['namespaces'][$subjectId]['context'] = 'subject'; - $links['namespaces'][$talkId] = $this->tabAction( - $talkPage, 'talk', $isTalk, '', true - ); - $links['namespaces'][$talkId]['context'] = 'talk'; - - // Adds view view link - if ( $this->mTitle->exists() ) { - $links['views']['view'] = $this->tabAction( - $isTalk ? $talkPage : $subjectPage, - 'vector-view-view', ( $action == 'view' ), '', true - ); - } - - wfProfileIn( __METHOD__ . '-edit' ); - - // Checks if user can... - if ( - // edit the current page - $this->mTitle->quickUserCan( 'edit' ) && - ( - // if it exists - $this->mTitle->exists() || - // or they can create one here - $this->mTitle->quickUserCan( 'create' ) - ) - ) { - // Builds CSS class for talk page links - $isTalkClass = $isTalk ? ' istalk' : ''; - - // Determines if we're in edit mode - $selected = ( - ( $action == 'edit' || $action == 'submit' ) && - ( $section != 'new' ) - ); - $links['views']['edit'] = array( - 'class' => ( $selected ? 'selected' : '' ) . $isTalkClass, - 'text' => $this->mTitle->exists() - ? wfMsg( 'vector-view-edit' ) - : wfMsg( 'vector-view-create' ), - 'href' => - $this->mTitle->getLocalURL( $this->editUrlOptions() ) - ); - // Checks if this is a current rev of talk page and we should show a new - // section link - if ( ( $isTalk && $wgArticle->isCurrent() ) || ( $wgOut->showNewSectionLink() ) ) { - // Checks if we should ever show a new section link - if ( !$wgOut->forceHideNewSectionLink() ) { - // Adds new section link - //$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' - ) - ); - } - } - // Checks if the page has some kind of viewable content - } elseif ( $this->mTitle->hasSourceText() ) { - // Adds view source view link - $links['views']['viewsource'] = array( - 'class' => ( $action == 'edit' ) ? 'selected' : false, - 'text' => wfMsg( 'vector-view-viewsource' ), - 'href' => - $this->mTitle->getLocalURL( $this->editUrlOptions() ) - ); - } - wfProfileOut( __METHOD__ . '-edit' ); - - wfProfileIn( __METHOD__ . '-live' ); - - // Checks if the page exists - if ( $this->mTitle->exists() ) { - // Adds history view link - $links['views']['history'] = array( - 'class' => 'collapsible ' . ( ( $action == 'history' ) ? 'selected' : false ), - 'text' => wfMsg( 'vector-view-history' ), - 'href' => $this->mTitle->getLocalURL( 'action=history' ), - 'rel' => 'archives', - ); - - if( $wgUser->isAllowed( 'delete' ) ) { - $links['actions']['delete'] = array( - 'class' => ( $action == 'delete' ) ? 'selected' : false, - 'text' => wfMsg( 'vector-action-delete' ), - 'href' => $this->mTitle->getLocalURL( 'action=delete' ) - ); - } - if ( $this->mTitle->quickUserCan( 'move' ) ) { - $moveTitle = SpecialPage::getTitleFor( - 'Movepage', $this->thispage - ); - $links['actions']['move'] = array( - 'class' => $this->mTitle->isSpecial( 'Movepage' ) ? - 'selected' : false, - 'text' => wfMsg( 'vector-action-move' ), - 'href' => $moveTitle->getLocalURL() - ); - } - - if ( - $this->mTitle->getNamespace() !== NS_MEDIAWIKI && - $wgUser->isAllowed( 'protect' ) - ) { - if ( !$this->mTitle->isProtected() ) { - $links['actions']['protect'] = array( - 'class' => ( $action == 'protect' ) ? - 'selected' : false, - 'text' => wfMsg( 'vector-action-protect' ), - 'href' => - $this->mTitle->getLocalURL( 'action=protect' ) - ); - - } else { - $links['actions']['unprotect'] = array( - 'class' => ( $action == 'unprotect' ) ? - 'selected' : false, - 'text' => wfMsg( 'vector-action-unprotect' ), - 'href' => - $this->mTitle->getLocalURL( 'action=unprotect' ) - ); - } - } - } else { - // article doesn't exist or is deleted - if ( - $wgUser->isAllowed( 'deletedhistory' ) && - $wgUser->isAllowed( 'undelete' ) - ) { - $n = $this->mTitle->isDeleted(); - if( $n ) { - $undelTitle = SpecialPage::getTitleFor( 'Undelete' ); - $links['actions']['undelete'] = array( - 'class' => false, - 'text' => wfMsgExt( - 'vector-action-undelete', - array( 'parsemag' ), - $wgLang->formatNum( $n ) - ), - 'href' => $undelTitle->getLocalURL( - 'target=' . urlencode( $this->thispage ) - ) - ); - } - } - - if ( - $this->mTitle->getNamespace() !== NS_MEDIAWIKI && - $wgUser->isAllowed( 'protect' ) - ) { - if ( !$this->mTitle->getRestrictions( 'create' ) ) { - $links['actions']['protect'] = array( - 'class' => ( $action == 'protect' ) ? - 'selected' : false, - 'text' => wfMsg( 'vector-action-protect' ), - 'href' => - $this->mTitle->getLocalURL( 'action=protect' ) - ); - - } else { - $links['actions']['unprotect'] = array( - 'class' => ( $action == 'unprotect' ) ? - 'selected' : false, - 'text' => wfMsg( 'vector-action-unprotect' ), - 'href' => - $this->mTitle->getLocalURL( 'action=unprotect' ) - ); - } - } - } - wfProfileOut( __METHOD__ . '-live' ); - /** - * The following actions use messages which, if made particular to - * the Vector skin, would break the Ajax code which makes this - * action happen entirely inline. Skin::makeGlobalVariablesScript - * defines a set of messages in a javascript object - and these - * messages are assumed to be global for all skins. Without making - * a change to that procedure these messages will have to remain as - * the global versions. - */ - // Checks if the user is logged in - if ( $this->loggedin ) { - if ( $wgVectorUseIconWatch ) { - $class = 'icon'; - $place = 'views'; - } else { - $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( - 'class' => 'selected', - 'text' => wfMsg( 'nstab-special' ), - 'href' => $wgRequest->getRequestURL() - ); - } - - // Gets list of language variants - $variants = $wgContLang->getVariants(); - // Checks that language conversion is enabled and variants exist - if( !$wgDisableLangConversion && count( $variants ) > 1 ) { - // Gets preferred variant - $preferred = $wgContLang->getPreferredVariant(); - // Loops over each variant - foreach( $variants as $code ) { - // Gets variant name from language code - $varname = $wgContLang->getVariantname( $code ); - // Checks if the variant is marked as disabled - if( $varname == 'disable' ) { - // Skips this variant - continue; - } - // Appends variant link - $links['variants'][] = array( - 'class' => ( $code == $preferred ) ? 'selected' : false, - 'text' => $varname, - 'href' => $this->mTitle->getLocalURL( '', $code ) - ); - } - } - - wfProfileOut( __METHOD__ ); - - return $links; - } } /** * QuickTemplate class for Vector skin * @ingroup Skins */ -class VectorTemplate extends QuickTemplate { +class VectorTemplate extends BaseTemplate { /* Members */ /** - * @var Cached skin object + * @var Skin Cached skin object */ var $skin; /* Functions */ /** - * Outputs the entire contents of the XHTML page + * Outputs the entire contents of the (X)HTML page */ public function execute() { - global $wgRequest, $wgLang; + global $wgLang, $wgVectorUseIconWatch; $this->skin = $this->data['skin']; - $action = $wgRequest->getText( 'action' ); // Build additional attributes for navigation urls - $nav = $this->skin->buildNavigationUrls(); + //$nav = $this->skin->buildNavigationUrls(); + $nav = $this->data['content_navigation']; + + if ( $wgVectorUseIconWatch ) { + $mode = $this->skin->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]['primary'] = true; + unset($nav['actions'][$mode]); + } + } + + $xmlID = ''; foreach ( $nav as $section => $links ) { foreach ( $links as $key => $link ) { - $xmlID = $key; - if ( isset( $link['context'] ) && $link['context'] == 'subject' ) { - $xmlID = 'ca-nstab-' . $xmlID; - } else if ( isset( $link['context'] ) && $link['context'] == 'talk' ) { - $xmlID = 'ca-talk'; - } else { - $xmlID = 'ca-' . $xmlID; + if ( $section == "views" && !(isset($link["primary"]) && $link["primary"]) ) { + $link['class'] = rtrim('collapsible ' . $link['class'], ' '); } + + $xmlID = isset($link["id"]) ? $link["id"] : 'ca-' . $xmlID; $nav[$section][$key]['attributes'] = ' id="' . Sanitizer::escapeId( $xmlID ) . '"'; - if ( $nav[$section][$key]['class'] ) { + if ( $link['class'] ) { $nav[$section][$key]['attributes'] .= ' class="' . htmlspecialchars( $link['class'] ) . '"'; unset( $nav[$section][$key]['class'] ); - } - // We don't want to give the watch tab an accesskey if the page - // is being edited, because that conflicts with the accesskey on - // the watch checkbox. We also don't want to give the edit tab - // an accesskey, because that's fairly superfluous and conflicts - // with an accesskey (Ctrl-E) often used for editing in Safari. - if ( - in_array( $action, array( 'edit', 'submit' ) ) && - in_array( $key, array( 'edit', 'watch', 'unwatch' ) ) - ) { - $nav[$section][$key]['key'] = + } + if ( isset($link['tooltiponly']) && $link['tooltiponly'] ) { + $nav[$section][$key]['key'] = $this->skin->tooltip( $xmlID ); - } else { - $nav[$section][$key]['key'] = + } else { + $nav[$section][$key]['key'] = $this->skin->tooltipAndAccesskey( $xmlID ); - } + } } } $this->data['namespace_urls'] = $nav['namespaces']; $this->data['view_urls'] = $nav['views']; $this->data['action_urls'] = $nav['actions']; $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'] = - ' id="' . Sanitizer::escapeId( "pt-$key" ) . '"'; - 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( - 'lastmod', - 'viewcount', - 'numberofwatchingusers', - 'credits', - 'copyright', - 'tagline', - ), - 'places' => array( - 'privacy', - 'about', - 'disclaimer', - ), - 'icons' => array( - 'poweredbyico', - 'copyrightico', - ), - ); - $footerlinksClasses = array( - 'icons' => array( 'noprint' ) - ); - - // Reduce footer links down to only those which are being used - $validFooterLinks = array(); - foreach( $footerlinks as $category => $links ) { - $validFooterLinks[$category] = array(); - foreach( $links as $link ) { - if( isset( $this->data[$link] ) && $this->data[$link] ) { - $validFooterLinks[$category][] = $link; - } - } - } // Reverse horizontally rendered navigation elements if ( $wgLang->isRTL() ) { $this->data['view_urls'] = @@ -473,9 +146,11 @@ class VectorTemplate extends QuickTemplate {
+ data['isarticle'] ): ?>
msg( 'tagline' ) ?>
+
html('userlangattributes') ?>>html( 'subtitle' ) ?>
@@ -536,28 +211,34 @@ class VectorTemplate extends QuickTemplate { - html( 'bottomscripts' ); /* JS call to runBodyOnloadHook */ ?> - html( 'reporttime' ) ?> - data['debug'] ): ?> - - + printTrail(); ?> + -
- html('userlangattributes') ?>>msg( 'toolbox' ) ?> -
- -
-
-renderPortal( "tb", $this->getToolbox(), "toolbox", "SkinTemplateToolboxEnd" ); break; case 'LANGUAGES': if ( $this->data['language_urls'] ) { -?> -
- html('userlangattributes') ?>>msg( 'otherlanguages' ) ?> -
-
    - data['language_urls'] as $langlink ): ?> -
    • - -
-
-
-renderPortal("lang", $this->data['language_urls'], "otherlanguages"); } break; default: -?> + $this->renderPortal($name, $content); + break; + } + echo "\n\n"; + } + } + + private function renderPortal($name, $content, $msg=null, $hook=null) { + if ( !isset($msg) ) { + $msg = $name; + } + ?>
skin->tooltip( 'p-' . $name ) ?>> - html('userlangattributes') ?>> + html('userlangattributes') ?>>
- + - + - +
\n"; - } } /** @@ -713,11 +362,16 @@ class VectorTemplate extends QuickTemplate { break; case 'VIEWS': ?> -
+
msg('views') ?>
html('userlangattributes') ?>> data['view_urls'] as $link ): ?> - >>' : htmlspecialchars( $link['text'] ) ) ?> + >>' : htmlspecialchars( $link['text'] ); + } + ?>
@@ -742,9 +396,10 @@ class VectorTemplate extends QuickTemplate {
msg('personaltools') ?>
html('userlangattributes') ?>> - data['personal_urls'] as $item): ?> -
  • > class="">
    • - +getPersonalTools() as $key => $item) { ?> + makeListItem($key, $item); ?> + +
    text( 'searchtitle' ) ?>"/> getOption( 'vector-simplesearch' ) ): ?>
    - skin->tooltipAndAccesskey( 'search' ); ?> data['search'] ) ): ?> value="text( 'search' ) ?>" /> - + data['rtl'] ): ?> + makeSearchButton("image", array( "id" => "searchButton", "src" => $this->skin->getSkinStylePath('images/search-rtl.png') )); ?> + + makeSearchInput(array( "id" => "searchInput", "type" => "text" )); ?> + data['rtl'] ): ?> + makeSearchButton("image", array( "id" => "searchButton", "src" => $this->skin->getSkinStylePath('images/search-ltr.png') )); ?> +
    - skin->tooltipAndAccesskey( 'search' ); ?> data['search'] ) ): ?> value="text( 'search' ) ?>" /> - skin->tooltipAndAccesskey( 'search-go' ); ?> /> - skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /> + makeSearchInput(array( "id" => "searchInput" )); ?> + makeSearchButton("go", array( "id" => "searchGoButton", "class" => "searchButton" )); ?> + makeSearchButton("fulltext", array( "id" => "mw-searchButton", "class" => "searchButton" )); ?>