}
return $wgValidSkinNames;
}
-
+
/**
* Fetch the list of usable skins in regards to $wgSkipSkins.
* Useful for Special:Preferences and other places where you
wfProfileIn( __METHOD__ );
+ # Add favicons and Apple touch icons, if they're not the defaults
+ #
# Generally the order of the favicon and apple-touch-icon links
# should not matter, but Konqueror (3.5.9 at least) incorrectly
# uses whichever one appears later in the HTML source. Make sure
# apple-touch-icon is specified first to avoid this.
- if( false !== $wgAppleTouchIcon ) {
+ if( false !== $wgAppleTouchIcon && wfExpandUrl('/apple-touch-icon.png') != wfExpandUrl($wgAppleTouchIcon) ) {
$out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
}
- if( false !== $wgFavicon ) {
+ if( false !== $wgFavicon && wfExpandUrl('/favicon.ico') != wfExpandUrl($wgFavicon) ) {
$out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
}
$this->userpage = $wgUser->getUserPage()->getPrefixedText();
$this->usercss = false;
}
-
+
/**
* Set the title
* @param Title $t The title to use
public function setTitle( $t ) {
$this->mTitle = $t;
}
-
+
/** Get the title */
public function getTitle() {
return $this->mTitle;
$out->out( $out->mBodytext . "\n" );
$out->out( $this->afterContent() );
-
+
$out->out( $afterContent );
$out->out( $this->bottomScripts() );
$r[] = "var $name = $encValue;";
}
$r[] = "/*]]>*/</script>\n";
-
return implode( "\n\t\t", $r );
}
/**
* Make a <script> tag containing global variables
- * @param array $data Associative array containing one element:
- * skinname => the skin name
+ * @param $skinName string Name of the skin
* The odd calling convention is for backwards compatibility
* @TODO @FIXME Make this not depend on $wgTitle!
*/
- static function makeGlobalVariablesScript( $data ) {
+ static function makeGlobalVariablesScript( $skinName ) {
+ if ( is_array( $skinName ) ) {
+ # Weird back-compat stuff.
+ $skinName = $skinName['skinname'];
+ }
global $wgScript, $wgTitle, $wgStylePath, $wgUser;
- global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
+ global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang, $wgVariant;
global $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
global $wgUseAjax, $wgAjaxWatch;
);
$vars = array(
- 'skin' => $data['skinname'],
+ 'skin' => $skinName,
'stylepath' => $wgStylePath,
'wgArticlePath' => $wgArticlePath,
'wgScriptPath' => $wgScriptPath,
'wgIsArticle' => $wgOut->isArticle(),
'wgUserName' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
'wgUserGroups' => $wgUser->isAnon() ? NULL : $wgUser->getEffectiveGroups(),
+ 'wgUserVariant' => $wgVariant->getCode(),
'wgUserLanguage' => $wgLang->getCode(),
'wgContentLanguage' => $wgContLang->getCode(),
'wgBreakFrames' => $wgBreakFrames,
'wgSeparatorTransformTable' => $compactSeparatorTransTable,
'wgDigitTransformTable' => $compactDigitTransTable,
);
-
+ if ( !( $wgContLang->hasVariants() ) ) {
+ unset( $vars['wgUserVariant'] );
+ }
+
+ //if on upload page output the extension list & js_upload
+ if( SpecialPage::resolveAlias( $wgTitle->getDBkey() ) == "Upload" ){
+ global $wgFileExtensions, $wgAjaxUploadInterface;
+ $vars['wgFileExtensions'] = $wgFileExtensions;
+ $vars['wgAjaxUploadInterface'] = $wgAjaxUploadInterface;
+ }
+
if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ){
$vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
$vars['wgDBname'] = $wgDBname;
return self::makeVariablesScript( $vars );
}
+ /**
+ * Return a random selection of the scripts we want in the header,
+ * according to no particular rhyme or reason. Various other scripts are
+ * returned from a haphazard assortment of other functions scattered over
+ * various files. This entire hackish system needs to be burned to the
+ * ground and rebuilt.
+ *
+ * @param $out OutputPage object, should be $wgOut
+ *
+ * @return string Raw HTML to output to <head>
+ */
+ function getHeadScripts( OutputPage $out ) {
+ global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion, $wgOut;
+ global $wgUseSiteJs;
- function getHeadScripts( $allowUserJs ) {
- global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion;
-
- $vars = self::makeGlobalVariablesScript( array( 'skinname' => $this->getSkinName() ) );
+ $vars = self::makeGlobalVariablesScript( $this->getSkinName() );
- $r = array( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>" );
- global $wgUseSiteJs;
+ //moved wikibits to be called earlier on
+ //$out->addScriptFile( "{$wgStylePath}/common/wikibits.js" );
if( $wgUseSiteJs ) {
$jsCache = $wgUser->isLoggedIn() ? '&smaxage=0' : '';
- $r[] = "<script type=\"$wgJsMimeType\" src=\"".
- htmlspecialchars( self::makeUrl( '-',
+ $wgOut->addScriptFile( self::makeUrl( '-',
"action=raw$jsCache&gen=js&useskin=" .
- urlencode( $this->getSkinName() ) ) ) .
- "\"><!-- site js --></script>";
+ urlencode( $this->getSkinName() )
+ )
+ );
}
- if( $allowUserJs && $wgUser->isLoggedIn() ) {
+ if( $out->isUserJsAllowed() && $wgUser->isLoggedIn() ) {
$userpage = $wgUser->getUserPage();
- $userjs = htmlspecialchars( self::makeUrl(
+ $userjs = self::makeUrl(
$userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
- 'action=raw&ctype='.$wgJsMimeType ) );
- $r[] = '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>";
+ 'action=raw&ctype='.$wgJsMimeType );
+ $wgOut->addScriptFile( $userjs );
}
- return $vars . "\t\t" . implode ( "\n\t\t", $r );
+ return "\t" . $vars . "\t" . $out->mScripts;
}
/**
* top. For now Monobook.js will be maintained, but it should be consi-
* dered deprecated.
*
+ * @param force_skin lets you override the skin name
+ *
* @return string
*/
- public function generateUserJs() {
+ public function generateUserJs( $skinName = null) {
global $wgStylePath;
wfProfileIn( __METHOD__ );
+ if(!$skinName){
+ $skinName = $this->getSkinName();
+ }
$s = "/* generated javascript */\n";
- $s .= "var skin = '" . Xml::escapeJsString( $this->getSkinName() ) . "';\n";
+ $s .= "var skin = '" . Xml::escapeJsString($skinName ) . "';\n";
$s .= "var stylepath = '" . Xml::escapeJsString( $wgStylePath ) . "';";
$s .= "\n\n/* MediaWiki:Common.js */\n";
$commonJs = wfMsgForContent( 'common.js' );
$s .= $commonJs;
}
- $s .= "\n\n/* MediaWiki:".ucfirst( $this->getSkinName() ).".js */\n";
+ $s .= "\n\n/* MediaWiki:".ucfirst( $skinName ).".js */\n";
// avoid inclusion of non defined user JavaScript (with custom skins only)
// by checking for default message content
- $msgKey = ucfirst( $this->getSkinName() ).'.js';
+ $msgKey = ucfirst( $skinName ).'.js';
$userJS = wfMsgForContent( $msgKey );
if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
$s .= $userJS;
wfProfileOut( __METHOD__ );
return $s;
}
-
+
/**
* Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
*/
if( !$wgUser->getOption( 'editsection' ) ) {
$s .= ".editsection { display: none; }\n";
}
+ $fontstyle = $wgUser->getOption( 'editfont' );
+ if ( $fontstyle !== 'default' ) {
+ $s .= "textarea { font-family: $fontstyle; }\n";
+ }
return $s;
}
' skin-'. Sanitizer::escapeClass( $this->getSkinName() );
return $a;
}
-
+
function getPageClasses( $title ) {
$numeric = 'ns-'.$title->getNamespace();
if( $title->getNamespace() == NS_SPECIAL ) {
}
}
if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
- $s[] .= $this->makeKnownLinkObj( $this->mTitle,
- wfMsg( 'currentrev' ) );
+ $s[] .= $this->link(
+ $this->mTitle,
+ wfMsg( 'currentrev' ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
}
if ( $wgUser->getNewtalk() ) {
# do not show "You have new messages" text when we are viewing our
# own talk page
if( !$this->mTitle->equals( $wgUser->getTalkPage() ) ) {
- $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
- $dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
+ $tl = $this->link(
+ $wgUser->getTalkPage(),
+ wfMsgHtml( 'newmessageslink' ),
+ array(),
+ array( 'redirect' => 'no' ),
+ array( 'known', 'noclasses' )
+ );
+
+ $dl = $this->link(
+ $wgUser->getTalkPage(),
+ wfMsgHtml( 'newmessagesdifflink' ),
+ array(),
+ array( 'diff' => 'cur' ),
+ array( 'known', 'noclasses' )
+ );
$s[] = '<strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
# disable caching
$wgOut->setSquidMaxage( 0 );
} else {
$msg = 'viewdeleted';
}
- return wfMsg( $msg,
- $this->makeKnownLinkObj(
+ return wfMsg(
+ $msg,
+ $this->link(
SpecialPage::getTitleFor( 'Undelete', $this->mTitle->getPrefixedDBkey() ),
- wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ) ) );
+ wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ )
+ );
}
}
return '';
function printableLink() {
global $wgOut, $wgFeedClasses, $wgRequest, $wgLang;
- $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
+ $s = array();
+
+ if ( !$wgRequest->getBool( 'printable' ) ) {
+ $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
+ $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
+ }
- $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
if( $wgOut->isSyndicated() ) {
foreach( $wgFeedClasses as $format => $class ) {
$feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
$display .= $link;
$linkObj = Title::newFromText( $growinglink );
if( is_object( $linkObj ) && $linkObj->exists() ){
- $getlink = $this->makeKnownLinkObj( $linkObj, htmlspecialchars( $display ) );
+ $getlink = $this->link(
+ $linkObj,
+ htmlspecialchars( $display ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
$c++;
if( $c > 1 ) {
$subpages .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
$element[] = $this->emailUserLink();
}
}
-
+
$s = implode( $element, $sep );
if ( $this->mTitle->getArticleId() ) {
$out = '';
if( $wgRightsPage ) {
- $link = $this->makeKnownLink( $wgRightsPage, $wgRightsText );
+ $title = Title::newFromText( $wgRightsPage );
+ $link = $this->linkKnown( $title, $wgRightsText );
} elseif( $wgRightsUrl ) {
$link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
} elseif( $wgRightsText ) {
# Give up now
return $out;
}
+ // Allow for site and per-namespace customization of copyright notice.
+ if( isset($wgArticle) )
+ wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link ) );
+
$out .= wfMsgForContent( $msg, $link );
return $out;
}
}
function mainPageLink() {
- $s = $this->makeKnownLinkObj( Title::newMainPage(), wfMsg( 'mainpage' ) );
+ $s = $this->link(
+ Title::newMainPage(),
+ wfMsg( 'mainpage' ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
return $s;
}
function copyrightLink() {
- $s = $this->makeKnownLink( wfMsgForContent( 'copyrightpage' ),
- wfMsg( 'copyrightpagename' ) );
+ $title = Title::newFromText( wfMsgForContent( 'copyrightpage' ) );
+ $s = $this->linkKnown(
+ $title,
+ wfMsg( 'copyrightpagename' )
+ );
return $s;
}
// Otherwise, we display the link for the user, described in their
// language (which may or may not be the same as the default language),
// but we make the link target be the one site-wide page.
- return $this->makeKnownLink( wfMsgForContent( $page ),
- wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) ) );
+ $title = Title::newFromText( wfMsgForContent( $page ) );
+ return $this->linkKnown(
+ $title,
+ wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) )
+ );
}
}
$t = wfMsg( 'viewsource' );
}
- $s = $this->makeKnownLinkObj( $this->mTitle, $t, $this->editUrlOptions() );
+ $s = $this->link(
+ $this->mTitle,
+ $t,
+ array(),
+ $this->editUrlOptions(),
+ array( 'known', 'noclasses' )
+ );
}
return $s;
}
* Return URL options for the 'edit page' link.
* This may include an 'oldid' specifier, if the current page view is such.
*
- * @return string
+ * @return array
* @private
*/
function editUrlOptions() {
global $wgArticle;
+ $options = array( 'action' => 'edit' );
+
if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
- return 'action=edit&oldid=' . intval( $this->mRevisionId );
- } else {
- return 'action=edit';
+ $options['oldid'] = intval( $this->mRevisionId );
}
+
+ return $options;
}
function deleteThisPage() {
if ( $this->mTitle->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
$t = wfMsg( 'deletethispage' );
- $s = $this->makeKnownLinkObj( $this->mTitle, $t, 'action=delete' );
+ $s = $this->link(
+ $this->mTitle,
+ $t,
+ array(),
+ array( 'action' => 'delete' ),
+ array( 'known', 'noclasses' )
+ );
} else {
$s = '';
}
$diff = $wgRequest->getVal( 'diff' );
if ( $this->mTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
if ( $this->mTitle->isProtected() ) {
- $t = wfMsg( 'unprotectthispage' );
- $q = 'action=unprotect';
+ $text = wfMsg( 'unprotectthispage' );
+ $query = array( 'action' => 'unprotect' );
} else {
- $t = wfMsg( 'protectthispage' );
- $q = 'action=protect';
+ $text = wfMsg( 'protectthispage' );
+ $query = array( 'action' => 'protect' );
}
- $s = $this->makeKnownLinkObj( $this->mTitle, $t, $q );
+
+ $s = $this->link(
+ $this->mTitle,
+ $text,
+ array(),
+ $query,
+ array( 'known', 'noclasses' )
+ );
} else {
$s = '';
}
if ( $wgOut->isArticleRelated() ) {
if ( $this->mTitle->userIsWatching() ) {
- $t = wfMsg( 'unwatchthispage' );
- $q = 'action=unwatch';
+ $text = wfMsg( 'unwatchthispage' );
+ $query = array( 'action' => 'unwatch' );
$id = 'mw-unwatch-link' . $this->mWatchLinkNum;
} else {
- $t = wfMsg( 'watchthispage' );
- $q = 'action=watch';
+ $text = wfMsg( 'watchthispage' );
+ $query = array( 'action' => 'watch' );
$id = 'mw-watch-link' . $this->mWatchLinkNum;
}
- $s = $this->makeKnownLinkObj( $this->mTitle, $t, $q, '', '', " id=\"$id\"" );
+
+ $s = $this->link(
+ $this->mTitle,
+ $text,
+ array( 'id' => $id ),
+ $query,
+ array( 'known', 'noclasses' )
+ );
} else {
$s = wfMsg( 'notanarticle' );
}
function moveThisPage() {
if ( $this->mTitle->quickUserCan( 'move' ) ) {
- return $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
- wfMsg( 'movethispage' ), 'target=' . $this->mTitle->getPrefixedURL() );
+ return $this->link(
+ SpecialPage::getTitleFor( 'Movepage' ),
+ wfMsg( 'movethispage' ),
+ array(),
+ array( 'target' => $this->mTitle->getPrefixedDBkey() ),
+ array( 'known', 'noclasses' )
+ );
} else {
// no message if page is protected - would be redundant
return '';
}
function historyLink() {
- return $this->link( $this->mTitle, wfMsgHtml( 'history' ),
- array( 'rel' => 'archives' ), array( 'action' => 'history' ) );
+ return $this->link(
+ $this->mTitle,
+ wfMsgHtml( 'history' ),
+ array( 'rel' => 'archives' ),
+ array( 'action' => 'history' )
+ );
}
function whatLinksHere() {
- return $this->makeKnownLinkObj(
+ return $this->link(
SpecialPage::getTitleFor( 'Whatlinkshere', $this->mTitle->getPrefixedDBkey() ),
- wfMsgHtml( 'whatlinkshere' ) );
+ wfMsgHtml( 'whatlinkshere' ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
}
function userContribsLink() {
- return $this->makeKnownLinkObj(
+ return $this->link(
SpecialPage::getTitleFor( 'Contributions', $this->mTitle->getDBkey() ),
- wfMsgHtml( 'contributions' ) );
+ wfMsgHtml( 'contributions' ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
}
function showEmailUser( $id ) {
}
function emailUserLink() {
- return $this->makeKnownLinkObj(
+ return $this->link(
SpecialPage::getTitleFor( 'Emailuser', $this->mTitle->getDBkey() ),
- wfMsg( 'emailuser' ) );
+ wfMsg( 'emailuser' ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
}
function watchPageLinksLink() {
if ( ! $wgOut->isArticleRelated() ) {
return '(' . wfMsg( 'notanarticle' ) . ')';
} else {
- return $this->makeKnownLinkObj(
+ return $this->link(
SpecialPage::getTitleFor( 'Recentchangeslinked', $this->mTitle->getPrefixedDBkey() ),
- wfMsg( 'recentchangeslinked' ) );
+ wfMsg( 'recentchangeslinked-toolbox' ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
}
}
$text = $wgContLang->getLanguageName( $nt->getInterwiki() );
if ( '' == $text ) { $text = $l; }
- $style = $this->getExternalLinkAttributes( $l, $text );
+ $style = $this->getExternalLinkAttributes();
$s .= "<a href=\"{$url}\"{$style}>{$text}</a>";
}
if( $wgContLang->isRTL() ) $s .= '</span>';
}
# __NEWSECTIONLINK___ changes behaviour here
- # If it's present, the link points to this page, otherwise
+ # If it is present, the link points to this page, otherwise
# it points to the talk page
if( $this->mTitle->isTalkPage() ) {
$title = $this->mTitle;
$title = $this->mTitle->getTalkPage();
}
- return $this->makeKnownLinkObj( $title, wfMsg( 'postcomment' ), 'action=edit§ion=new' );
+ return $this->link(
+ $title,
+ wfMsg( 'postcomment' ),
+ array(),
+ array(
+ 'action' => 'edit',
+ 'section' => 'new'
+ ),
+ array( 'known', 'noclasses' )
+ );
}
/* these are used extensively in SkinTemplate, but also some other places */
wfProfileOut( __METHOD__ );
return $bar;
}
-}
+
+ /**
+ * Should we include common/wikiprintable.css? Skins that have their own
+ * print stylesheet should override this and return false. (This is an
+ * ugly hack to get Monobook to play nicely with
+ * OutputPage::headElement().)
+ *
+ * @return bool
+ */
+ public function commonPrintStylesheet() {
+ return true;
+ }
+}
\ No newline at end of file
dépôts / lhc / web / wiklou.git / blobdiff