}
return $wgValidSkinNames;
}
-
+
/**
* Fetch the list of usable skins in regards to $wgSkipSkins.
* Useful for Special:Preferences and other places where you
$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() );
}
static function makeVariablesScript( $data ) {
- global $wgJsMimeType;
-
- $doneFirstVar = false;
- $r = array( "<script type=\"$wgJsMimeType\">/*<![CDATA[*/\n" );
- foreach ( $data as $name => $value ) {
- $encValue = Xml::encodeJsVar( $value );
- if ( $doneFirstVar )
- $r[] = ",\n$name=$encValue";
- else {
- $r[] = "var $name=$encValue";
- $doneFirstVar = true;
- }
+ if( $data ) {
+ $r = array();
+ foreach ( $data as $name => $value ) {
+ $encValue = Xml::encodeJsVar( $value );
+ $r[] = "$name=$encValue";
+ }
+ $js = 'var ' . implode( ",\n", $r ) . ';';
+ return Html::inlineScript( "\n$js\n" );
+ } else {
+ return '';
}
- # No need for ; since the script is terminating
- $r[] = "\n/*]]>*/</script>\n";
-
- return implode( $r );
}
/**
$skinName = $skinName['skinname'];
}
global $wgScript, $wgTitle, $wgStylePath, $wgUser;
- global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang, $wgVariant;
+ global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
global $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
global $wgUseAjax, $wgAjaxWatch;
implode( "\t", $digitTransTable ),
);
+ $mainPage = Title::newFromText( wfMsgForContent( 'mainpage' ) );
$vars = array(
'skin' => $skinName,
'stylepath' => $wgStylePath,
'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,
'wgEnableWriteAPI' => $wgEnableWriteAPI,
'wgSeparatorTransformTable' => $compactSeparatorTransTable,
'wgDigitTransformTable' => $compactDigitTransTable,
+ 'wgMainPageTitle' => $mainPage ? $mainPage->getPrefixedText() : null,
);
- if ( !( $wgContLang->hasVariants() ) ) {
- unset( $vars['wgUserVariant'] );
+ if ( $wgContLang->hasVariants() ) {
+ $vars['wgUserVariant'] = $wgContLang->getPreferredVariant();
+ }
+
+ //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
* various files. This entire hackish system needs to be burned to the
* ground and rebuilt.
*
- * @var $allowUserJs bool Should probably be identical to $wgAllowUserJs,
- * but is passed as a local variable for some
- * obscure reason.
- * @var $extraHtml string A bunch of raw HTML to jam into some arbitrary
- * place where MonoBook has historically wanted it.
- * Old-style skins formerly put it in a different
- * place, but if either of those is broken it's
- * likely to be the old-style skins.
- * @return string Raw HTML to output in some location in the <head> that's
- * entirely arbitrary but which will probably break
- * everything if you put it someplace else.
+ * @param $out OutputPage object, should be $wgOut
+ *
+ * @return string Raw HTML to output to <head>
*/
- function getHeadScripts( $allowUserJs, $extraHtml = '' ) {
- global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion;
+ function getHeadScripts( OutputPage $out ) {
+ global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion, $wgOut;
+ global $wgUseSiteJs;
$vars = self::makeGlobalVariablesScript( $this->getSkinName() );
- $r = array( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>\n$extraHtml" );
- 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() ) ) ) .
- "\"></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" . implode ( "\n\t", $r );
+ return $vars . "\n" . $out->mScripts;
}
/**
return false;
if( !$wgRequest->wasPosted() )
return false;
- if( !$this->mTitle->userCanEditCssJsSubpage() )
+ if( !$this->mTitle->userCanEditCssSubpage() )
+ return false;
+ if( !$this->mTitle->userCanEditJsSubpage() )
return false;
return $wgUser->matchEditToken(
$wgRequest->getVal( 'wpEditToken' ) );
* 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;
}
);
// Add any extension CSS
- foreach( $out->getExtStyle() as $tag ) {
- $out->addStyle( $tag['href'] );
+ foreach ( $out->getExtStyle() as $url ) {
+ $out->addStyle( $url );
}
// If we use the site's dynamic CSS, throw that in, too
$a['onload'] = $wgOut->getOnloadHandler();
$a['class'] =
'mediawiki' .
- ' '.( $wgContLang->isRTL() ? 'rtl' : 'ltr' ).
+ ' '.( $wgContLang->getDir() ).
' '.$this->getPageClasses( $this->mTitle ) .
' skin-'. Sanitizer::escapeClass( $this->getSkinName() );
return $a;
}
-
+
function getPageClasses( $title ) {
$numeric = 'ns-'.$title->getNamespace();
if( $title->getNamespace() == NS_SPECIAL ) {
} elseif( $left ) {
$s .= $this->getQuickbarCompensator( $rows );
}
- $l = $wgContLang->isRTL() ? 'right' : 'left';
+ $l = $wgContLang->alignStart();
$s .= "<td {$borderhack} align='$l' valign='top'>\n";
$s .= $this->topLinks();
$s .= "<p class='subtitle'>" . $this->pageTitleLinks() . "</p>\n";
- $r = $wgContLang->isRTL() ? 'left' : 'right';
+ $r = $wgContLang->alignEnd();
$s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
$s .= $this->nameAndLogin();
$s .= "\n<br />" . $this->searchForm() . "</td>";
// Use Unicode bidi embedding override characters,
// to make sure links don't smash each other up in ugly ways.
- $dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
+ $dir = $wgContLang->getDir();
$embed = "<span dir='$dir'>";
$pop = '</span>';
$classes = 'catlinks';
- if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false &&
- strpos( $catlinks, '<div id="mw-hidden-catlinks" class="mw-hidden-cats-hidden">' ) !== false ) {
+ if( strpos( $catlinks, '<div id="mw-normal-catlinks">' ) === false ) {
$classes .= ' catlinks-allhidden';
}
- if( !empty( $catlinks ) ){
- return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
- }
+ return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
}
function getQuickbarCompensator( $rows = 1 ) {
* @return String HTML-wrapped JS code to be put before </body>
*/
function bottomScripts() {
- global $wgJsMimeType;
- $bottomScriptText = "\n\t\t<script type=\"$wgJsMimeType\">if (window.runOnloadHook) runOnloadHook();</script>\n";
+ $bottomScriptText = "\n" . Html::inlineScript( 'if (window.runOnloadHook) runOnloadHook();' ) . "\n";
wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
return $bottomScriptText;
}
$s = array();
- if ( !$wgRequest->getBool( 'printable' ) ) {
+ if ( !$wgOut->isPrintable() ) {
$printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
$s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
}
$element[] = $this->emailUserLink();
}
}
-
+
$s = implode( $element, $sep );
if ( $this->mTitle->getArticleId() ) {
// 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;
}
$out .= '<a href="'.$url.'">';
}
$text = htmlspecialchars( $wgRightsText );
- $out .= "<img src=\"$icon\" alt='$text' />";
+ $out .= "<img src=\"$icon\" alt=\"$text\" width=\"88\" height=\"31\" />";
if ( $wgRightsUrl ) {
$out .= '</a>';
}
function getPoweredBy() {
global $wgStylePath;
$url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
- $img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" alt="Powered by MediaWiki" /></a>';
+ $img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" height="31" width="88" alt="Powered by MediaWiki" /></a>';
return $img;
}
return $s;
}
- function copyrightLink() {
- $title = Title::newFromText( wfMsgForContent( 'copyrightpage' ) );
- $s = $this->linkKnown(
- $title,
- wfMsg( 'copyrightpagename' )
- );
- return $s;
- }
-
private function footerLink ( $desc, $page ) {
// if the link description has been set to "-" in the default language,
if ( wfMsgForContent( $desc ) == '-') {
function editUrlOptions() {
global $wgArticle;
- $options = array( 'action' => 'edit' );
+ $options = array( 'action' => 'edit' );
if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
$options['oldid'] = intval( $this->mRevisionId );
SpecialPage::getTitleFor( 'Movepage' ),
wfMsg( 'movethispage' ),
array(),
- array( 'target' => $this->mTitle->getPrefixedURL() ),
+ array( 'target' => $this->mTitle->getPrefixedDBkey() ),
array( 'known', 'noclasses' )
);
} else {
}
/**
- * 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
+ * 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
dépôts / lhc / web / wiklou.git / blobdiff