dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1520d01)
use js version of prefs toc
authorGabriel Wicke <gwicke@users.mediawiki.org>
Wed, 19 May 2004 21:06:02 +0000 (21:06 +0000)
committerGabriel Wicke <gwicke@users.mediawiki.org>
Wed, 19 May 2004 21:06:02 +0000 (21:06 +0000)
includes/SkinPHPTal.php patch | blob | history
templates/xhtml_slim.pt patch | blob | history

diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index cd0cd29..bf39da2 100644 (file)
--- 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 fb53223..f255a4d 100644 (file)
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -16,10 +16,9 @@
     <style tal:condition="usercss" type="text/css">/*<![CDATA[*/ ${usercss} /*]]>*/</style>
     <script tal:condition="userjs" type="text/javascript" tal:attributes="src userjs"></script><script 
       tal:condition="userjsprev" type="text/javascript">/*<![CDATA[*/${userjsprev}/*]]>*/</script>
-    ${customscript}
   </head>
 
-  <body tal:attributes="onload body-onload; ondblclick body-ondblclick|default">
+  <body tal:attributes="ondblclick body-ondblclick|default">
     <div id="globalWrapper">
       <div id="column-content">
        <div id="content">
Wiklou, le Wiki du Wiklou