*/
var $template;
- /**
- * An array of strings representing extra CSS files to load. May include:
- * 'IE', 'IE50', 'IE55', 'IE60', 'IE70', 'rtl'.
- */
- var $cssfiles;
-
/**#@-*/
/**
* Child classes should override this to set the name,
* style subdirectory, and template filler callback.
*
- * @param OutputPage $out
+ * @param $out OutputPage
*/
- function initPage( &$out ) {
+ function initPage( OutputPage $out ) {
parent::initPage( $out );
$this->skinname = 'monobook';
$this->stylename = 'monobook';
$this->template = 'QuickTemplate';
- $this->cssfiles = array();
+ }
+
+ /**
+ * Add specific styles for this skin
+ *
+ * @param $out OutputPage
+ */
+ function setupSkinUserCss( OutputPage $out ){
+ $out->addStyle( 'common/shared.css', 'screen' );
+ $out->addStyle( 'common/commonPrint.css', 'print' );
}
/**
* and eventually it spits out some HTML. Should have interface
* roughly equivalent to PHPTAL 0.7.
*
- * @param string $callback (or file)
- * @param string $repository subdirectory where we keep template files
- * @param string $cache_dir
+ * @param $callback string (or file)
+ * @param $repository string: subdirectory where we keep template files
+ * @param $cache_dir string
* @return object
* @private
*/
/**
* initialize various variables and generate the template
*
- * @param OutputPage $out
- * @public
+ * @param $out OutputPage
*/
- function outputPage( &$out ) {
- global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, $wgOut;
+ function outputPage( OutputPage $out ) {
+ global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang;
global $wgScript, $wgStylePath, $wgContLanguageCode;
global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
- global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
+ global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
global $wgMaxCredits, $wgShowCreditsIfMax;
global $wgPageShowWatchingUsers;
- global $wgUseTrackbacks;
+ global $wgUseTrackbacks, $wgUseSiteJs;
global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
wfProfileIn( __METHOD__ );
$oldid = $wgRequest->getVal( 'oldid' );
$diff = $wgRequest->getVal( 'diff' );
+ $action = $wgRequest->getVal( 'action', 'view' );
wfProfileIn( __METHOD__."-init" );
$this->initPage( $out );
- $this->mTitle =& $wgTitle;
- $this->mUser =& $wgUser;
-
+ $this->setMembers();
$tpl = $this->setupTemplate( $this->template, 'skins' );
#if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
$this->iscontent = ($this->mTitle->getNamespace() != NS_SPECIAL );
$this->iseditable = ($this->iscontent and !($action == 'edit' or $action == 'submit'));
$this->username = $wgUser->getName();
- $userPage = $wgUser->getUserPage();
- $this->userpage = $userPage->getPrefixedText();
if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) {
$this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
$this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
}
- $this->usercss = $this->userjs = $this->userjsprev = false;
- $this->setupUserCss();
+ $this->userjs = $this->userjsprev = false;
+ $this->setupUserCss( $out );
$this->setupUserJs( $out->isUserJsAllowed() );
$this->titletxt = $this->mTitle->getPrefixedText();
wfProfileOut( __METHOD__."-stuff" );
wfProfileIn( __METHOD__."-stuff2" );
- $tpl->set( 'title', $wgOut->getPageTitle() );
- $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
- $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
- $tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$this->mTitle->getPrefixedText() ) );
+ $tpl->set( 'title', $out->getPageTitle() );
+ $tpl->set( 'pagetitle', $out->getHTMLTitle() );
+ $tpl->set( 'displaytitle', $out->mPageLinkTitle );
+ $tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) );
+ $tpl->set( 'skinnameclass', ( "skin-" . Sanitizer::escapeClass( $this->getSkinName ( ) ) ) );
$nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
$wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
$tpl->set( 'articleid', $this->mTitle->getArticleId() );
$tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 );
- $tpl->set( 'isarticle', $wgOut->isArticle() );
+ $tpl->set( 'isarticle', $out->isArticle() );
$tpl->setRef( "thispage", $this->thispage );
$subpagestr = $this->subPageSubtitle();
);
$tpl->set( 'catlinks', $this->getCategories());
- if( $wgOut->isSyndicated() ) {
+ if( $out->isSyndicated() ) {
$feeds = array();
- foreach( $wgOut->getSyndicationLinks() as $format => $link ) {
+ foreach( $out->getSyndicationLinks() as $format => $link ) {
$feeds[$format] = array(
'text' => wfMsg( "feed-$format" ),
'href' => $link );
$tpl->setRef( 'jsmimetype', $wgJsMimeType );
$tpl->setRef( 'charset', $wgOutputEncoding );
$tpl->set( 'headlinks', $out->getHeadLinks() );
- $tpl->set('headscripts', $out->getScript() );
+ $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( 'handheld', $wgRequest->getBool( 'handheld' ) );
$tpl->setRef( 'loggedin', $this->loggedin );
- $tpl->set('nsclass', 'ns-'.$this->mTitle->getNamespace());
$tpl->set('notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL);
/* XXX currently unused, might get useful later
$tpl->set( "editable", ($this->mTitle->getNamespace() != NS_SPECIAL ) );
$tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']);
$tpl->set( 'userlang', $wgLang->getCode() );
$tpl->set( 'pagecss', $this->setupPageCss() );
- $tpl->set( 'printcss', $this->getPrintCss() );
$tpl->setRef( 'usercss', $this->usercss);
$tpl->setRef( 'userjs', $this->userjs);
$tpl->setRef( 'userjsprev', $this->userjsprev);
- global $wgUseSiteJs;
- if ($wgUseSiteJs) {
+ if( $wgUseSiteJs ) {
$jsCache = $this->loggedin ? '&smaxage=0' : '';
$tpl->set( 'jsvarurl',
self::makeUrl('-',
)
);
# Disable Cache
- $wgOut->setSquidMaxage(0);
+ $out->setSquidMaxage(0);
}
} else if (count($newtalks)) {
- $sep = str_replace("_", " ", wfMsgHtml("newtalkseperator"));
+ $sep = str_replace("_", " ", wfMsgHtml("newtalkseparator"));
$msgs = array();
foreach ($newtalks as $newtalk) {
- $msgs[] = wfElement("a",
+ $msgs[] = Xml::element("a",
array('href' => $newtalk["link"]), $newtalk["wiki"]);
}
$parts = implode($sep, $msgs);
$ntl = wfMsgHtml('youhavenewmessagesmulti', $parts);
- $wgOut->setSquidMaxage(0);
+ $out->setSquidMaxage(0);
} else {
$ntl = '';
}
wfProfileIn( __METHOD__."-stuff3" );
$tpl->setRef( 'newtalk', $ntl );
- $tpl->setRef( 'skin', $this);
+ $tpl->setRef( 'skin', $this );
$tpl->set( 'logo', $this->logoText() );
- if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and
+ if ( $out->isArticle() and (!isset( $oldid ) or isset( $diff )) and
$wgArticle and 0 != $wgArticle->getID() )
{
if ( !$wgDisableCounters ) {
$this->credits = false;
- if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
- require_once("Credits.php");
- $this->credits = getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+ if( $wgMaxCredits != 0 ){
+ $this->credits = Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
} else {
- $tpl->set('lastmod', $this->lastModified());
+ $tpl->set( 'lastmod', $this->lastModified() );
}
$tpl->setRef( 'credits', $this->credits );
$tpl->set( 'bottomscripts', $this->bottomScripts() );
$printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
- $out->mBodytext .= $printfooter ;
+ $out->mBodytext .= $printfooter . $this->generateDebugHTML();
$tpl->setRef( 'bodytext', $out->mBodytext );
# Language links
$language_urls = array();
if ( !$wgHideInterlanguageLinks ) {
- foreach( $wgOut->getLanguageLinks() as $l ) {
+ foreach( $out->getLanguageLinks() as $l ) {
$tmp = explode( ':', $l, 2 );
$class = 'interwiki-' . $tmp[0];
unset($tmp);
$nt = Title::newFromText( $l );
- $language_urls[] = array(
- 'href' => $nt->getFullURL(),
- 'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
- 'class' => $class
- );
+ if ( $nt ) {
+ $language_urls[] = array(
+ 'href' => $nt->getFullURL(),
+ 'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
+ 'class' => $class
+ );
+ }
}
}
if(count($language_urls)) {
}
wfProfileOut( __METHOD__."-stuff4" );
+ wfProfileIn( __METHOD__."-stuff5" );
# Personal toolbar
$tpl->set('personal_urls', $this->buildPersonalUrls());
$content_actions = $this->buildContentActionUrls();
// XXX: attach this from javascript, same with section editing
if($this->iseditable && $wgUser->getOption("editondblclick") )
{
- $encEditUrl = wfEscapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
+ $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
$tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";');
} else {
$tpl->set('body_ondblclick', false);
// original version by hansm
if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
- wfDebug( __METHOD__ . ': Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!' );
+ wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" );
}
+ // allow extensions adding stuff after the page content.
+ // See Skin::afterContentHook() for further documentation.
+ $tpl->set ('dataAfterContent', $this->afterContentHook());
+ wfProfileOut( __METHOD__."-stuff5" );
+
// execute template
wfProfileIn( __METHOD__."-execute" );
$res = $tpl->execute();
if( $selected ) {
$classes[] = 'selected';
}
- if( $checkEdit && !$title->isAlwaysKnown() && $title->getArticleId() == 0 ) {
+ if( $checkEdit && !$title->isKnown() ) {
$classes[] = 'new';
- $query = 'action=edit';
+ $query = 'action=edit&redlink=1';
}
$text = wfMsg( $message );
* @return array
* @private
*/
- function buildContentActionUrls () {
- global $wgContLang, $wgLang, $wgOut;
+ function buildContentActionUrls() {
+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest;
+
wfProfileIn( __METHOD__ );
- global $wgUser, $wgRequest;
- $action = $wgRequest->getText( 'action' );
- $section = $wgRequest->getText( 'section' );
+ $action = $wgRequest->getVal( 'action', 'view' );
+ $section = $wgRequest->getVal( 'section' );
$content_actions = array();
$prevent_active_tabs = false ;
);
if ( $istalk || $wgOut->showNewSectionLink() ) {
- $content_actions['addsection'] = array(
- 'class' => $section == 'new'?'selected':false,
- 'text' => wfMsg('addsection'),
- 'href' => $this->mTitle->getLocalUrl( 'action=edit§ion=new' )
- );
+ if ( !$wgOut->forceHideNewSectionLink() ) {
+ $content_actions['addsection'] = array(
+ 'class' => $section == 'new' ? 'selected' : false,
+ 'text' => wfMsg('addsection'),
+ 'href' => $this->mTitle->getLocalUrl( 'action=edit§ion=new' )
+ );
+ }
}
- } elseif ( $this->mTitle->exists() || $this->mTitle->isAlwaysKnown() ) {
+ } elseif ( $this->mTitle->isKnown() ) {
$content_actions['viewsource'] = array(
'class' => ($action == 'edit') ? 'selected' : false,
'text' => wfMsg('viewsource'),
wfProfileOut( __METHOD__."-edit" );
wfProfileIn( __METHOD__."-live" );
- if ( $this->mTitle->getArticleId() ) {
+ if ( $this->mTitle->exists() ) {
$content_actions['history'] = array(
'class' => ($action == 'history') ? 'selected' : false,
'text' => wfMsg('history_short'),
- 'href' => $this->mTitle->getLocalUrl( 'action=history')
+ 'href' => $this->mTitle->getLocalUrl( 'action=history' ),
+ 'rel' => 'archives',
);
- if($wgUser->isAllowed('delete')){
+ if( $wgUser->isAllowed('delete') ) {
$content_actions['delete'] = array(
'class' => ($action == 'delete') ? 'selected' : false,
'text' => wfMsg('delete'),
}
if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
- if(!$this->mTitle->isProtected()){
+ if( !$this->mTitle->isProtected() ){
$content_actions['protect'] = array(
'class' => ($action == 'protect') ? 'selected' : false,
'text' => wfMsg('protect'),
* @return array
* @private
*/
- function buildNavUrls () {
+ function buildNavUrls() {
global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
global $wgEnableUploads, $wgUploadNavigationUrl;
wfProfileIn( __METHOD__ );
- $action = $wgRequest->getText( 'action' );
+ $action = $wgRequest->getVal( 'action', 'view' );
$nav_urls = array();
$nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
- if( $wgEnableUploads ) {
+ if( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
if ($wgUploadNavigationUrl) {
$nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
} else {
// A print stylesheet is attached to all pages, but nobody ever
// figures that out. :) Add a link...
- if( $this->iscontent && ($action == '' || $action == 'view' || $action == 'purge' ) ) {
+ if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) {
$nav_urls['print'] = array(
'text' => wfMsg( 'printableversion' ),
'href' => $wgRequest->appendQuery( 'printable=yes' )
* @return string
* @private
*/
- function getNameSpaceKey () {
+ function getNameSpaceKey() {
return $this->mTitle->getNamespaceKey();
}
- /**
- * @private
- */
- function setupUserCss() {
- wfProfileIn( __METHOD__ );
-
- global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
-
- $stylesheets = array();
- $rawcss = '';
- $siteargs = '&maxage=' . $wgSquidMaxage;
- $userPreview = false;
- if( $this->loggedin ) {
- // Ensure that logged-in users' generated CSS isn't clobbered
- // by anons' publicly cacheable generated CSS.
- $siteargs .= '&smaxage=0';
-
- // If we allow user-specific code append some arguments for it
- if( $wgAllowUserCss ) {
- $action = $wgRequest->getText('action');
- $userPreview = $this->mTitle->isCssSubpage() && $this->userCanPreview( $action );
- $siteargs .= '&ts=' . $wgUser->mTouched;
- if( $userPreview ) $siteargs = "&smaxage=0&maxage=0";
- }
- }
-
- if( $wgContLang->isRTL() && in_array( 'rtl', $this->cssfiles ) ) {
- global $wgStyleVersion;
- $stylesheets['skinrtl'] = "$wgStylePath/$this->stylename/rtl.css?$wgStyleVersion";
- }
-
- # If we use the site's dynamic CSS, throw that in, too
- if( $wgUseSiteCss ) {
- $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
- $skinquery = '';
- if (($us = $wgRequest->getVal('useskin', '')) !== '')
- $skinquery = "&useskin=$us";
- $stylesheets['sitecommon'] = self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI);
- $stylesheets['siteskin'] = self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI );
- $stylesheets['gen'] = self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" );
- }
-
- # Add user-specific code if this is a user and we allow that kind of thing
- if( $wgAllowUserCss && $this->loggedin ) {
- # if we're previewing the CSS page, use it
- if( $userPreview ) {
- $rawcss .= $wgRequest->getText('wpTextbox1');
- } else {
- $stylesheets['userskin'] = self::makeUrl(
- $this->userpage . '/'.$this->skinname.'.css',
- 'action=raw&ctype=text/css');
- }
- }
-
- wfRunHooks( 'SkinSetupSiteCss', array( &$stylesheets, &$rawcss, $query ) );
-
- # If we use any dynamic CSS, make a little CDATA block out of it.
- $s = '';
- foreach( $stylesheets as $link ) {
- $s .= "@import \"$link\";\n";
- }
- $s .= $rawcss;
- if( $s != '' ) $this->usercss = "/*<![CDATA[*/\n{$s}/*]]>*/";
-
- wfProfileOut( __METHOD__ );
- }
-
/**
* @private
*/
function setupUserJs( $allowUserJs ) {
+ global $wgRequest, $wgJsMimeType;
+
wfProfileIn( __METHOD__ );
- global $wgRequest, $wgJsMimeType;
- $action = $wgRequest->getText('action');
+ $action = $wgRequest->getVal( 'action', 'view' );
if( $allowUserJs && $this->loggedin ) {
if( $this->mTitle->isJsSubpage() and $this->userCanPreview( $action ) ) {
wfProfileIn( __METHOD__ );
$out = false;
wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) );
-
wfProfileOut( __METHOD__ );
return $out;
}
-
- /**
- * returns css with user-specific options
- */
- public function getUserStylesheet() {
- wfProfileIn( __METHOD__ );
-
- $s = "/* generated user stylesheet */\n";
- $s .= $this->reallyDoGetUserStyles();
- wfProfileOut( __METHOD__ );
- return $s;
- }
-
- /**
- * Returns the print stylesheet for this skin. In all default skins this
- * is just commonPrint.css, but third-party skins may want to modify it.
- *
- * @return string
- */
- protected function getPrintCss() {
- global $wgStylePath;
- return $wgStylePath . "/common/commonPrint.css";
- }
-
- /**
- * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate-
- * nated together. For some bizarre reason, it does *not* return any
- * custom user JS from subpages. Huh?
- *
- * There's absolutely no reason to have separate Monobook/Common JSes.
- * Any JS that cares can just check the skin variable generated at the
- * top. For now Monobook.js will be maintained, but it should be consi-
- * dered deprecated.
- *
- * @return string
- */
- public function getUserJs() {
- wfProfileIn( __METHOD__ );
-
- $s = parent::getUserJs();
- $s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js */\n";
-
- // avoid inclusion of non defined user JavaScript (with custom skins only)
- // by checking for default message content
- $msgKey = ucfirst($this->skinname).'.js';
- $userJS = wfMsgForContent($msgKey);
- if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
- $s .= $userJS;
- }
-
- wfProfileOut( __METHOD__ );
- return $s;
- }
}
/**
dépôts / lhc / web / wiklou.git / blobdiff