*/
/**
- * 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.
- *
- * @param $out OutputPage
- */
- function initPage( OutputPage $out ) {
- parent::initPage( $out );
- $this->skinname = 'monobook';
- $this->stylename = 'monobook';
- $this->template = 'QuickTemplate';
- }
-
/**
* Add specific styles for this skin
*
*/
function setupSkinUserCss( OutputPage $out ){
$out->addStyle( 'common/shared.css', 'screen' );
- $out->addStyle( 'common/commonPrint.css', 'print' );
+ $out->addStyle( 'common/commonPrint.css', 'print' );
}
-
+ /* add specific javascript the base Skin class */
+ function setupSkinUserJs( OutputPage $out ){
+ global $wgUseSiteJs;
+ //use site js:
+ if( $wgUseSiteJs ) {
+ $jsCache = $this->loggedin ? '&smaxage=0' : '';
+ $siteGenScriptFile = self::makeUrl( '-',
+ "action=raw$jsCache&gen=js&useskin=" .
+ urlencode( $this->getSkinName() ) ) ;
+ $this->jsvarurl = $siteGenScriptFile;
+ }
+ }
+
/**
* Create the template engine object; we feed it a bunch of data
* and eventually it spits out some HTML. Should have interface
wfProfileIn( __METHOD__ . '-stuff' );
$this->thispage = $this->mTitle->getPrefixedDBkey();
$this->thisurl = $this->mTitle->getPrefixedURL();
- $query = $wgRequest->data;
+ $query = $wgRequest->getValues();
unset( $query['title'] );
- $this->thisquery = wfArrayToCGI( $query );
+ 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->setRef( 'jsmimetype', $wgJsMimeType );
$tpl->setRef( 'charset', $wgOutputEncoding );
$tpl->set( 'headlinks', $out->getHeadLinks() );
- $tpl->set( 'headscripts', $out->getScript() );
+
+ //moved headscripts to near end of template header output
+
$tpl->set( 'csslinks', $out->buildCssLinks() );
$tpl->setRef( 'wgScript', $wgScript );
$tpl->setRef( 'skinname', $this->skinname );
array( 'diff' => 'cur' ),
array( 'known', 'noclasses' )
);
+
+ $newmessagesnumber = $wgUser->getNewtalkNumber();
$ntl = wfMsg(
'youhavenewmessages',
$newmessageslink,
- $newmessagesdifflink
+ $newmessagesdifflink,
+ $newmessagesnumber
);
# Disable Cache
$out->setSquidMaxage( 0 );
$tpl->set( 'sidebar', $this->buildSidebar() );
$tpl->set( 'nav_urls', $this->buildNavUrls() );
+ //set the head script near the end (in case above actions result in adding 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 $wgOut, $wgRequest;
+ global $wgOut, $wgRequest, $wgUser, $wgLang;
$title = $wgOut->getTitle();
$pageurl = $title->getLocalURL();
/* 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,
'active' => ( $this->userpageUrlDetails['href'] == $pageurl )
);
$usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
+ if ( $wgUser->getNewtalk() ) {
+ # do not show text when we are viewing our
+ # own talk page
+ if( !$title->equals( $wgUser->getTalkPage() ) ) {
+ $newtalk = $wgUser->getNewtalkNumber();
+
+ # disable caching
+ $wgOut->setSquidMaxage( 0 );
+ $wgOut->enableClientCache( false );
+ }
+ else {
+ $newtalk = 0;
+ }
+ }
+ else {
+ $newtalk = 0;
+ }
$personal_urls['mytalk'] = array(
- 'text' => wfMsg( 'mytalk' ),
+ 'text' => wfMsg( 'mytalk', $newtalk ),
'href' => &$usertalkUrlDetails['href'],
'class' => $usertalkUrlDetails['exists'] ? false : 'new',
'active' => ( $usertalkUrlDetails['href'] == $pageurl )
$personal_urls['logout'] = array(
'text' => wfMsg( 'userlogout' ),
'href' => self::makeSpecialUrl( 'Userlogout',
- $title->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}&returntoquery={$this->thisquery}"
+ $title->isSpecial( 'Preferences' ) ? '' : $returnto
),
'active' => false
);
);
$personal_urls['anonlogin'] = array(
'text' => wfMsg( $loginlink ),
- 'href' => self::makeSpecialUrl( 'Userlogin', "returnto={$this->thisurl}&returntoquery={$this->thisquery}" ),
+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
'active' => $title->isSpecial( 'Userlogin' )
);
} else {
$personal_urls['login'] = array(
'text' => wfMsg( $loginlink ),
- 'href' => self::makeSpecialUrl( 'Userlogin', "returnto={$this->thisurl}&returntoquery={$this->thisquery}" ),
+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
'active' => $title->isSpecial( 'Userlogin' )
);
}
}
-
+
wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
wfProfileOut( __METHOD__ );
return $personal_urls;
'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
);
- // adds new section link if page is a current revision of a talk page or
+ // 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,
'text' => wfMsg( 'addsection' ),
'href' => $this->mTitle->getLocalUrl( 'action=edit§ion=new' )
- );
+ );
}
- }
+ }
} elseif ( $this->mTitle->isKnown() ) {
$content_actions['viewsource'] = array(
'class' => ($action == 'edit') ? 'selected' : false,
*/
function setupUserJs( $allowUserJs ) {
global $wgRequest, $wgJsMimeType;
-
wfProfileIn( __METHOD__ );
$action = $wgRequest->getVal( 'action', 'view' );
dépôts / lhc / web / wiklou.git / blobdiff