From: Gabriel Wicke Date: Wed, 19 May 2004 21:06:02 +0000 (+0000) Subject: use js version of prefs toc X-Git-Tag: 1.3.0beta1~33 X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=c2048d54225ef2c14bfd5d3e8e3ec98887fae1c1;p=lhc%2Fweb%2Fwiklou.git use js version of prefs toc --- diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php index cd0cd29be8..bf39da2599 100644 --- a/includes/SkinPHPTal.php +++ b/includes/SkinPHPTal.php @@ -29,8 +29,6 @@ require_once "GlobalFunctions.php"; require_once $IP."/PHPTAL-NP-0.7.0/libs/PHPTAL.php"; - require_once "TabbedCardSet.php"; - class MediaWiki_I18N extends PHPTAL_I18N { var $_context = array(); @@ -114,7 +112,6 @@ $tpl->setRef( 'mimetype', &$wgMimeType ); $tpl->setRef( 'charset', &$wgOutputEncoding ); $tpl->set( 'headlinks', $out->getHeadLinks() ); - $tpl->set( 'customscript', $out->getScript() ); $tpl->setRef( 'skinname', &$this->skinname ); $tpl->setRef( "loggedin", &$this->loggedin ); /* XXX currently unused, might get useful later @@ -199,7 +196,6 @@ } else { $tpl->set('body-ondblclick', false); } - $tpl->set( 'body-onload',$wgOut->getOnloadHandler() ); $tpl->set( "nav_urls", $this->buildNavUrls() ); // execute template @@ -549,7 +545,6 @@ return wfMsg('nstab-main'); } } - /* private */ function setupUserCssJs () { global $wgRequest, $wgTitle; $action = $wgRequest->getText('action'); @@ -567,14 +562,6 @@ $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype=text/javascript'); } } - - // Overload the Skin::newCardSet function to replace - // the default CardSet widget - function newCardSet( $title = "") - { - return new TabbedCardSet( $title ); - } - } class SkinDaVinci extends SkinPHPTal { diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt index fb53223185..f255a4df0c 100644 --- a/templates/xhtml_slim.pt +++ b/templates/xhtml_slim.pt @@ -16,10 +16,9 @@ - ${customscript} - +