moving templates from /templates/ to /skins/ . xhtml_slim.pt is now MonoBook.pt,...
authorAntoine Musso <hashar@users.mediawiki.org>
Thu, 2 Sep 2004 02:15:54 +0000 (02:15 +0000)
committerAntoine Musso <hashar@users.mediawiki.org>
Thu, 2 Sep 2004 02:15:54 +0000 (02:15 +0000)
includes/SkinPHPTal.php
skins/Chick.php
skins/Chick.pt [new file with mode: 0644]
skins/DaVinci.php
skins/Mono.php
skins/MonoBook.pt [new file with mode: 0644]
skins/WikimediaWiki.php
skins/WikimediaWiki.pt [new file with mode: 0644]

index dc22729..ec79d3d 100644 (file)
@@ -60,8 +60,8 @@ class SkinPHPTal extends Skin {
 
        function initPage( &$out ) {
                parent::initPage( $out );
-               $this->skinname = 'davinci';
-               $this->template = 'xhtml_slim';
+               $this->skinname = 'monobook';
+               $this->template = 'MonoBook';
        }
 
        # initialize various variables and generate the template
@@ -75,7 +75,7 @@ class SkinPHPTal extends Skin {
                extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 
                $this->initPage( $out );
-               $tpl = new PHPTAL($this->template . '.pt', 'templates');
+               $tpl = new PHPTAL($this->template . '.pt', 'skins');
 
                #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
                $tpl->setTranslator(new MediaWiki_I18N());
index db7ad68..eb17b14 100644 (file)
@@ -5,7 +5,7 @@ class SkinChick extends SkinPHPTal {
        function initPage( &$out ) {
                SkinPHPTal::initPage( $out );
                $this->skinname = 'chick';
-               $this->template = 'xhtml_minimal';
+               $this->template = 'Chick';
        }
        function suppressUrlExpansion() { return true; }
        function printSource() { return ''; }
diff --git a/skins/Chick.pt b/skins/Chick.pt
new file mode 100644 (file)
index 0000000..24943f3
--- /dev/null
@@ -0,0 +1,100 @@
+<!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}/${skinname}/main.css"; /*]]>*/</style>
+    <script type="text/javascript" tal:attributes="src jsvarurl"></script>
+    <script type="text/javascript" src="${stylepath}/wikibits.js"></script>
+    <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>
+  </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:fromwikipedia">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 -->
+        ${bodytext}
+    <!-- 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-nav">
+      <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}" i18n:translate="string:whatlinkshere">What links here</a>
+      <a href="${nav_urls/recentchangeslinked/href}" 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">${poweredbyico}</span>
+      <span tal:condition="copyrightico">${copyrightico}</span>
+      <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>
+    ${reporttime}
+  </body>
+</html>
index 3488994..13e6515 100644 (file)
@@ -6,6 +6,7 @@ class SkinDaVinci extends SkinPHPTal {
        function initPage( &$out ) {
                SkinPHPTal::initPage( $out );
                $this->skinname = 'davinci';
+               $this->template = 'MonoBook';
        }
 }
 ?>
index 91371f7..7b8d629 100644 (file)
@@ -6,6 +6,7 @@ class SkinMono extends SkinPHPTal {
        function initPage( &$out ) {
                SkinPHPTal::initPage( $out );
                $this->skinname = 'mono';
+               $this->template = 'MonoBook';
        }
 }
 ?>
diff --git a/skins/MonoBook.pt b/skins/MonoBook.pt
new file mode 100644 (file)
index 0000000..33b6b8f
--- /dev/null
@@ -0,0 +1,150 @@
+<!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}/${skinname}/main.css"; /*]]>*/</style>
+    <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/commonPrint.css" />
+    <!--[if IE]><style type="text/css" media="all">@import "${stylepath}/${skinname}/IEFixes.css";</style>
+    <script type="text/javascript" src="${stylepath}/IEFixes.js"></script>
+    <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+    <script type="text/javascript" tal:attributes="src jsvarurl"></script>
+    <script type="text/javascript" src="${stylepath}/wikibits.js"></script>
+    <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>
+  </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="contentTop"></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:fromwikipedia">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>
+       <div class="portlet" id="p-nav">
+         <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"><a href="${nav_urls/whatlinkshere/href}"
+               i18n:translate="string:whatlinkshere">What links here</a></li>
+             <li id="t-recentchangeslinked"><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>
index 2d316cc..78236e7 100644 (file)
@@ -2,16 +2,17 @@
 # Tentative to make a skin for wikimedia.org
 # $Id$
 
-require_once( 'Skin.php' );
 require_once($IP.'/includes/SkinPHPTal.php');
 
 $wgExtraSkins['wikimediawiki'] = 'Wikimediawiki';
 
+require_once('MonoBook.php');
+
 class SkinWikimediawiki extends SkinMonoBook {
        function initPage( &$out ) {
                SkinPHPTal::initPage( $out );
-               $this->skinname = "wikimediawiki";
-               $this->template = "xhtml_slim_wikimediawiki";
+               $this->skinname = 'wikimediawiki';
+               $this->template = 'WikimediaWiki';
        }
 
        # build array of common navigation links
diff --git a/skins/WikimediaWiki.pt b/skins/WikimediaWiki.pt
new file mode 100644 (file)
index 0000000..a33daeb
--- /dev/null
@@ -0,0 +1,164 @@
+<!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}/${skinname}/main.css"; /*]]>*/</style>
+    <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/commonPrint.css" />
+    <!--[if IE]><style type="text/css" media="all">@import "${stylepath}/${skinname}/IEFixes.css";</style>
+    <script type="text/javascript" src="${stylepath}/IEFixes.js"></script>
+    <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+    <script type="text/javascript" tal:attributes="src jsvarurl"></script>
+    <script type="text/javascript" src="${stylepath}/wikibits.js"></script>
+    <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>
+  </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="contentTop"></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:fromwikipedia">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>
+       <div class="portlet" id="p-nav">
+         <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"><a href="${nav_urls/whatlinkshere/href}"
+               i18n:translate="string:whatlinkshere">What links here</a></li>
+             <li id="t-recentchangeslinked"><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>