From 644f8a0acc834e552dd5b9b14dac485f33b2f8ba Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 18 Feb 2006 04:34:10 +0000
Subject: [PATCH] * Remove legacy PHPTal code, hasn't been maintained in ages.
 * Tweak UserLogin include order for APC issue

---
 RELEASE-NOTES                    |   2 +
 includes/Skin.php                |  10 +-
 includes/SkinPHPTal.php          | 150 ----------------------------
 includes/SkinTemplate.php        |   9 +-
 includes/SpecialUserlogin.php    |   1 +
 skins/disabled/Amethyst.php      |  33 -------
 skins/disabled/Amethyst.pt       | 151 ----------------------------
 skins/disabled/Chick.php         |  34 -------
 skins/disabled/Chick.pt          | 100 -------------------
 skins/disabled/MonoBook.pt       | 142 --------------------------
 skins/disabled/MonoBookTal.php   |  44 ---------
 skins/disabled/WikimediaWiki.php |  94 ------------------
 skins/disabled/WikimediaWiki.pt  | 165 -------------------------------
 13 files changed, 8 insertions(+), 927 deletions(-)
 delete mode 100644 includes/SkinPHPTal.php
 delete mode 100644 skins/disabled/Amethyst.php
 delete mode 100644 skins/disabled/Amethyst.pt
 delete mode 100644 skins/disabled/Chick.php
 delete mode 100644 skins/disabled/Chick.pt
 delete mode 100644 skins/disabled/MonoBook.pt
 delete mode 100644 skins/disabled/MonoBookTal.php
 delete mode 100644 skins/disabled/WikimediaWiki.php
 delete mode 100644 skins/disabled/WikimediaWiki.pt

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 277665f8fa..6f1f4544e1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -628,6 +628,8 @@ fully support the editing toolbar, but was found to be too confusing.
 * Fix missing bad title check in Special:Booksources
 * Remove empty booksources string in fy
 * Avoid corrupting <gallery> inside <!-- comment -->
+* Remove legacy PHPTal code, hasn't been maintained in ages.
+* Tweak Userlogin include order for APC issue
 
 
 === Caveats ===
diff --git a/includes/Skin.php b/includes/Skin.php
index b2e56dfa61..c0b7ba1d46 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -31,8 +31,7 @@ $skinDir->close();
 unset($matches);
 
 /**
- * The main skin class that provide methods and properties for all other skins
- * including PHPTal skins.
+ * The main skin class that provide methods and properties for all other skins.
  * This base class is also the "Standard" skin.
  * @package MediaWiki
  */
@@ -114,8 +113,7 @@ class Skin extends Linker {
 
 		global $IP;
 
-		# Grab the skin class and initialise it. Each skin checks for PHPTal
-		# and will not load if it's not enabled.
+		# Grab the skin class and initialise it.
 		wfSuppressWarnings();
 		// Preload base classes to work around APC/PHP5 bug
 		include_once( $IP.'/skins/'.$skinName.'.deps.php' );
@@ -275,7 +273,7 @@ class Skin extends Linker {
 			$wgRequest->getVal( 'wpEditToken' ) );
 	}
 
-	# get the user/site-specific stylesheet, SkinPHPTal called from RawPage.php (settings are cached that way)
+	# get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way)
 	function getUserStylesheet() {
 		global $wgOut, $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage;
 		$sheet = $this->getStylesheet();
@@ -1328,7 +1326,7 @@ END;
 			wfMsg( 'postcomment' ), 'action=edit&section=new' );
 	}
 
-	/* these are used extensively in SkinPHPTal, but also some other places */
+	/* these are used extensively in SkinTemplate, but also some other places */
 	/*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
 		$title = Title::makeTitle( NS_SPECIAL, $name );
 		return $title->getLocalURL( $urlaction );
diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
deleted file mode 100644
index 286733ee9e..0000000000
--- a/includes/SkinPHPTal.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-if ( ! defined( 'MEDIAWIKI' ) )
-	die( -1 );
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
-/**
- * Generic PHPTal (http://phptal.sourceforge.net/) skin
- * Based on Brion's smarty skin
- * Copyright (C) Gabriel Wicke -- http://www.aulinx.de/
- *
- * The guts of this have moved to SkinTemplate.php
- *
- * Make sure the appropriate version of PHPTAL is installed (0.7.0 for PHP4,
- * or 1.0.0 for PHP5) and available in the include_path. The system PEAR
- * directory is good.
- *
- * If PEAR or PHPTAL can't be loaded, it will try to gracefully fall back.
- * Turn on MediaWiki's debug log to see it complain.
- *
- * @package MediaWiki
- * @subpackage Skins
- */
-
-require_once 'GlobalFunctions.php';
-require_once 'SkinTemplate.php';
-
-if( version_compare( phpversion(), "5.0", "lt" ) ) {
-	define( 'OLD_PHPTAL', true );
-	# PEAR and PHPTAL 0.7.x must be installed and in include_path
-} else {
-	define( 'NEW_PHPTAL', true );
-	# PEAR and PHPTAL 1.0.x must be installed and in include_path
-}
-
-@include_once 'PEAR.php';
-if( !class_exists( 'PEAR' ) ) {
-	wfDebug( 'PHPTAL-based skin couldn\'t include PEAR.php' );
-} else {
-
-// PHPTAL may be in the libs dir direct, or under HTML/Template.
-// Try them both to be safe.
-@include_once 'HTML/Template/PHPTAL.php';
-if( !class_exists( 'PHPTAL' ) ) {
-	@include_once 'PHPTAL.php';
-}
-
-if( !class_exists( 'PHPTAL' ) ) {
-	wfDebug( 'PHPTAL-based skin couldn\'t include PHPTAL.php' );
-} else {
-
-/**
- *
- * @package MediaWiki
- */
-class SkinPHPTal extends SkinTemplate {
-	/** */
-	function initPage( &$out ) {
-		parent::initPage( $out );
-		$this->skinname  = 'monobook';
-		$this->stylename = 'monobook';
-		$this->template  = 'MonoBook';
-	}
-
-	/**
-	 * If using PHPTAL 0.7 on PHP 4.x, return a PHPTAL template object.
-	 * If using PHPTAL 1.0 on PHP 5.x, return a bridge object.
-	 * @return object
-	 * @access private
-	 */
-	function &setupTemplate( $file, $repository=false, $cache_dir=false ) {
-		if( defined( 'NEW_PHPTAL' ) ) {
-			return new PHPTAL_version_bridge( $file . '.pt', $repository, $cache_dir );
-		} else {
-			return new PHPTAL( $file . '.pt', $repository, $cache_dir );
-		}
-	}
-
-	/**
-	 * Output the string, or print error message if it's
-	 * an error object of the appropriate type.
-	 *
-	 * @param mixed $str
-	 * @access private
-	 */
-	function printOrError( &$str ) {
-		if( PEAR::isError( $str ) ) {
-			echo $str->toString(), "\n";
-		} else {
-			echo $str;
-		}
-	}
-}
-
-/**
- * @todo document
- * @package MediaWiki
- * @subpackage Skins
- */
-class PHPTAL_version_bridge {
-	function PHPTAL_version_bridge( $file, $repository=false, $cache_dir=false ) {
-		$this->tpl =& new PHPTAL( $file );
-		if( $repository ) {
-			$this->tpl->setTemplateRepository( $repository );
-		}
-	}
-
-	function set( $name, $value ) {
-		$this->tpl->$name = $value;
-	}
-
-	function setRef($name, &$value) {
-		$this->set( $name, $value );
-	}
-
-	function setTranslator( &$t ) {
-		$this->tpl->setTranslator( $t );
-	}
-
-	function execute() {
-		/*
-		try {
-		*/
-			return $this->tpl->execute();
-		/*
-		}
-		catch (Exception $e) {
-			echo "<div class='error' style='background: white; white-space: pre; position: absolute; z-index: 9999; border: solid 2px black; padding: 4px;'>We caught an exception...\n ";
-			echo $e;
-			echo "</div>";
-		}
-		*/
-	}
-}
-
-} // end of if( class_exists( 'PHPTAL' ) )
-} // end of if( class_exists( 'PEAR' ) )
-?>
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 604425161d..04c4882bfe 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -27,10 +27,6 @@ if ( ! defined( 'MEDIAWIKI' ) )
  * to the computations individual esi snippets need. Most importantly no body
  * parsing for most of those of course.
  *
- * PHPTAL support has been moved to a subclass in SkinPHPTal.php,
- * and is optional. You'll need to install PHPTAL manually to use
- * skins that depend on it.
- *
  * @package MediaWiki
  * @subpackage Skins
  */
@@ -96,9 +92,6 @@ class SkinTemplate extends Skin {
 	/**
 	 * For QuickTemplate, the name of the subclass which
 	 * will actually fill the template.
-	 *
-	 * In PHPTal mode, name of PHPTal template to be used.
-	 * '.pt' will be automaticly added to it on PHPTAL object creation
 	 */
 	var $template;
 
@@ -327,7 +320,7 @@ class SkinTemplate extends Skin {
 				$sql = "SELECT COUNT(*) AS n FROM $watchlist
 					WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBKey()) .
 					"' AND  wl_namespace=" . $this->mTitle->getNamespace() ;
-				$res = $dbr->query( $sql, 'SkinPHPTal::outputPage');
+				$res = $dbr->query( $sql, 'SkinTemplate::outputPage');
 				$x = $dbr->fetchObject( $res );
 				$numberofwatchingusers = $x->n;
 				if ($numberofwatchingusers > 0) {
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 591fd32d26..a9b4d5cd1a 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -459,6 +459,7 @@ class LoginForm {
 
 		$titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
 
+		require_once( 'SkinTemplate.php' );
 		require_once( 'templates/Userlogin.php' );
 
 		if ( $this->mType == 'signup' ) {
diff --git a/skins/disabled/Amethyst.php b/skins/disabled/Amethyst.php
deleted file mode 100644
index c97d679839..0000000000
--- a/skins/disabled/Amethyst.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Amethyst
- *
- * Reuse the MonoBook template (originally a plone style
- * ported on MediaWiki by Gabriel Wicke).
- *
- * @todo document
- * @subpackage Skins
- */
-
-if( !defined( 'MEDIAWIKI' ) )
-	die( -1 );
-
-/** Skin reuse monobook template */
-require_once('MonoBook.php');
-
-/**
- * Inherit main code from SkinTemplate, set the CSS and template filter.
- * @todo document
- * @subpackage Skins
- */
-class SkinAmethyst extends SkinTemplate {
-	/** Using monobook. */
-	function initPage( &$out ) {
-		SkinTemplate::initPage( $out );
-		$this->skinname  = 'amethyst';
-		$this->stylename = 'amethyst';
-		$this->template  = 'MonobookTemplate';
-	}
-}
-
-?>
diff --git a/skins/disabled/Amethyst.pt b/skins/disabled/Amethyst.pt
deleted file mode 100644
index 58f90f20c2..0000000000
--- a/skins/disabled/Amethyst.pt
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${lang}" lang="${lang}" dir="${dir}">
-  <head>
-    <meta http-equiv="Content-Type" content="${mimetype}; charset=${charset}" />
-    ${headlinks}
-    <title tal:content="pagetitle">Exciting xhtml slimfast</title>
-    <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "${stylepath}/${stylename}/main.css"; /*]]>*/</style>
-    <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/common/commonPrint.css" />
-    <!--[if IE]><style type="text/css" media="all">@import "${stylepath}/${stylename}/IEFixes.css";</style>
-    <script type="${jsmimetype}" src="${stylepath}/common/IEFixes.js"></script>
-    <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-    <script tal:condition="jsvarurl" type="${jsmimetype}" tal:attributes="src jsvarurl"></script>
-    <script type="${jsmimetype}" src="${stylepath}/common/wikibits.js"></script>
-    <style tal:condition="usercss" type="text/css">/*<![CDATA[*/ ${usercss} /*]]>*/</style>
-    <script tal:condition="userjs" type="${jsmimetype}" tal:attributes="src userjs"></script><script 
-      tal:condition="userjsprev" type="${jsmimetype}">/*<![CDATA[*/${userjsprev}/*]]>*/</script>
-  </head>
-  <body tal:attributes="ondblclick body-ondblclick|default; class nsclass|default">
-    <div id="globalWrapper">
-      <div id="column-content">
-	<div id="content">
-	  <a name="top" id="top"></a>
-	  <div id="siteNotice" tal:condition="sitenotice" tal:content="structure sitenotice"></div>
-	  <h1 class="firstHeading" tal:content="title">Leonardo da Vinci</h1>
-	  <div id="bodyContent">
-	    <h3 id="siteSub" i18n:translate="string:tagline">From Wikipedia, the free encyclopedia.</h3>
-	    <div id="contentSub" tal:content="structure subtitle"></div>
-	    <div id="contentSub" tal:condition="undelete" tal:content="structure undelete"></div>
-	    <div tal:condition="newtalk" class="usermessage" tal:content="structure newtalk"></div>
-	    <!-- start content -->
-	    ${bodytext}
-	    <div tal:condition="catlinks" id="catlinks" tal:content="structure catlinks"></div>
-	    <!-- end content -->
-	    <div class="visualClear"></div>
-	  </div>
-	</div>
-      </div>
-      <div id="column-one">
-	<div id="p-cactions" class="portlet">
-	  <h5>Views</h5>
-	  <ul>
-	    <li tal:repeat="action content_actions" 
-	    tal:attributes="id string:ca-${repeat/action/key}; class action/class|default"><a
-	      tal:attributes="href action/href|default"
-	      tal:content="action/text">Linktext</a></li>
-	  </ul>
-	</div>
-	<div class="portlet" id="p-personal">
-	  <h5 i18n:translate="string:personaltools">Personal Tools</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li tal:repeat="item personal_urls" 
-	      tal:attributes="id string:pt-${repeat/item/key};"><a href="myuserpage"
-		tal:attributes="href item/href; class item/class|default"
-		tal:content="item/text">Log in</a></li>
-	    </ul>
-	  </div>
-	</div>
-	<div class="portlet" id="p-logo">
-	  <a style="background-image: url(${logopath});" href="${nav_urls/mainpage/href}" i18n:attributes="title string:mainpage"></a>
-	</div>
-	<script type="${jsmimetype}"> if (window.isMSIE55) fixalpha(); </script>
-	<div class="portlet" id="p-navigation">
-	  <h5 i18n:translate="string:navigation">Navigation</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li id="n-mainpage"><a href="${nav_urls/mainpage/href}"
-		i18n:translate="string:mainpage">Main Page</a></li>
-	      <li id="n-portal" tal:condition="nav_urls/portal/href"><a href="${nav_urls/portal/href}"
-		i18n:translate="string:portal">Community Portal</a></li>
-	      <li id="n-currentevents" tal:condition="nav_urls/currentevents/href"><a href="${nav_urls/currentevents/href}"
-		i18n:translate="string:currentevents">Current Events</a></li>
-	      <li id="n-recentchanges"><a href="${nav_urls/recentchanges/href}"
-		i18n:translate="string:recentchanges">Recent Changes</a></li>
-	      <li id="n-randompage"><a href="${nav_urls/randompage/href}"
-		i18n:translate="string:randompage">Random Page</a></li>
-	      <li id="n-help"><a href="${nav_urls/help/href}"
-		i18n:translate="string:help">Help</a></li>
-	      <li id="n-sitesupport" tal:condition="nav_urls/sitesupport/href"><a href="${nav_urls/sitesupport/href}"
-		i18n:translate="string:sitesupport">Donations</a></li>
-	    </ul>
-	  </div>
-	</div>
-	<div id="p-search" class="portlet">
-	  <h5 i18n:translate="string:search">Search</h5>
-	  <div class="pBody">
-	    <form name="searchform" action="${searchaction}" id="searchform">
-	      <input id="searchInput" name="search" type="text"
-	      i18n:attributes="accesskey string:accesskey-search | default"/>
-	      <input type='submit' name="go" value="Go" class="searchButton" 
-	      i18n:attributes="value string:go"/>&nbsp;<input type='submit' name="fulltext"
-	      value="Search" class="searchButton"
-	      i18n:attributes="value string:search"/>
-	    </form>
-	  </div>
-	</div>
-	<div class="portlet" id="p-tb">
-	  <h5 i18n:translate="string:toolbox">Toolbox</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li id="t-whatlinkshere" tal:condition="notspecialpage"><a href="${nav_urls/whatlinkshere/href}"
-		i18n:translate="string:whatlinkshere">What links here</a></li>
-	      <li id="t-recentchangeslinked" tal:condition="notspecialpage"><a href="${nav_urls/recentchangeslinked/href}"
-		i18n:translate="string:recentchangeslinked">Related Changes</a></li>
-	      <li tal:condition="feeds" id="feedlinks">
-	      <span i18n:translate="string:feedlinks">Feeds:</span>
-	      <span tal:repeat="feed feeds" 
-		tal:attributes="id string:feed-${repeat/feed/key};"><a 
-		  tal:attributes="href feed/href;"
-		  tal:content="feed/text">rss</a>&nbsp;</span>
-	      </li>
-	      <li id="t-contributions" tal:condition="nav_urls/contributions/href"><a href="${nav_urls/contributions/href}"
-		i18n:translate="string:contributions">Contributions</a></li>
-	      <li id="t-emailuser" tal:condition="nav_urls/emailuser/href"><a href="${nav_urls/emailuser/href}"
-		i18n:translate="string:emailuser">Email this user</a></li>
-	      <li id="t-upload" tal:condition="nav_urls/upload/href"><a href="${nav_urls/upload/href}"
-		i18n:translate="string:upload">Upload a file</a></li>
-	      <li id="t-specialpages"><a href="${nav_urls/specialpages/href}"
-		i18n:translate="string:specialpages">Special Pages</a></li>
-	    </ul>
-	  </div>
-	</div>
-	<div id="p-lang" class="portlet" tal:condition="language_urls">
-	  <h5 i18n:translate="string:otherlanguages">Language</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li tal:repeat="langlink language_urls">
-	      <a tal:attributes="href langlink/href"
-		tal:content="structure langlink/text">English</a>
-	      </li>
-	    </ul>
-	  </div>
-	</div>
-      </div><!-- end of the left (by default at least) column -->
-      <div class="visualClear"></div>
-      <div id="footer">
-	<div id="f-poweredbyico" tal:condition="poweredbyico">${poweredbyico}</div>
-	<div id="f-copyrightico" tal:condition="copyrightico">${copyrightico}</div>
-	<ul id="f-list">
-	  <li id="f-lastmod" tal:condition="lastmod">${lastmod}</li>
-	  <li id="f-viewcount" tal:condition="viewcount">${viewcount}</li>
-	  <li id="f-credits" tal:condition="credits">${credits}</li>
-	  <li id="f-copyright" tal:condition="copyright">${copyright}</li>
-	  <li id="f-about" tal:condition="about">${about}</li>
-	  <li id="f-disclaimer" tal:condition="disclaimer">${disclaimer}</li>
-	</ul>
-      </div>
-    </div>
-    ${reporttime}
-  </body>
-</html>
diff --git a/skins/disabled/Chick.php b/skins/disabled/Chick.php
deleted file mode 100644
index 8f3a42ee06..0000000000
--- a/skins/disabled/Chick.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * See skin.txt
- *
- * @todo document
- * @package MediaWiki
- * @subpackage Skins
- */
-
-if( !defined( 'MEDIAWIKI' ) )
-	die( -1 );
-
-/** */
-require_once('includes/SkinPHPTal.php');
-if( class_exists( 'SkinPHPTal' ) ) {
-
-/**
- * See skin.txt
- *
- * @todo document
- * @package MediaWiki
- * @subpackage Skins
- */
-class SkinChick extends SkinPHPTal {
-	function initPage( &$out ) {
-		SkinPHPTal::initPage( $out );
-		$this->skinname = 'chick';
-		$this->template = 'Chick';
-	}
-	function printSource() { return ''; }
-}
-
-}
-?>
diff --git a/skins/disabled/Chick.pt b/skins/disabled/Chick.pt
deleted file mode 100644
index a1ce3359f4..0000000000
--- a/skins/disabled/Chick.pt
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${lang}" lang="${lang}" dir="${dir}">
-  <head>
-    <meta http-equiv="Content-Type" content="${mimetype}; charset=${charset}" />
-    <div tal:replace="structure headlinks"></div>
-    <title tal:content="pagetitle">Exciting xhtml slimfast</title>
-    <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "${stylepath}/${stylename}/main.css"; /*]]>*/</style>
-    <script tal:condition="jsvarurl" type="${jsmimetype}" tal:attributes="src jsvarurl"></script>
-    <script type="${jsmimetype}" src="${stylepath}/common/wikibits.js"></script>
-    <style tal:condition="usercss" tal:content="structure usercss" type="text/css"></style>
-    <script tal:condition="userjs" type="${jsmimetype}" tal:attributes="src userjs"></script><script 
-      tal:condition="userjsprev" tal:content="structure userjsprev" type="${jsmimetype}"></script>
-  </head>
-  <body>
-    <a name="top"></a>
-    <div class="searchBox">
-      <form name="searchform" action="${searchaction}" id="searchform">
-        <input id="searchInput" name="search" type="text" size="15"
-        i18n:attributes="accesskey string:accesskey-search | default" />
-        <input type='submit' name="go" value="Go" class="searchButton"
-        i18n:attributes="value string:go" />&nbsp;<input type='submit' name="fulltext"
-        value="Search" class="searchButton" i18n:attributes="value string:search" />
-      </form>
-    </div>
-    <div id="siteNotice" tal:condition="sitenotice" tal:content="structure sitenotice"></div>
-    <h1 class="firstHeading" tal:content="title">Leonardo da Vinci</h1>
-    <div id="siteSub" i18n:translate="string:tagline">From Wikipedia, the free encyclopedia.</div>
-    <div id="contentSub" tal:content="structure subtitle"></div>
-    <div id="contentUndel" tal:condition="undelete" tal:content="structure undelete"></div>
-    <div tal:condition="newtalk" class="usermessage" tal:content="structure newtalk"></div>
-    <div tal:condition="catlinks" id="catlinks" tal:content="structure catlinks"></div>
-    <!-- start content -->
-	    <div tal:replace="structure bodytext"></div>
-    <!-- end content -->
-    <hr />
-
-    <div id="p-cactions" class="portlet">
-      <strong>Views:</strong>
-      <span tal:repeat="action content_actions"> <a
-         tal:attributes="id string:ca-${repeat/action/key}; class action/class|default;
-            href action/href|default" tal:content="action/text">Linktext</a> </span>
-    </div>
-
-    <div class="portlet" id="p-personal">
-      <strong><span i18n:translate="string:personaltools">Personal Tools</span>:</strong>
-      <span tal:repeat="item personal_urls"> <a
-         tal:attributes="id string:pt-${repeat/item/key}; href item/href;
-            class item/class|default" tal:content="item/text">Log in</a> </span>
-    </div>
-
-    <div class="portlet" id="p-navigation">
-      <strong><span i18n:translate="string:navigation">Navigation</span>:</strong>
-      <a href="${nav_urls/mainpage/href}" i18n:translate="string:mainpage">Main Page</a>
-      <a href="${nav_urls/portal/href}" i18n:translate="string:portal">Community Portal</a>
-      <a href="${nav_urls/currentevents/href}" i18n:translate="string:currentevents">Current Events</a>
-      <a href="${nav_urls/recentchanges/href}" i18n:translate="string:recentchanges">Recent Changes</a>
-      <a href="${nav_urls/randompage/href}" i18n:translate="string:randompage">Random Page</a>
-      <a href="${nav_urls/help/href}" i18n:translate="string:help">Help</a>
-      <a tal:condition="nav_urls/sitesupport/href" href="${nav_urls/sitesupport/href}"
-        i18n:translate="string:sitesupport">Donations</a>
-    </div>
-
-    <div class="portlet" id="p-tb">
-      <strong><span i18n:translate="string:toolbox">Toolbox</span>:</strong>
-      <a href="${nav_urls/whatlinkshere/href}" tal:condition="notspecialpage" i18n:translate="string:whatlinkshere">What links here</a>
-      <a href="${nav_urls/recentchangeslinked/href}" tal:condition="notspecialpage" i18n:translate="string:recentchangeslinked">Related Changes</a>
-      <span tal:condition="feeds" id="feedlinks">
-        <span i18n:translate="string:feedlinks">Feeds:</span>
-        <span tal:repeat="feed feeds"> <a tal:attributes="id string:feed-${repeat/feed/key};
-              href feed/href;" tal:content="feed/text">rss</a> </span>
-      </span>
-      <a tal:condition="nav_urls/contributions/href" href="${nav_urls/contributions/href}" i18n:translate="string:contributions">Contributions</a>
-      <a tal:condition="nav_urls/emailuser/href" href="${nav_urls/emailuser/href}" i18n:translate="string:emailuser">Email this user</a>
-      <a tal:condition="loggedin" href="${nav_urls/upload/href}" i18n:translate="string:upload">Upload a file</a>
-      <a href="${nav_urls/specialpages/href}" i18n:translate="string:specialpages">Special Pages</a>
-    </div>
-
-    <div id="p-lang" class="portlet" tal:condition="language_urls">
-      <strong><span i18n:translate="string:otherlanguages">Other languages</span>:</strong>
-      <span tal:repeat="langlink language_urls"> <a tal:attributes="href langlink/href"
-         tal:content="structure langlink/text">English</a> </span>
-    </div>
-
-    <hr style="clear: both;" />
-
-    <div id="footer">
-      <span tal:condition="poweredbyico" tal:content="structure poweredbyico"></span>
-      <span tal:condition="copyrightico" tal:content="structure copyrightico"></span>
-      <ul id="f-list">
-	  <li id="f-lastmod" tal:condition="lastmod" tal:content="structure lastmod"></li>
-	  <li id="f-viewcount" tal:condition="viewcount" tal:content="structure viewcount"></li>
-	  <li id="f-credits" tal:condition="credits" tal:content="structure credits"></li>
-	  <li id="f-copyright" tal:condition="copyright" tal:content="structure copyright"></li>
-	  <li id="f-about" tal:condition="about" tal:content="structure about"></li>
-	  <li id="f-disclaimer" tal:condition="disclaimer" tal:content="structure disclaimer"></li>
-      </ul>
-    </div>
-    <div tal:replace="structure reporttime"></div>
-  </body>
-</html>
diff --git a/skins/disabled/MonoBook.pt b/skins/disabled/MonoBook.pt
deleted file mode 100644
index 062fece424..0000000000
--- a/skins/disabled/MonoBook.pt
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${lang}" lang="${lang}" dir="${dir}">
-  <head>
-    <meta http-equiv="Content-Type" content="${mimetype}; charset=${charset}" />
-    <div tal:replace="structure headlinks"></div>
-    <title tal:content="pagetitle">Exciting xhtml slimfast</title>
-    <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "${stylepath}/${stylename}/main.css"; /*]]>*/</style>
-    <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/common/commonPrint.css" />
-    <!--[if lt IE 5.5000]><style type="text/css"> @import "${stylepath}/${stylename}/IE50Fixes.css"; </style><![endif]-->
-    <!--[if IE 5.5000]><style type="text/css"> @import "${stylepath}/${stylename}/IE55Fixes.css"; </style><![endif]-->
-    <!--[if gte IE 6]><style type="text/css"> @import "${stylepath}/${stylename}/IE60Fixes.css"; </style><![endif]-->
-    <!--[if IE]><script type="${jsmimetype}" src="${stylepath}/common/IEFixes.js"></script>
-    <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-    <script tal:condition="jsvarurl" type="${jsmimetype}" tal:attributes="src jsvarurl"></script>
-    <script type="${jsmimetype}" src="${stylepath}/common/wikibits.js"></script>
-    <style tal:condition="usercss" tal:content="structure usercss" type="text/css"></style>
-    <script tal:condition="userjs" type="${jsmimetype}" tal:attributes="src userjs"></script><script 
-      tal:condition="userjsprev" tal:content="structure userjsprev" type="${jsmimetype}"></script>
-  </head>
-  <body tal:attributes="ondblclick body_ondblclick|default; class nsclass|default">
-    <div id="globalWrapper">
-      <div id="column-content">
-	<div id="content">
-	  <a name="top" id="top"></a>
-	  <div id="siteNotice" tal:condition="sitenotice" tal:content="structure sitenotice"></div>
-	  <h1 class="firstHeading" tal:content="title">Leonardo da Vinci</h1>
-	  <div id="bodyContent">
-	    <h3 id="siteSub" i18n:translate="string:tagline">From Wikipedia, the free encyclopedia.</h3>
-	    <div id="contentSub" tal:content="structure subtitle"></div>
-	    <div id="contentSub" tal:condition="undelete" tal:content="structure undelete"></div>
-	    <div tal:condition="newtalk" class="usermessage" tal:content="structure newtalk"></div>
-	    <!-- start content -->
-	    <div tal:replace="structure bodytext"></div>
-	    <div tal:condition="catlinks" id="catlinks" tal:content="structure catlinks"></div>
-	    <!-- end content -->
-	    <div class="visualClear"></div>
-	  </div>
-	</div>
-      </div>
-      <div id="column-one">
-	<div id="p-cactions" class="portlet">
-	  <h5>Views</h5>
-	  <ul>
-	    <li tal:repeat="action content_actions" 
-	    tal:attributes="id string:ca-${repeat/action/key}; class action/class|default"><a
-	      tal:attributes="href action/href|default"
-	      tal:content="action/text">Linktext</a></li>
-	  </ul>
-	</div>
-	<div class="portlet" id="p-personal">
-	  <h5 i18n:translate="string:personaltools">Personal Tools</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li tal:repeat="item personal_urls" 
-	      tal:attributes="id string:pt-${repeat/item/key};"><a href="myuserpage"
-		tal:attributes="href item/href; class item/class|default"
-		tal:content="item/text">Log in</a></li>
-	    </ul>
-	  </div>
-	</div>
-	<div class="portlet" id="p-logo">
-	  <a style="background-image: url(${logopath});" href="${nav_urls/mainpage/href}" i18n:attributes="title string:mainpage"></a>
-	</div>
-	<script type="${jsmimetype}"> if (window.isMSIE55) fixalpha(); </script>
-	<div class="portlet" id="p-navigation">
-	  <h5 i18n:translate="string:navigation">Navigation</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li tal:repeat="navlink navigation_urls" tal:attributes="id navlink/id">
-	        <a tal:attributes="href navlink/href" tal:content="structure navlink/text">NavLink</a>
-	      </li>
-	    </ul>
-	  </div>
-	</div>
-	<div id="p-search" class="portlet">
-	  <h5 i18n:translate="string:search">Search</h5>
-	  <div class="pBody">
-	    <form name="searchform" tal:attributes="action searchaction" id="searchform">
-	      <input id="searchInput" name="search" type="text"
-	      i18n:attributes="accesskey string:accesskey-search | default"/>
-	      <input type='submit' name="go" value="Go" class="searchButton" 
-	      i18n:attributes="value string:go"/>&nbsp;<input type='submit' name="fulltext"
-	      value="Search" class="searchButton"
-	      i18n:attributes="value string:search"/>
-	    </form>
-	  </div>
-	</div>
-	<div class="portlet" id="p-tb">
-	  <h5 i18n:translate="string:toolbox">Toolbox</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li id="t-whatlinkshere" tal:condition="notspecialpage"><a tal:attributes="href nav_urls/whatlinkshere/href"
-		i18n:translate="string:whatlinkshere">What links here</a></li>
-	      <li id="t-recentchangeslinked" tal:condition="notspecialpage"><a tal:attributes="href nav_urls/recentchangeslinked/href"
-		i18n:translate="string:recentchangeslinked">Related Changes</a></li>
-	      <li tal:condition="feeds" id="feedlinks">
-	      <span i18n:translate="string:feedlinks">Feeds:</span>
-	      <span tal:repeat="feed feeds" 
-		tal:attributes="id string:feed-${repeat/feed/key};"><a 
-		  tal:attributes="href feed/href;"
-		  tal:content="feed/text">rss</a>&nbsp;</span>
-	      </li>
-	      <li id="t-contributions" tal:condition="nav_urls/contributions"><a tal:attributes="href nav_urls/contributions/href"
-		i18n:translate="string:contributions">Contributions</a></li>
-	      <li id="t-emailuser" tal:condition="nav_urls/emailuser"><a tal:attributes="href nav_urls/emailuser/href"
-		i18n:translate="string:emailuser">Email this user</a></li>
-	      <li id="t-upload" tal:condition="nav_urls/upload"><a tal:attributes="href nav_urls/upload/href"
-		i18n:translate="string:upload">Upload a file</a></li>
-	      <li id="t-specialpages"><a tal:attributes="href nav_urls/specialpages/href"
-		i18n:translate="string:specialpages">Special Pages</a></li>
-	    </ul>
-	  </div>
-	</div>
-	<div id="p-lang" class="portlet" tal:condition="language_urls">
-	  <h5 i18n:translate="string:otherlanguages">Language</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li tal:repeat="langlink language_urls">
-	      <a tal:attributes="href langlink/href"
-		tal:content="structure langlink/text">English</a>
-	      </li>
-	    </ul>
-	  </div>
-	</div>
-      </div><!-- end of the left (by default at least) column -->
-      <div class="visualClear"></div>
-      <div id="footer">
-	<div id="f-poweredbyico" tal:condition="poweredbyico" tal:content="structure poweredbyico"></div>
-	<div id="f-copyrightico" tal:condition="copyrightico" tal:content="structure copyrightico"></div>
-	<ul id="f-list">
-	  <li id="f-lastmod" tal:condition="lastmod" tal:content="structure lastmod"></li>
-	  <li id="f-viewcount" tal:condition="viewcount" tal:content="structure viewcount"></li>
-	  <li id="f-credits" tal:condition="credits" tal:content="structure credits"></li>
-	  <li id="f-copyright" tal:condition="copyright" tal:content="structure copyright"></li>
-	  <li id="f-about" tal:condition="about" tal:content="structure about"></li>
-	  <li id="f-disclaimer" tal:condition="disclaimer" tal:content="structure disclaimer"></li>
-	</ul>
-      </div>
-    </div>
-    <div tal:replace="structure reporttime"></div>
-  </body>
-</html>
diff --git a/skins/disabled/MonoBookTal.php b/skins/disabled/MonoBookTal.php
deleted file mode 100644
index 8a666c6119..0000000000
--- a/skins/disabled/MonoBookTal.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * This is for the old PHPTAL-based version of MonoBook.
- * The main MonoBook has been converted to straight PHP
- * to avoid the dependency on PHPTAL and, hopefully,
- * reduce the frequent problems users have with compiled
- * PHPTAL templates failing.
- *
- * You can still use MonoBook.pt as a sample, or copy it
- * to the parent directory to test with.
- *
- * @todo document
- * @package MediaWiki
- * @subpackage Skins
- */
-
-if( !defined( 'MEDIAWIKI' ) )
-	die( -1 );
-
-/** */
-require_once('includes/SkinPHPTal.php');
-
-# Test if PHPTal is enabled. If not MediaWiki will load the 'standard' skin
-# which doesnt use PHPTal
-if( class_exists( 'SkinPHPTal' ) ) {
-	/**
-	 * Inherit everything from SkinPHPTal
-	 * This is a dummy skin as MonoBook is the default PHPTal skin.
-	 * @todo document
-	 * @package MediaWiki
-	 * @subpackage Skins
-	 */
-	class SkinMonoBookTal extends SkinPHPTal {
-		/** Using monobook. */
-		function initPage( &$out ) {
-			SkinPHPTal::initPage( $out );
-			$this->skinname  = 'monobooktal';
-			$this->stylename = 'monobook';
-			$this->template  = 'MonoBook';
-		}
-	}
-
-}
-?>
diff --git a/skins/disabled/WikimediaWiki.php b/skins/disabled/WikimediaWiki.php
deleted file mode 100644
index 96ae1fac43..0000000000
--- a/skins/disabled/WikimediaWiki.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Tentative to make a skin for wikimedia.org
- *
- * @package MediaWiki
- * @subpackage Skins
- */
-
-if( !defined( 'MEDIAWIKI' ) )
-	die( -1 );
-
-/** */
-
-require_once('includes/SkinPHPTal.php');
-if( class_exists( 'SkinPHPTal' ) ) {
-
-$wgExtraSkins['wikimediawiki'] = 'Wikimediawiki';
-
-require_once('MonoBook.php');
-
-/**
- *
- * @package MediaWiki
- * @subpackage Skins
- */
-class SkinWikimediawiki extends SkinMonoBook {
-	function initPage( &$out ) {
-		SkinPHPTal::initPage( $out );
-		$this->skinname = 'wikimediawiki';
-		$this->stylename = 'monobook';
-		$this->template = 'WikimediaWiki';
-	}
-
-	# build array of common navigation links
-	function buildNavUrls () {
-		global $wgTitle, $wgUser, $wgRequest;
-		global $wgSiteSupportPage;
-
-		$action = $wgRequest->getText( 'action' );
-		$oldid = $wgRequest->getVal( 'oldid' );
-		$diff = $wgRequest->getVal( 'diff' );
-		// XXX: remove htmlspecialchars when tal:attributes works with i18n:attributes
-		$nav_urls = array();
-		$nav_urls['mainpage'] = array('href' => htmlspecialchars( $this->makeI18nUrl('mainpage')));
-		$nav_urls['randompage'] = (wfMsgForContent('randompage') != '-') ? array('href' => htmlspecialchars( $this->makeSpecialUrl('Randompage'))) : false;
-		$nav_urls['recentchanges'] = (wfMsgForContent('recentchanges') != '-') ? array('href' => htmlspecialchars( $this->makeSpecialUrl('Recentchanges'))) : false;
-		$nav_urls['whatlinkshere'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Whatlinkshere', 'target='.urlencode( $this->thispage ))));
-		$nav_urls['currentevents'] = (wfMsgForContent('currentevents') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('currentevents'))) : false;
-		$nav_urls['portal'] = (wfMsgForContent('portal') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('portal-url'))) : false;
-		$nav_urls['recentchangeslinked'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Recentchangeslinked', 'target='.urlencode( $this->thispage ))));
-		$nav_urls['bugreports'] = (wfMsgForContent('bugreports') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('bugreportspage'))) : false;
-		$nav_urls['sitesupport'] = array('href' => htmlspecialchars( $wgSiteSupportPage));
-		$nav_urls['help'] = array('href' => htmlspecialchars( $this->makeI18nUrl('helppage')));
-		$nav_urls['upload'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Upload')));
-		$nav_urls['specialpages'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Specialpages')));
-
-
-		# Specific for mediawiki.org menu
-		$nav_urls['aboutmediawiki'] = (wfMsgForContent('aboutmediawiki') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('aboutmediawiki-url'))) : false;
-		$nav_urls['projects'] = (wfMsgForContent('projects') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('projects-url'))) : false;
-		$nav_urls['membership'] = (wfMsgForContent('membership') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('membership-url'))) : false;
-		$nav_urls['pressroom'] = (wfMsgForContent('pressroom') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('pressroom-url'))) : false;
-		$nav_urls['software'] = (wfMsgForContent('software') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('software-url'))) : false;
-		$nav_urls['localchapters'] = (wfMsgForContent('localchapters') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('localchapters-url'))) : false;
-		$nav_urls['contactus'] = (wfMsgForContent('contactus') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('contactus-url'))) : false;
-
-		if( $wgTitle->getNamespace() == NS_USER || $wgTitle->getNamespace() == NS_USER_TALK ) {
-			$id = User::idFromName($wgTitle->getText());
-			$ip = User::isIP($wgTitle->getText());
-		} else {
-			$id = 0;
-			$ip = false;
-		}
-
-		if ( 0 != $wgUser->getID() ) { # show only to signed in users
-			if($id) {
-				# can only email non-anons
-				$nav_urls['emailuser'] = array(
-					'href' => htmlspecialchars( $this->makeSpecialUrl('Emailuser', "target=" . $wgTitle->getPartialURL() ) )
-				);
-				# only non-anons have contrib list
-				$nav_urls['contributions'] = array(
-					'href' => htmlspecialchars( $this->makeSpecialUrl('Contributions', "target=" . $wgTitle->getPartialURL() ) )
-				);
-			}
-		}
-
-
-		return $nav_urls;
-	}
-}
-
-}
-?>
diff --git a/skins/disabled/WikimediaWiki.pt b/skins/disabled/WikimediaWiki.pt
deleted file mode 100644
index dc1d3fa33c..0000000000
--- a/skins/disabled/WikimediaWiki.pt
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${lang}" lang="${lang}" dir="${dir}">
-  <head>
-    <meta http-equiv="Content-Type" content="${mimetype}; charset=${charset}" />
-    ${headlinks}
-    <title tal:content="pagetitle">Exciting xhtml slimfast</title>
-    <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "${stylepath}/${stylename}/main.css"; /*]]>*/</style>
-    <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/common/commonPrint.css" />
-    <!--[if IE]><style type="text/css" media="all">@import "${stylepath}/${stylename}/common/IEFixes.css";</style>
-    <script type="${jsmimetype}" src="${stylepath}/IEFixes.js"></script>
-    <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-    <script tal:condition="jsvarurl" type="${jsmimetype}" tal:attributes="src jsvarurl"></script>
-    <script type="${jsmimetype}" src="${stylepath}/common/wikibits.js"></script>
-    <style tal:condition="usercss" type="text/css">/*<![CDATA[*/ ${usercss} /*]]>*/</style>
-    <script tal:condition="userjs" type="${jsmimetype}" tal:attributes="src userjs"></script><script 
-      tal:condition="userjsprev" type="${jsmimetype}">/*<![CDATA[*/${userjsprev}/*]]>*/</script>
-  </head>
-  <body tal:attributes="ondblclick body-ondblclick|default; class nsclass|default">
-    <div id="globalWrapper">
-      <div id="column-content">
-	<div id="content">
-	  <a name="top" id="top"></a>
-	  <div id="siteNotice" tal:condition="sitenotice" tal:content="structure sitenotice"></div>
-	  <h1 class="firstHeading" tal:content="title">Leonardo da Vinci</h1>
-	  <div id="bodyContent">
-	    <h3 id="siteSub" i18n:translate="string:tagline">From Wikipedia, the free encyclopedia.</h3>
-	    <div id="contentSub" tal:content="structure subtitle"></div>
-	    <div id="contentSub" tal:condition="undelete" tal:content="structure undelete"></div>
-	    <div tal:condition="newtalk" class="usermessage" tal:content="structure newtalk"></div>
-	    <!-- start content -->
-	    ${bodytext}
-	    <div tal:condition="catlinks" id="catlinks" tal:content="structure catlinks"></div>
-	    <!-- end content -->
-	    <div class="visualClear"></div>
-	  </div>
-	</div>
-      </div>
-      <div id="column-one">
-	<div id="p-cactions" class="portlet">
-	  <h5>Views</h5>
-	  <ul>
-	    <li tal:repeat="action content_actions" 
-	    tal:attributes="id string:ca-${repeat/action/key}; class action/class|default"><a
-	      tal:attributes="href action/href|default"
-	      tal:content="action/text">Linktext</a></li>
-	  </ul>
-	</div>
-	<div class="portlet" id="p-personal">
-	  <h5 i18n:translate="string:personaltools">Personal Tools</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li tal:repeat="item personal_urls" 
-	      tal:attributes="id string:pt-${repeat/item/key};"><a href="myuserpage"
-		tal:attributes="href item/href; class item/class|default"
-		tal:content="item/text">Log in</a></li>
-	    </ul>
-	  </div>
-	</div>
-	<div class="portlet" id="p-logo">
-	  <a style="background-image: url(${logopath});" href="${nav_urls/mainpage/href}" i18n:attributes="title string:mainpage"></a>
-	</div>
-	<script type="${jsmimetype}"> if (window.isMSIE55) fixalpha(); </script>
-	<div class="portlet" id="p-navigation">
-	  <h5 i18n:translate="string:navigation">Navigation</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li id="n-mainpage"><a href="${nav_urls/mainpage/href}"
-		i18n:translate="string:mainpage">Home</a></li>
-	      <li id="n-aboutmediawiki"><a href="${nav_urls/aboutmediawiki/href}"
-		i18n:translate="string:aboutmediawiki">About MediaWiki</a></li>
-	      <li id="n-portal" tal:condition="nav_urls/portal/href"><a href="${nav_urls/portal/href}"
-		i18n:translate="string:portal">Community Portal</a></li>
-	      <li id="n-currentevents" tal:condition="nav_urls/currentevents/href"><a href="${nav_urls/currentevents/href}"
-		i18n:translate="string:currentevents">Last News</a></li>
-	      <li id="n-projects" tal:condition="nav_urls/projects/href"><a href="${nav_urls/projects/href}"
-		i18n:translate="string:projects">Our projects</a></li>
-	      <li id="n-recentchanges" tal:condition="nav_urls/recentchanges/href"><a href="${nav_urls/recentchanges/href}"
-		i18n:translate="string:recentchanges">Recent Changes</a></li>
-	      <li id="n-randompage" tal:condition="nav_urls/randompage/href"><a href="${nav_urls/randompage/href}"
-		i18n:translate="string:randompage">Random Page</a></li>
-	      <li id="n-help" tal:condition="nav_urls/help/href"><a href="${nav_urls/help/href}"
-		i18n:translate="string:help">Help</a></li>
-	      <li id="n-sitesupport" tal:condition="nav_urls/sitesupport/href"><a href="${nav_urls/sitesupport/href}"
-		i18n:translate="string:sitesupport">Support us</a></li>
-	      <li id="n-membership" tal:condition="nav_urls/membership/href"><a href="${nav_urls/membership/href}"
-		i18n:translate="string:membership">Membership</a></li>
-	      <li id="n-pressroom" tal:condition="nav_urls/pressroom/href"><a href="${nav_urls/pressroom/href}"
-		i18n:translate="string:pressroom">Press room</a></li>
-	      <li id="n-software" tal:condition="nav_urls/software/href"><a href="${nav_urls/software/href}"
-		i18n:translate="string:software">Our software</a></li>
-	      <li id="n-localchapters" tal:condition="nav_urls/localchapters/href"><a href="${nav_urls/localchapters/href}"
-		i18n:translate="string:localchapters">Local chapters</a></li>
-	      <li id="n-contactus" tal:condition="nav_urls/contactus/href"><a href="${nav_urls/contactus/href}"
-		i18n:translate="string:contactus">Contact us</a></li>
-	    </ul>
-	  </div>
-	</div>
-	<div id="p-search" class="portlet">
-	  <h5 i18n:translate="string:search">Search</h5>
-	  <div class="pBody">
-	    <form name="searchform" action="${searchaction}" id="searchform">
-	      <input id="searchInput" name="search" type="text"
-	      i18n:attributes="accesskey string:accesskey-search | default"/>
-	      <input type='submit' name="go" value="Go" class="searchButton" 
-	      i18n:attributes="value string:go"/>&nbsp;<input type='submit' name="fulltext"
-	      value="Search" class="searchButton"
-	      i18n:attributes="value string:search"/>
-	    </form>
-	  </div>
-	</div>
-	<div class="portlet" id="p-tb">
-	  <h5 i18n:translate="string:toolbox">Toolbox</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li id="t-whatlinkshere" tal:condition="notspecialpage"><a href="${nav_urls/whatlinkshere/href}"
-		i18n:translate="string:whatlinkshere">What links here</a></li>
-	      <li id="t-recentchangeslinked" tal:condition="notspecialpage"><a href="${nav_urls/recentchangeslinked/href}"
-		i18n:translate="string:recentchangeslinked">Related Changes</a></li>
-	      <li tal:condition="feeds" id="feedlinks">
-	      <span i18n:translate="string:feedlinks">Feeds:</span>
-	      <span tal:repeat="feed feeds" 
-		tal:attributes="id string:feed-${repeat/feed/key};"><a 
-		  tal:attributes="href feed/href;"
-		  tal:content="feed/text">rss</a>&nbsp;</span>
-	      </li>
-	      <li id="t-contributions" tal:condition="nav_urls/contributions/href"><a href="${nav_urls/contributions/href}"
-		i18n:translate="string:contributions">Contributions</a></li>
-	      <li id="t-emailuser" tal:condition="nav_urls/emailuser/href"><a href="${nav_urls/emailuser/href}"
-		i18n:translate="string:emailuser">Email this user</a></li>
-	      <li id="t-upload" tal:condition="loggedin"><a href="${nav_urls/upload/href}"
-		i18n:translate="string:upload">Upload a file</a></li>
-	      <li id="t-specialpages"><a href="${nav_urls/specialpages/href}"
-		i18n:translate="string:specialpages">Special Pages</a></li>
-	    </ul>
-	  </div>
-	</div>
-	<div id="p-lang" class="portlet" tal:condition="language_urls">
-	  <h5 i18n:translate="string:otherlanguages">Language</h5>
-	  <div class="pBody">
-	    <ul>
-	      <li tal:repeat="langlink language_urls">
-	      <a tal:attributes="href langlink/href"
-		tal:content="structure langlink/text">English</a>
-	      </li>
-	    </ul>
-	  </div>
-	</div>
-      </div><!-- end of the left (by default at least) column -->
-      <div class="visualClear"></div>
-      <div id="footer">
-	<div id="f-poweredbyico" tal:condition="poweredbyico">${poweredbyico}</div>
-	<div id="f-copyrightico" tal:condition="copyrightico">${copyrightico}</div>
-	<ul id="f-list">
-	  <li id="f-lastmod" tal:condition="lastmod">${lastmod}</li>
-	  <li id="f-viewcount" tal:condition="viewcount">${viewcount}</li>
-	  <li id="f-credits" tal:condition="credits">${credits}</li>
-	  <li id="f-copyright" tal:condition="copyright">${copyright}</li>
-	  <li id="f-about" tal:condition="about">${about}</li>
-	  <li id="f-disclaimer" tal:condition="disclaimer">${disclaimer}</li>
-	</ul>
-      </div>
-    </div>
-    ${reporttime}
-  </body>
-</html>
-- 
2.20.1