*/
/**
- * Name of our skin, set in initPage()
- * It probably need to be all lower case.
+ * Name of our skin, it probably needs to be all lower case. Child classes
+ * should override the default.
*/
- var $skinname;
+ var $skinname = 'monobook';
/**
- * Stylesheets set to use
- * Sub directory in ./skins/ where various stylesheets are located
+ * Stylesheets set to use. Subdirectory in skins/ where various stylesheets
+ * are located. Child classes should override the default.
*/
- var $stylename;
+ var $stylename = 'monobook';
/**
- * For QuickTemplate, the name of the subclass which
- * will actually fill the template.
+ * For QuickTemplate, the name of the subclass which will actually fill the
+ * template. Child classes should override the default.
*/
- var $template;
+ var $template = 'QuickTemplate';
/**#@-*/
/**
- * Setup the base parameters...
- * Child classes should override this to set the name,
- * style subdirectory, and template filler callback.
+ * Add specific styles for this skin
*
* @param $out OutputPage
*/
- function initPage( OutputPage $out ) {
- parent::initPage( $out );
- $this->skinname = 'monobook';
- $this->stylename = 'monobook';
- $this->template = 'QuickTemplate';
+ function setupSkinUserCss( OutputPage $out ){
+ $out->addStyle( 'common/shared.css', 'screen' );
+ $out->addStyle( 'common/commonPrint.css', 'print' );
}
/**
- * Add specific styles for this skin
- *
- * @param $out OutputPage
+ * Add specific JavaScript the base Skin class.
+ * FIXME: not called from anywhere
*/
- function setupSkinUserCss( OutputPage $out ){
- $out->addStyle( 'common/shared.css', 'screen' );
- $out->addStyle( 'common/commonPrint.css', 'print' );
+ function setupSkinUserJs( OutputPage $out ) {
+ global $wgUseSiteJs;
+ if( $wgUseSiteJs ) {
+ $jsCache = $this->loggedin ? '&smaxage=0' : '';
+ $siteGenScriptFile = self::makeUrl( '-',
+ "action=raw$jsCache&gen=js&useskin=" . urlencode( $this->getSkinName() ) );
+ $this->jsvarurl = $siteGenScriptFile;
+ }
}
/**
* @param $out OutputPage
*/
function outputPage( OutputPage $out ) {
- global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang;
+ global $wgArticle, $wgUser, $wgLang, $wgContLang;
global $wgScript, $wgStylePath, $wgContLanguageCode;
global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
global $wgMaxCredits, $wgShowCreditsIfMax;
global $wgPageShowWatchingUsers;
global $wgUseTrackbacks, $wgUseSiteJs;
- global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
+ global $wgArticlePath, $wgScriptPath, $wgServer, $wgCanonicalNamespaceNames;
wfProfileIn( __METHOD__ );
wfProfileIn( __METHOD__ . '-stuff' );
$this->thispage = $this->mTitle->getPrefixedDBkey();
$this->thisurl = $this->mTitle->getPrefixedURL();
+ $query = array();
+ if ( !$wgRequest->wasPosted() ) {
+ $query = $wgRequest->getValues();
+ unset( $query['title'] );
+ unset( $query['returnto'] );
+ unset( $query['returntoquery'] );
+ }
+ $this->thisquery = wfUrlencode( wfArrayToCGI( $query ) );
$this->loggedin = $wgUser->isLoggedIn();
$this->iscontent = ( $this->mTitle->getNamespace() != NS_SPECIAL );
$this->iseditable = ( $this->iscontent and !( $action == 'edit' or $action == 'submit' ) );
$tpl->set( 'feeds', false );
}
if( $wgUseTrackbacks && $out->isArticleRelated() ) {
- $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF() );
+ $tpl->set( 'trackbackhtml', $out->getTitle()->trackbackRDF() );
} else {
$tpl->set( 'trackbackhtml', null );
}
$tpl->setRef( 'jsmimetype', $wgJsMimeType );
$tpl->setRef( 'charset', $wgOutputEncoding );
$tpl->set( 'headlinks', $out->getHeadLinks() );
- $tpl->set( 'headscripts', $out->getScript() );
$tpl->set( 'csslinks', $out->buildCssLinks() );
$tpl->setRef( 'wgScript', $wgScript );
$tpl->setRef( 'skinname', $this->skinname );
$tpl->set( 'skinclass', get_class( $this ) );
$tpl->setRef( 'stylename', $this->stylename );
- $tpl->set( 'printable', $wgRequest->getBool( 'printable' ) );
+ $tpl->set( 'printable', $out->isPrintable() );
$tpl->set( 'handheld', $wgRequest->getBool( 'handheld' ) );
$tpl->setRef( 'loggedin', $this->loggedin );
$tpl->set( 'notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL );
$tpl->setRef( 'serverurl', $wgServer );
$tpl->setRef( 'logopath', $wgLogo );
$tpl->setRef( 'lang', $wgContLanguageCode );
- $tpl->set( 'dir', $wgContLang->isRTL() ? 'rtl' : 'ltr' );
+ $tpl->set( 'dir', $wgContLang->getDir() );
$tpl->set( 'rtl', $wgContLang->isRTL() );
+ $tpl->set( 'capitalizeallnouns', $wgLang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
$tpl->set( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) );
$tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) );
$tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username );
$tpl->setRef( 'userpage', $this->userpage );
$tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
$tpl->set( 'userlang', $wgLang->getCode() );
+ $tpl->set( 'userlangattributes', 'lang="' . $wgLang->getCode() . '" xml:lang="' . $wgLang->getCode() . '"' );
$tpl->set( 'pagecss', $this->setupPageCss() );
$tpl->setRef( 'usercss', $this->usercss );
$tpl->setRef( 'userjs', $this->userjs );
} else {
$tpl->set( 'jsvarurl', false );
}
+
$newtalks = $wgUser->getNewMessageLinks();
if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
$usertitle = $this->mUser->getUserPage();
$usertalktitle = $usertitle->getTalkPage();
+
if( !$usertalktitle->equals( $this->mTitle ) ) {
- $ntl = wfMsg( 'youhavenewmessages',
- $this->makeKnownLinkObj(
- $usertalktitle,
- wfMsgHtml( 'newmessageslink' ),
- 'redirect=no'
- ),
- $this->makeKnownLinkObj(
- $usertalktitle,
- wfMsgHtml( 'newmessagesdifflink' ),
- 'diff=cur'
- )
+ $newmessageslink = $this->link(
+ $usertalktitle,
+ wfMsgHtml( 'newmessageslink' ),
+ array(),
+ array( 'redirect' => 'no' ),
+ array( 'known', 'noclasses' )
+ );
+
+ $newmessagesdifflink = $this->link(
+ $usertalktitle,
+ wfMsgHtml( 'newmessagesdifflink' ),
+ array(),
+ array( 'diff' => 'cur' ),
+ array( 'known', 'noclasses' )
+ );
+
+ $ntl = wfMsg(
+ 'youhavenewmessages',
+ $newmessageslink,
+ $newmessagesdifflink
);
# Disable Cache
$out->setSquidMaxage( 0 );
}
} else if( count( $newtalks ) ) {
+ // _>" " for BC <= 1.16
$sep = str_replace( '_', ' ', wfMsgHtml( 'newtalkseparator' ) );
$msgs = array();
foreach( $newtalks as $newtalk ) {
$tpl->set( 'sidebar', $this->buildSidebar() );
$tpl->set( 'nav_urls', $this->buildNavUrls() );
+ // Set the head scripts near the end, in case the above actions resulted in added scripts
+ $tpl->set( 'headscripts', $out->getScript() );
+
// original version by hansm
if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" );
* @private
*/
function buildPersonalUrls() {
- global $wgTitle, $wgRequest;
+ global $wgOut, $wgRequest;
- $pageurl = $wgTitle->getLocalURL();
+ $title = $wgOut->getTitle();
+ $pageurl = $title->getLocalURL();
wfProfileIn( __METHOD__ );
/* set up the default links for the personal toolbar */
$personal_urls = array();
+ $page = $wgRequest->getVal( 'returnto', $this->thisurl );
+ $query = $wgRequest->getVal( 'returntoquery', $this->thisquery );
+ $returnto = "returnto=$page";
+ if( $this->thisquery != '' )
+ $returnto .= "&returntoquery=$query";
if( $this->loggedin ) {
$personal_urls['userpage'] = array(
'text' => $this->username,
# from request values or be specified in "sub page" form. The plot
# thickens, because $wgTitle is altered for special pages, so doesn't
# contain the original alias-with-subpage.
- $title = Title::newFromText( $wgRequest->getText( 'title' ) );
- if( $title instanceof Title && $title->getNamespace() == NS_SPECIAL ) {
+ $origTitle = Title::newFromText( $wgRequest->getText( 'title' ) );
+ if( $origTitle instanceof Title && $origTitle->getNamespace() == NS_SPECIAL ) {
list( $spName, $spPar ) =
- SpecialPage::resolveAliasWithSubpage( $title->getText() );
+ SpecialPage::resolveAliasWithSubpage( $origTitle->getText() );
$active = $spName == 'Contributions'
&& ( ( $spPar && $spPar == $this->username )
|| $wgRequest->getText( 'target' ) == $this->username );
$personal_urls['logout'] = array(
'text' => wfMsg( 'userlogout' ),
'href' => self::makeSpecialUrl( 'Userlogout',
- $wgTitle->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"
+ $title->isSpecial( 'Preferences' ) ? '' : $returnto
),
'active' => false
);
);
$personal_urls['anonlogin'] = array(
'text' => wfMsg( $loginlink ),
- 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
- 'active' => $wgTitle->isSpecial( 'Userlogin' )
+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
+ 'active' => $title->isSpecial( 'Userlogin' )
);
} else {
$personal_urls['login'] = array(
'text' => wfMsg( $loginlink ),
- 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
- 'active' => $wgTitle->isSpecial( 'Userlogin' )
+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
+ 'active' => $title->isSpecial( 'Userlogin' )
);
}
}
- wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );
+ wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
wfProfileOut( __METHOD__ );
return $personal_urls;
}
* @private
*/
function buildContentActionUrls() {
- global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest;
+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
wfProfileIn( __METHOD__ );
'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
);
- if ( $istalk || $wgOut->showNewSectionLink() ) {
+ // adds new section link if page is a current revision of a talk page or
+ if ( ( $wgArticle && $wgArticle->isCurrent() && $istalk ) || $wgOut->showNewSectionLink() ) {
if ( !$wgOut->forceHideNewSectionLink() ) {
$content_actions['addsection'] = array(
'class' => $section == 'new' ? 'selected' : false,
* @private
*/
function buildNavUrls() {
- global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
+ global $wgUseTrackbacks, $wgOut, $wgUser, $wgRequest;
global $wgEnableUploads, $wgUploadNavigationUrl;
wfProfileIn( __METHOD__ );
$nav_urls = array();
$nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
- if( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
- if( $wgUploadNavigationUrl ) {
- $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
- } else {
- $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
- }
+ if( $wgUploadNavigationUrl ) {
+ $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
+ } elseif( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
+ $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
} else {
- if( $wgUploadNavigationUrl )
- $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
- else
- $nav_urls['upload'] = false;
+ $nav_urls['upload'] = false;
}
$nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) );
// A print stylesheet is attached to all pages, but nobody ever
// figures that out. :) Add a link...
if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) {
- $nav_urls['print'] = array(
- 'text' => wfMsg( 'printableversion' ),
- 'href' => $wgRequest->appendQuery( 'printable=yes' )
- );
+ if ( !$wgOut->isPrintable() ) {
+ $nav_urls['print'] = array(
+ 'text' => wfMsg( 'printableversion' ),
+ 'href' => $wgRequest->appendQuery( 'printable=yes' )
+ );
+ }
// Also add a "permalink" while we're at it
if ( $this->mRevisionId ) {
$nav_urls['permalink'] = array(
'text' => wfMsg( 'permalink' ),
- 'href' => $wgTitle->getLocalURL( "oldid=$this->mRevisionId" )
+ 'href' => $wgOut->getTitle()->getLocalURL( "oldid=$this->mRevisionId" )
);
}
}
if( $wgUseTrackbacks )
$nav_urls['trackbacklink'] = array(
- 'href' => $wgTitle->trackbackURL()
+ 'href' => $wgOut->getTitle()->trackbackURL()
);
}
if( $id ) {
$logPage = SpecialPage::getTitleFor( 'Log' );
- $nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user='
- . $this->mTitle->getPartialUrl() ) );
+ $nav_urls['log'] = array(
+ 'href' => $logPage->getLocalUrl(
+ array(
+ 'user' => $this->mTitle->getText()
+ )
+ )
+ );
} else {
$nav_urls['log'] = false;
}
*/
function setupUserJs( $allowUserJs ) {
global $wgRequest, $wgJsMimeType;
-
wfProfileIn( __METHOD__ );
$action = $wgRequest->getVal( 'action', 'view' );
wfProfileOut( __METHOD__ );
return $out;
}
+
+ public function commonPrintStylesheet() {
+ return false;
+ }
}
/**
* compatible with what we use of PHPTAL 0.7.
* @ingroup Skins
*/
-class QuickTemplate {
+abstract class QuickTemplate {
/**
* Constructor
*/
* Main function, used by classes that subclass QuickTemplate
* to show the actual HTML output
*/
- public function execute() {
- echo 'Override this function.';
- }
+ abstract public function execute();
/**
* @private
* @private
*/
function msgWiki( $str ) {
- global $wgParser, $wgTitle, $wgOut;
+ global $wgParser, $wgOut;
$text = $this->translator->translate( $str );
- $parserOutput = $wgParser->parse( $text, $wgTitle,
+ $parserOutput = $wgParser->parse( $text, $wgOut->getTitle(),
$wgOut->parserOptions(), true );
echo $parserOutput->getText();
}
$msg = $this->translator->translate( $str );
return ( $msg != '-' ) && ( $msg != '' ); # ????
}
-}
\ No newline at end of file
+}
dépôts / lhc / web / wiklou.git / blobdiff