From 73402556f6f73e97231b090b7db06cae6b160b48 Mon Sep 17 00:00:00 2001
From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Thu, 29 Apr 2004 15:38:23 +0000
Subject: [PATCH] Major cleanup

* many class and id names shortened
* some divs removed from portlets
---
 stylesheets/IEFixes.js               |   7 +-
 stylesheets/commonPrint.css          |   8 +-
 stylesheets/monobook/IE50Fixes.css   | 104 ++----
 stylesheets/monobook/IE55Fixes.css   |  44 +--
 stylesheets/monobook/IE60Fixes.css   |  20 +-
 stylesheets/monobook/Opera6Fixes.css |   4 +-
 stylesheets/monobook/Opera7Fixes.css |   4 +-
 stylesheets/monobook/main.css        | 537 +++++++++------------------
 stylesheets/monobook/rtl.css         |  18 +-
 templates/xhtml_slim.pt              | 309 ++++++++-------
 10 files changed, 389 insertions(+), 666 deletions(-)

diff --git a/stylesheets/IEFixes.js b/stylesheets/IEFixes.js
index 64ba16a374..4fbc9a8216 100644
--- a/stylesheets/IEFixes.js
+++ b/stylesheets/IEFixes.js
@@ -6,17 +6,14 @@ else var version = 0;
 window.attachEvent("onload", hookit);
 function hookit() {
     fixalpha();
-    if(version == 6) {
-        var wrapper = document.getElementById('tawrapper');
-        if (!wrapper) relativeforfloats();
-    }
+    relativeforfloats();
 }
 
 // png alpha transparency fixes
 function fixalpha(){
     // bg
     if(version >= 5.5) {
-        var logoa = document.getElementById('portlet-logo').firstChild;
+        var logoa = document.getElementById('p-logo').firstChild;
         var bg = logoa.currentStyle.backgroundImage;
         if (bg.match(/\.png/i) != null){
             var mypng = bg.substring(5,bg.length-2);
diff --git a/stylesheets/commonPrint.css b/stylesheets/commonPrint.css
index 62343dee50..597800c111 100644
--- a/stylesheets/commonPrint.css
+++ b/stylesheets/commonPrint.css
@@ -193,7 +193,7 @@ a:link, a:visited {
    content: " ( " attr(href) " ) ";
 }*/
 
-#visual-portal-wrapper {
+#globalWrapper {
     width: 100% !important;
     min-width: 0 !important;
 }
@@ -231,9 +231,3 @@ a, a.external, a.new, a.stub {
 .urlexpansion {
 	display: inline ! important;
 }
-
-.printfooter {
-	border-top: solid 1px black;
-	display: block ! important;
-}
-
diff --git a/stylesheets/monobook/IE50Fixes.css b/stylesheets/monobook/IE50Fixes.css
index c05361a299..c379a8ee49 100644
--- a/stylesheets/monobook/IE50Fixes.css
+++ b/stylesheets/monobook/IE50Fixes.css
@@ -2,93 +2,45 @@
 ** IE5.0 Fix Stylesheet
 */
 
-#portal-column-content {
-    margin: 0 0 0 0 !important;
+#column-content {
+    margin: 0 !important;
     float: none;
 }
-#portal-column-content #content {
-    margin-top: 3.1em;
+#column-content #content { 
+    margin-top: 3em; 
+    height: 1%;
 }
-#portal-column-one {
+#column-one {
     position: absolute;
     overflow: visible;
     top: 0;
     left: 0;
     z-index: 3;
 }
-
-#portal-footer {
+#footer {
     margin: 0 0 0 13.6em;
 }
 
-/* IE 4&5 interpret keyword sizes one off */
-body {
-    font-size: xx-small;
-}
+/* IE 5 & 5.5 interpret keyword sizes one off */
+body { font-size: xx-small; }
 /*
 ** the edit tabs
 */
-#portlet-contentViews {
-    left: 10em;
-}
-#portlet-contentViews ul {
-    line-height: 1.3em;
-    display: block;
+#p-cactions li {
     float: left;
+    padding-top: 0;
+    padding-bottom: 0 !important;
+    height: 0.9em;
 }
-#portlet-contentViews li {
+#p-cactions li a {
     display: block;
-    float: left;
-    overflow: visible;
-    padding: 0;
-    white-space: nowrap !important;
+    padding-bottom: 0.045em;
 }
-#portlet-contentViews li.selected {
-    background-color: white;
-    padding-bottom: 0.2em;
+#p-cactions li.selected a {
+    padding-bottom: 0.17em;
 }
-#portlet-contentViews li a,
-#portlet-contentViews .selected a,
-#portlet-contentViews li a:hover {
-    padding-bottom: 0;
-    padding-top: 0 !important;
-    display: block;
-    position: static !important;
-    z-index: 3 !important;
-}
-
-/* personal toolbar */
-#portal-personaltools {
-    padding-bottom: 0;
-    background: transparent;
-}
-ul#portal-personaltools {
-    line-height: 1.1em;
-    display: block;
-    float: right;
-    margin: 0;
-}
-#portal-personaltools li {
-    display: block;
-    float: left;
-    overflow: visible;
-    padding-bottom: 0.1em;
-    margin-left: 0.5em;
-}
-#portal-personaltools li a,
-#portal-personaltools .selected a,
-#portal-personaltools li a:hover {
-    padding-bottom: 0;
-    padding-top: 0 !important;
-    display: block;
-   /* float: left;*/
-    padding-left: 0.5em !important;
-    padding-right: 0.5em !important;
-    white-space: nowrap !important;
-}
-
-#portlet-contentViews li a:hover {
-    padding-bottom: 0.5em;
+#p-cactions li a:hover {
+    padding-bottom: 0.17em;
 }
 /* 5.0 doesn't like the background icon for external links and user */
 .link-external,
@@ -96,27 +48,17 @@ ul#portal-personaltools {
     background: none;
     padding: 0;
 }
-li#personaltools-userpage,
-li#personaltools-login,
-li#personaltools-logout {
+li#pt-userpage,
+li#pt-login,
+li#pt-logout {
     background: none;
     padding-left: none;
 }
-
-div.thumbnail-none p, div.thumbnail-right p, div.thumbnail-left p {
-    position:relative;
-}
-
-textarea {
-    width: 78% !important;
-}
 .visualClear {
     width:100%;
     height: 0px;
     padding:0;
     margin:0;
 }
-.documentFirstHeading {
-    margin-bottom: 0.3em;
-}
+.firstHeading { margin-bottom: 0.3em; }
 /*div{ border:1px solid Red !important;}*/
diff --git a/stylesheets/monobook/IE55Fixes.css b/stylesheets/monobook/IE55Fixes.css
index 2af89ffe31..ca9c654927 100644
--- a/stylesheets/monobook/IE55Fixes.css
+++ b/stylesheets/monobook/IE55Fixes.css
@@ -1,49 +1,36 @@
 /* IE5.5/win- only fixes */
 
-#portal-column-content {
-    display: inline;
-}
-#portal-column-content #content {
-    margin-top: 3em;
-    overflow: auto;
-}
-#bodyContent center,
-#bodyContent pre {
+#column-content { display: inline; }
+#column-content #content { 
+    margin-top: 3em; 
     overflow: auto;
+    height: 1%;
 }
+#bodyContent div,
+#bodyContent pre { overflow: auto; }
 
-#portal-personaltools {
-    padding-bottom: 0.1em;
-}
-img {
-    position: relative;
-}
-div.thumbnail-none p, div.thumbnail-right p, div.thumbnail-left p {
-    position:relative;
-}
+#p-personal { padding-bottom: 0.1em; }
 
-body {
-    font-size: xx-small;
-}
-#portlet-contentViews {
+body { font-size: xx-small; }
+#p-cactions {
     width: 76% !important;
     z-index: 3 !important;
     float: none;
 }
-#portlet-contentViews li {
+#p-cactions li {
     float: left;
     padding-top: 0;
     padding-bottom: 0 !important;
     height: 0.9em;
 }
-#portlet-contentViews li a {
+#p-cactions li a {
     display: block;
     padding-bottom: 0.045em;
 }
-#portlet-contentViews li.selected a {
+#p-cactions li.selected a {
     padding-bottom: 0.17em;
 }
-#portlet-contentViews li a:hover {
+#p-cactions li a:hover {
     padding-bottom: 0.17em;
 }
 .portlet {
@@ -54,8 +41,8 @@ body {
     padding-right: 13px;
 }
 /* show the hand */
-#portlet-logo a,
-#portlet-logo a:hover {
+#p-logo a,
+#p-logo a:hover {
     cursor: pointer;
 }
 .visualClear {
@@ -64,4 +51,3 @@ body {
     padding:0;
     margin:0;
 }
-#catlinks { z-index: 4; }
diff --git a/stylesheets/monobook/IE60Fixes.css b/stylesheets/monobook/IE60Fixes.css
index 7379747a24..aa65f5d0ce 100644
--- a/stylesheets/monobook/IE60Fixes.css
+++ b/stylesheets/monobook/IE60Fixes.css
@@ -2,36 +2,34 @@
 /* content area */ 
 
 /* workaround for various ie float bugs */
-#portal-column-content #content {
+#column-content #content {
     margin-top: 3em;
     overflow: auto;
     height: 1%;
 }
 
-#portal-column-content {
-    display: inline;
-}
+#column-content { display: inline; }
 
 /* the tabs */
 
-#portlet-contentViews {
+#p-cactions {
     z-index: 3;
 }
 
-#portlet-contentViews li {
+#p-cactions li {
     float: left;
     padding-top: 0;
     padding-bottom: 0 !important;
     height: 0.9em;
 }
-#portlet-contentViews li a {
+#p-cactions li a {
     display: block;
     padding-bottom: 0.045em;
 }
-#portlet-contentViews li.selected a {
+#p-cactions li.selected a {
     padding-bottom: 0.17em;
 }
-#portlet-contentViews li a:hover {
+#p-cactions li a:hover {
     padding-bottom: 0.17em;
 }
 #portal-personaltools {
@@ -46,8 +44,8 @@
 }
 
 /* show the hand */
-#portlet-logo a,
-#portlet-logo a:hover {
+#p-logo a,
+#p-logo a:hover {
     cursor: pointer;
 }
 div.visualClear {
diff --git a/stylesheets/monobook/Opera6Fixes.css b/stylesheets/monobook/Opera6Fixes.css
index 9db566f77f..01bf27e8d5 100644
--- a/stylesheets/monobook/Opera6Fixes.css
+++ b/stylesheets/monobook/Opera6Fixes.css
@@ -1,9 +1,9 @@
 /* opera 6 fixes */
-#portal-column-one {
+#column-one {
     position: relative;
     max-width: 11.7em;
 }
-#portlet-personal {
+#p-personal {
     width: 45em;
     margin-left: 8.6em;
     right: 0;
diff --git a/stylesheets/monobook/Opera7Fixes.css b/stylesheets/monobook/Opera7Fixes.css
index 79fa42f985..c005768703 100644
--- a/stylesheets/monobook/Opera7Fixes.css
+++ b/stylesheets/monobook/Opera7Fixes.css
@@ -1,8 +1,8 @@
 /* small tweaks for opera seven */
-#portlet-contentViews {
+#p-cactions {
     margin-top: 0.1em;
 }
-#portlet-contentViews li a {
+#p-cactions li a {
     top: 2px;
 }
 #bodyContent a.external {
diff --git a/stylesheets/monobook/main.css b/stylesheets/monobook/main.css
index 4bdf00bc17..2c2e12d25a 100644
--- a/stylesheets/monobook/main.css
+++ b/stylesheets/monobook/main.css
@@ -11,25 +11,26 @@
 ** All you guys rock :)
 */
 
-#portal-columns {
-    width: 100%;
-    margin: 0;
-}
-#portal-column-content {
+#column-content {
     width: 100%;
     float: right;
-    margin: 0 0 0 -12.2em;
+    margin: 0 0 0.6em -12.2em;
     padding:0;
 }
-#portal-column-content #content {
+#column-content #content {
     margin: 2.8em 0 0 12.2em;
+    padding: 0em 1em 1.5em 1em;
+    background: White;
+    border: 1px solid #aaaaaa;
+    border-right: none;
+    line-height: 1.5em;
+    position: relative;
+    z-index: 2;
 }
-#portal-column-one {
-    padding-top: 160px;
-}
+#column-one { padding-top: 160px; }
 /* the left column width is specified in class .portlet */
 
-/* Font size: 
+/* Font size:
 ** We take advantage of keyword scaling- browsers won't go below 9px
 ** More at http://www.w3.org/2003/07/30-font-size
 ** http://style.cleverchimp.com/font_size_intervals/altintervals.html
@@ -44,12 +45,13 @@ body {
 }
 
 /* scale back up to a sane default */
-#visual-portal-wrapper {
+#globalWrapper {
     font-size:123%;
     width: 100%;
     margin: 0;
     padding: 0;
 }
+.visualClear { clear: both; }
 
 /* general styles */
 
@@ -59,10 +61,15 @@ table {
 }
 a {
     text-decoration: none;
-    /*color: #436976;*/
     color: #005189;
-    background-color: transparent;
+    background: none;
 }
+a:visited { color: #5a3696; }
+a:active { color: Orange; }
+a:hover { text-decoration: underline; }
+a.stub,
+a.new { color:#ba0000; }
+
 img {
     border: none;
     vertical-align: middle;
@@ -71,21 +78,8 @@ p {
     margin: 0.4em 0em 0.7em 0em;
     line-height: 1.5em;
 }
-p a {
-    text-decoration: none;
-}
-p a:visited {
-    color: #5a3696;
-    background-color: transparent;
-}
-p a:active {
-    color: Red;
-    background-color: transparent;
-}
-p img {
-    border: 0;
-    margin: 0;
-}
+
+p img { margin: 0; }
 
 hr {
     height: 1px;
@@ -97,46 +91,24 @@ hr {
 
 h1, h2, h3, h4, h5, h6 {
     color: Black;
-    background-color: transparent;
-    font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-    font-size: 100%;
+    background: none;
+    font-family: "Bitstream Vera Sans", "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
     font-weight: normal;
     margin: 0;
     padding-top: 0.5em;
     padding-bottom: 0.17em;
-   /* border-bottom: 1px solid #2f6fab;*/
     border-bottom: 1px solid #aaaaaa;
-
-}
-h1 {
-    font-size: 188%;
-}
-h2 {
-    font-size: 150%;
-}
-h3 {
-    font-size: 132%;
-    border-bottom: none;
-    font-weight: bold;
 }
-h4 {
-    font-size: 116%;
+h1 { font-size: 188%; }
+h2 { font-size: 150%; }
+h3, h4, h5, h6 { 
     border-bottom: none;
     font-weight: bold;
 }
-
-h5 {
-    font-size: 100%;
-    border-bottom: none;
-    font-weight: bold;
-}
-
-h6 {
-    font-size: 80%;
-    border-bottom: none;
-    font-weight: bold;
-}
-
+h3 { font-size: 132%; }
+h4 { font-size: 116%; }
+h5 { font-size: 100%; }
+h6 { font-size: 80%;  }
 
 ul { 
     line-height: 1.5em;
@@ -150,32 +122,13 @@ ol {
     margin: 0.3em 0 0 2.2em;
     padding:0;
 }
-ul a, ol a {
-    text-decoration: none;
-}
-li {
-    margin-bottom: 0.1em;
-}
-dt {
-    font-weight: bold;    
-}
-dt a {
-    text-decoration: none;
-}
-
+li { margin-bottom: 0.1em; }
+dt { font-weight: bold; }
 dd {
     line-height: 1.5em;
     margin-bottom: 0.8em;
     margin-left: 1.6em;
 }
-dd a {
-    text-decoration: none;
-}
-
-dd.link a {
-    text-decoration: none;
-    color: Black;
-}
 
 fieldset {
     border: 1px solid #2f6fab;
@@ -188,7 +141,6 @@ legend {
     padding: 0.5em;
     font-size: 90%;
 }
-
 form {
     border: none;
     margin: 0;
@@ -215,9 +167,7 @@ textarea {
     }
 }
 input[type="radio"],
-input[type="checkbox"] {
-    border:none;
-}
+input[type="checkbox"] { border:none; }
 select {
     border: 1px solid #2f6fab;  
     color: Black;
@@ -226,7 +176,7 @@ select {
 abbr, acronym, .explain {
     border-bottom: 1px dotted Black;
     color: Black;
-    background-color: transparent;
+    background: none;
     cursor: help;
 }
 q {
@@ -237,38 +187,28 @@ blockquote {
     font-family: Times, "Times New Roman", serif;
     font-style: italic;
 }
-code {
-    color: Black;
-    background-color: #f9f9f9;
-}
+code { background-color: #f9f9f9; }
 pre {
     padding: 1em;
     border: 1px dashed #2f6fab;
     color: Black;
     background-color: #f9f9f9;
 }
-.pre a {
-    text-decoration: none;
-}
 
 
 /*
 ** the main content area
 */
 
-#documentSubtitle {
+#siteSub { display: none; }
+#contentSub {
     font-size: 84%;
     line-height: 1.2em;
     margin: 0 0 1.4em 1em;
     color: #7d7d7d;
     width: auto;
 }
-span.subpages {
-    display: block;
-}
-#siteSubtitle {
-    display: none;    
-}
+span.subpages { display: block; }
 #catlinks {
     margin: 0;
     padding: 0;
@@ -277,15 +217,6 @@ span.subpages {
     float: right;
 }
 
-#content {
-    padding: 0 0 1em 0em;
-    margin: 0;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
 /* Some space under the headers in the content area */
 #bodyContent h1,
 #bodyContent h2,
@@ -294,33 +225,24 @@ a:hover {
 #bodyContent h5 {
     margin-bottom:0.8em;
 }
-.documentFirstHeading {
-    margin-bottom:0.1em;
-}
-
-
-#documentContent {
-    padding: 0em 1em 1.5em 1em;
-    background: White;
-    border: 1px solid #aaaaaa;
-    border-right: none;
-    margin:0;
-    line-height: 1.5em;
-    position: relative;
-    z-index: 2;
-}
+.firstHeading { margin-bottom:0.1em; }
 
-/* this will be the user notification thing */
-.portalMessage {
+/* user notification thing */
+.usermessage {
     background-color: #ffce7b;
     border: 1px solid #ffa500;
     color: Black;
-    font-size: 100%;
     font-weight: bold;
     margin: 2em 0em 1em 0em;
     padding: 0.5em 1em;
     vertical-align: middle;
 }
+.error {
+    color: red;
+    font-size: larger;
+}
+/* currently unused, intended to be used by a metadata box
+in the bottom-right corner of the content area */
 .documentDescription {
     /* The summary text describing the document */
     font-weight: bold;
@@ -335,26 +257,22 @@ a:hover {
     font-weight: normal;
     color: #76797c;
 }
-.documentByLine a {
-    text-decoration: none;
-}
 
 /* emulate center */
 .center {
     width: 100%;
     text-align: center;
 }
-div.center * {
+*.center * {
     margin-left: auto;
     margin-right: auto;
 }
+
+
 /*
-** mediawiki-specific styles
+** content styles
 */
 
-a.stub,
-a.new { color:#ba0000; text-decoration:none; }
-
 #toc { 
     /*border:1px solid #2f6fab;*/
     border:1px solid #aaaaaa;
@@ -362,15 +280,10 @@ a.new { color:#ba0000; text-decoration:none; }
     padding:5px;
     font-size: 95%;
 }
-.tocindent {
-	margin-left: 2em;
-}
-.tocline {
-	margin-bottom: 0px;
-}
-.toctoggle, .editsection {
-	font-size: 94%;
-}
+.tocindent { margin-left: 2em; }
+.tocline { margin-bottom: 0px; }
+.toctoggle, .editsection { font-size: 94%; }
+
 /* images */
 div.floatright { 
     float: right; 
@@ -418,6 +331,15 @@ div.magnify a, div.magnify img {
     border: none !important;
     background: none !important;
 }
+
+.urlexpansion,
+.hiddenStructure {
+    display: none;
+}
+/*
+** classes for special content elements like town boxes
+** intended to be referenced directly from the wiki src
+*/
 /* table standards */
 table.rimage {
     float:right; 
@@ -436,34 +358,63 @@ div.tleft {
     margin-right:0.5em;
     border: 0.5em 1.4em 0.8em 0;
 }
+
+div.townBox {
+    position:relative;
+    float:right;
+    background:White;
+    margin-left:1em;
+    border: 1px solid Grey;
+    padding:0.3em;
+    width: 200px;
+    overflow: hidden;
+    clear: right;
+}
+div.townBox dl {
+    padding: 0;
+    margin: 0 0 0.3em 0; 
+    font-size: 96%;
+}
+div.townBox dl dt {
+    background: none;
+    margin: 0.4em 0 0 0;
+}
+div.townBox dl dd {
+    margin: 0.1em 0 0 1.1em;
+    background-color: #f3f3f3;
+}
+
 /*
-** Link rendering 
+** edit views etc
 */
 
-.urlexpansion,
-.hiddenStructure {
-    display: none;
+.special li {
+    line-height: 1.4em;
+    margin: 0;
+    padding: 0;
 }
+/* the auto-generated edit comments */
+.autocomment { color: gray; }
 /*
 ** Diff rendering
 */
 table.diff {
-        background:white;
+    background:white;
 }
 td.diff-otitle {
-        background:#ffffff;
+    background:#ffffff;
 }
 td.diff-ntitle {
-        background:#ffffff;
+    background:#ffffff;
 }
 td.diff-addedline {
-        background:#ccffcc;
+    background:#ccffcc;
 }
 td.diff-deletedline {
-        background:#ffffaa;
+    background:#ffffaa;
 }
 td.diff-context {
-        background:#eeeeee;
+    background:#eeeeee;
 }
 
 /* 
@@ -477,78 +428,35 @@ td.diff-context {
 }
 #bodyContent a[href ^="https://"],
 .link-https {
-    background: transparent url("lock_icon.gif") center right no-repeat;
+    background: url("lock_icon.gif") center right no-repeat;
     padding-right: 16px;
 }
 #bodyContent a[href ^="mailto:"],
 .link-mailto {
-    background: transparent url("mail_icon.gif") center right no-repeat;
+    background: url("mail_icon.gif") center right no-repeat;
     padding-right: 18px;
 }
 #bodyContent a[href ^="news://"] {
-    background: transparent url("news_icon.png") center right no-repeat;
+    background: url("news_icon.png") center right no-repeat;
     padding-right: 18px;
 }
 #bodyContent a[href ^="ftp://"],
 .link-ftp {
-    background: transparent url("file_icon.gif") center right no-repeat;
+    background: url("file_icon.gif") center right no-repeat;
     padding-right: 18px;
 }
 #bodyContent a[href ^="irc://"],
 .link-irc {
-    background: transparent url("discussionitem_icon.gif")  center right no-repeat;
+    background: url("discussionitem_icon.gif")  center right no-repeat;
     padding-right: 18px;
 }
-.visualClear {
-    clear: both;
-}
-
-/*
-** classes for special content elements like town boxes
-*/
-div.townBox {
-    position:relative;
-    float:right;
-    background:White;
-    margin-left:1em;
-    border: 1px solid Grey;
-    padding:0.3em;
-    width: 200px;
-    overflow: hidden;
-    clear: right;
-}
-div.townBox dl {
-    padding: 0;
-    margin: 0 0 0.3em 0; 
-    font-size: 96%;
-}
-div.townBox dl dt {
-    background-color: transparent;
-    margin: 0.4em 0 0 0;
-}
-div.townBox dl dd {
-    margin: 0.1em 0 0 1.1em;
-    background-color: #f3f3f3;
-}
-
-/*
-** Special content area views
-*/
-.special li {
-    line-height: 1.4em;
-    margin: 0;
-    padding: 0;
-}
-/* the auto-generated edit comments */
-.autocomment { color: gray; }
-
 
 /*
 ** Structural Elements
 */
 
 /*
-** the portlets (elements in the quickbar)
+** general portlet styles (elements in the quickbar)
 */
 .portlet {
     border: none;
@@ -585,27 +493,12 @@ div.townBox dl dd {
     font-weight: normal;
     white-space: nowrap;
 }
-.portletBody {
+.pBody {
     font-size: 95%;
     background: White;
     border-collapse: collapse;
     border: 1px solid #aaaaaa;
-}
-.portletDetails {
-    text-align: right;
-}
-.portletMore {
-    display: block;
-    text-align: right;
-}
-.portletContent {
-    padding: 0.1em 0.8em 0.7em 0.5em;
-}
-.portletClose {
-    float: right;
-    text-transform: none;
-    border-left: 1px solid #2f6fab;
-    padding: 0em 0.2em;
+    padding: 0 0.8em 0.3em 0.5em;
 }
 .portlet h1, 
 .portlet h2, 
@@ -614,15 +507,6 @@ div.townBox dl dd {
     margin: 0;
     padding: 0;
 }
-.portlet .even {
-    background-color: #f7f9fa;
-}
-.portlet .odd {
-    background-color: transparent;
-}
-.portlet input {
-    font-size: 100%;
-}
 .portlet ul {
     line-height: 1.5em;
     list-style-type: square;
@@ -634,26 +518,12 @@ div.townBox dl dd {
     margin: 0 0 0 0;
     margin-bottom: 0;
 }
-.even {
-    background-color: #f7f9fa;
-}
-.odd {
-    background-color: transparent;
-}
-.visualHighlight {
-    background-color: #f7f9fa;
-}
-.discreet {
-    color: #76797c;
-    font-size: 80%;
-    font-weight: normal;
-}
 
 /* 
 ** Logo properties 
 */
- 
-#portlet-logo {
+
+#p-logo {
     z-index: 3;
     position:absolute; /*needed to use z-index */
     top: 0;
@@ -662,9 +532,9 @@ div.townBox dl dd {
     width: 12em;
     overflow: visible;
 }
-#portlet-logo h5 { display: none; }
-#portlet-logo a,
-#portlet-logo a:hover {
+#p-logo h5 { display: none; }
+#p-logo a,
+#p-logo a:hover {
     display: block;
     height: 155px;
     width: 12.2em;
@@ -677,23 +547,19 @@ div.townBox dl dd {
 ** the navigation portlet
 */
 
-
-#portlet-navigation {
+#p-nav {
     position:relative;
     z-index:3;
 }
-#portlet-navigation .plain {
-    white-space: nowrap;
-}
 
 /*
 ** Search portlet
 */
-#portlet-search {
+#p-search {
     position:relative;
     z-index:3;
 }    
-#portlet-search .portletBody {
+#p-search .pBody {
     text-align: center;
 }
 input.searchButton {
@@ -705,7 +571,7 @@ input.searchButton {
     border: 1px solid #2f6fab;  
 }
 
-#searchGadget {
+#searchInput {
     border: 1px solid #2f6fab;  
     width:10.9em;
     margin: 0 0 0 0;
@@ -713,7 +579,7 @@ input.searchButton {
 }
 
 
-#portlet-search .portletContent {
+#p-search .pBody {
     padding: 0.5em 0.4em 0.4em 0.4em;
 }
 
@@ -722,7 +588,7 @@ input.searchButton {
 ** the personal toolbar
 */
 
-#portlet-personal {
+#p-personal {
     width:100%;
     white-space:nowrap;
     padding:0 0 0 0;
@@ -732,37 +598,25 @@ input.searchButton {
     top:0px;
     z-index: 0;
     border: none;
-    background-color: transparent;
+    background: none;
     overflow: visible;
     line-height: 1.2em;
 }
 
-#portlet-personal h5 {
+#p-personal h5 {
     display:none;
 }
-#portlet-personal .portlet,
-#portlet-personal .portletBody,
-#portlet-personal .portletContent,
-#portlet-personal .odd{
+#p-personal .portlet,
+#p-personal .pBody {
     padding:0;
     margin:0;
     border: none;
     z-index:0;
     overflow: visible;
-    background-color: transparent;
-}
-#portal-personal ul,
-#portal-personal li {
-    z-index:0;
-    border:none;
-    background-color: transparent;
+    background: none;
 }
-
 /* this is the ul contained in the portlet */
-
-#portal-personaltools {
-/*    background-color: #fabd23;*/
-/*    border-bottom-color: #2f6fab;*/
+#p-personal ul {
     border: none;
     line-height: 1.4em;
     color: #2f6fab;
@@ -772,31 +626,25 @@ input.searchButton {
     text-transform: lowercase;
     list-style: none;
     z-index:0;
-    background-color: transparent;
+    background: none;
 }
-
-#portal-personaltools .portalNotLoggedIn {
-    color: #2f6fab;
-    padding: 0;
-    background: transparent;
-    background-image: none;
-} /* Used on all descriptions relevant to those not logged in */
- 
-#portal-personaltools li {
+#p-personal li {
+    z-index:0;
+    border:none;
     padding:0;
     display: inline;
     color: #2f6fab;
     margin-left: 1em;
     line-height: 1.2em;
-    background-color: transparent;
+    background: none;
 }
-#portal-personaltools li a {
+#p-personal li a {
     text-decoration: none;
     color: #005896;
     padding-bottom: 0.2em;
     background: none;
 }
-#portal-personaltools li a:hover {
+#p-personal li a:hover {
     background-color: White;
     padding-bottom: 0.2em;
     text-decoration: none;
@@ -804,10 +652,10 @@ input.searchButton {
 
 /* the icon in front of the user name, single quotes
 in bg url to hide it from iemac */
-li#personaltools-userpage,
-li#personaltools-anonuserpage,
-li#personaltools-login {
-    background: transparent url('user.gif') center left no-repeat;
+li#pt-userpage,
+li#pt-anonuserpage,
+li#pt-login {
+    background:  url('user.gif') center left no-repeat;
     background-repeat: no-repeat;
     padding-left: 20px;
     text-transform: none;
@@ -817,7 +665,7 @@ li#personaltools-login {
 ** the page-related actions- page/talk, edit etc 
 */
 
-#portlet-contentViews {
+#p-cactions {
     position:absolute;
     top: 1.3em;
     left: 11.5em;
@@ -826,17 +674,17 @@ li#personaltools-login {
     width: 76%;
     line-height: 1.1em;
     overflow: visible;
-    background-color: transparent;
+    background: none;
     border-collapse: collapse;
     padding-left: 1em;
     list-style: none;
     font-size: 95%;
 }
-#portlet-contentViews .hiddenStructure { display: none; }
-#portlet-contentViews ul {
+#p-cactions .hiddenStructure { display: none; }
+#p-cactions ul {
     list-style: none;
 }
-#portlet-contentViews li {
+#p-cactions li {
     display: inline;
     border: 1px solid #aaaaaa;
     border-bottom: none;
@@ -845,11 +693,11 @@ li#personaltools-login {
     overflow: visible;
     background: White;
 }
-#portlet-contentViews li.selected {
+#p-cactions li.selected {
     border-color: #fabd23;
     padding: 0 0 0.2em 0;
 }
-#portlet-contentViews li a {
+#p-cactions li a {
     background-color: White;
     color: #005189;
     border: none;
@@ -860,32 +708,23 @@ li#personaltools-login {
     z-index: 0;
     margin: 0;
 }
-#portlet-contentViews .selected a {
-    z-index: 3;
-}
-#portlet-contentViews .new a {
-    color:#ba0000;
-}
-#portlet-contentViews li a:hover {
+#p-cactions .selected a { z-index: 3; }
+#p-cactions .new a { color:#ba0000; }
+#p-cactions li a:hover {
     z-index: 3;
     text-decoration: none;
 }
-#portlet-contentViews h5 { display: none; }
-
+#p-cactions h5 { display: none; }
 /* offsets to distinguish the tab groups */
-li#contentaction-talk {
-    margin-right: 1.6em;
-}
-li#contentaction-watch {
-    margin-left: 1.6em;
-}
+li#ca-talk { margin-right: 1.6em; }
+li#ca-watch { margin-left: 1.6em; }
 
 
 /*
 ** the remaining portlets
 */
-#portlet-toolbox,
-#portlet-language {
+#p-tbx,
+#p-lang {
     position:relative;
     z-index:3;
 }
@@ -893,35 +732,33 @@ li#contentaction-watch {
 /*
 ** footer
 */
-#portal-footer {
+#footer {
     background-color: White;
     border-top: 1px solid #fabd23;
     border-bottom: 1px solid #fabd23;
-    margin: 0.3em 0em 1em 0em;
-    padding: 0.4em 0em 1em 0em;
+    margin: 0.6em 0em 1em 0em;
+    padding: 0.4em 0em 1.2em 0em;
     text-align: center;
     font-size: 90%;
 }
-#portal-footer li {
+#footer li {
     display: inline;
     margin: 0 1.3em;
 }
 /* hide from incapable browsers */
-head:first-child+body #portal-footer li {
-    white-space: nowrap;
-}
-#footer-poweredbyico, #footer-copyrightico {
-        margin: 0 8px;
-        position: relative;
-        top: -2px; /* Bump it up just a tad */
+head:first-child+body #footer li { white-space: nowrap; }
+#f-poweredbyico, #f-copyrightico {
+    margin: 0 8px;
+    position: relative;
+    top: -2px; /* Bump it up just a tad */
 }
-#footer-poweredbyico {
-        float: right;
-        height: 1%;
+#f-poweredbyico {
+    float: right;
+    height: 1%;
 }
-#footer-copyrightico {
-        float: left;
-        height: 1%;
+#f-copyrightico {
+    float: left;
+    height: 1%;
 }
 
 /* 
@@ -931,27 +768,19 @@ head:first-child+body #portal-footer li {
 */
 
 /* tabs: border on the a, not the div */
-*>html #portlet-contentViews li {
-    border:none;
-}
-*>html #portlet-contentViews li a {
+*>html #p-cactions li { border:none; }
+*>html #p-cactions li a {
     border: 1px solid #aaaaaa;
     border-bottom: none;
 }
-*>html #portlet-contentViews li.selected a {
-    border-color: #fabd23;
-}
+*>html #p-cactions li.selected a { border-color: #fabd23; }
 /* footer icons need a fixed width */
-*>html #footer-poweredbyico,
-*>html #footer-copyrightico {
-    width: 88px;
-}
+*>html #f-poweredbyico,
+*>html #f-copyrightico { width: 88px; }
 
 /* more IE fixes */
 /* fixes for broken IE float handling */
-* html #portal-column-content {
-    display: inline;
-}
+* html #column-content { display: inline; }
 
 /* float/negative margin brokenness */
 * html #bodyContent pre,
@@ -965,17 +794,13 @@ head:first-child+body #portal-footer li {
 /* more float brokenness */
 * html #bodyContent {
     display: inline;
-    overflow: auto;
+    overflow-x: auto;
     width: 100%;
 }
-* html div.editsection {
-    font-size: smaller;
-}
+* html #footer {margin-top: 0;}
+* html #column-content {margin-bottom: 0;}
+* html div.editsection { font-size: smaller; }
 
 /* debugging tool.. */
 /*div{ border:1px solid #000000;}*/
 
-.error {
-	color: red;
-	font-size: larger;
-}
diff --git a/stylesheets/monobook/rtl.css b/stylesheets/monobook/rtl.css
index c306a30323..d74888fe68 100644
--- a/stylesheets/monobook/rtl.css
+++ b/stylesheets/monobook/rtl.css
@@ -78,39 +78,39 @@ div.magnify,
 	float: left;
 }
 
-#portlet-logo {
+#p-logo {
 	left: auto;
 	right: 0;
 }
-#portlet-personal {
+#p-personal {
 	left: auto;
 	right: 0;
 }
 
-#portlet-contentViews {
+#p-cactions {
 	left: auto;
 	right: 11.5em;
         padding-left: 0;
         padding-right: 1em;
 }
-#portlet-contentViews li {
+#p-cactions li {
     margin-left: 0.3em;
     margin-right: 0;
     float: right;
 }
-* html #portlet-contentViews li a {
+* html #p-cactions li a {
     display: block;
     padding-bottom: 0;
 }
-* html #portlet-contentViews li a:hover {
+* html #p-cactions li a:hover {
     padding-bottom: 0.2em;
 }
 /* offsets to distinguish the tab groups */
-li#contentaction-talk {
+li#ca-talk {
     margin-right: auto;
     margin-left: 1.6em;
 }
-li#contentaction-watch {
+li#ca-watch {
     margin-right: 1.6em !important;
 }
 
@@ -170,7 +170,7 @@ li#personaltools-login {
     padding: 0 !important;
     background: none !important;
 }
-#portal-footer {
+#footer {
     clear: both;
 }
 /* IE 6 fix fixes, hide from everything else */
diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt
index f04dfefc4b..268e2f0b64 100644
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -3,9 +3,8 @@
 <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}
+    ${headlinks}
     <title tal:content="pagetitle">Exciting xhtml slimfast</title>
-
     <style type="text/css" media="screen">/*<![CDATA[*/ @import url(${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 url(${stylepath}/${skinname}/IEFixes.css);</style>
@@ -15,184 +14,166 @@
     <script type="text/javascript" src="${stylepath}/wikibits.js"></script>
     <script type="text/javascript"> /*<![CDATA[*/ if(addcss){addcss('${stylepath}/${skinname}/');} /*]]>*/</script>
     <style tal:condition="rtl" type="text/css">/*<![CDATA[*/@import url(${stylepath}/${skinname}/rtl.css);/*]]>*/</style>
-    <!-- user styles and js if logged in -->
     <style tal:condition="usercsse" type="text/css">/*<![CDATA[*/
       @import url(${usercsse}); /*]]>*/</style>
     <script tal:condition="userjs" type="text/javascript" tal:attributes="src userjs"></script>
   </head>
 
   <body tal:attributes="ondblclick body-ondblclick|default">
-    <div id="visual-portal-wrapper">
-
-      <div id="portal-column-content">
-        <div id="content">
-          <a name="top" id="contentTop"></a>
-          <div id="documentContent">
-
-            <h1 class="documentFirstHeading" tal:content="title">Leonardo da Vinci</h1>
+    <div id="globalWrapper">
+      <div id="column-content">
+	<div id="content">
+	  <a name="top" id="contentTop"></a>
+	  <h1 class="firstHeading" tal:content="title">Leonardo da Vinci</h1>
+	  <div id="bodyContent">
+	    <div tal:condition="catlinks" id="catlinks" tal:content="structure catlinks"></div>
+	    <h3 id="siteSub" i18n:translate="string:fromwikipedia">From Wikipedia, the free encyclopedia.</h3>
+	    <div id="contentSub" tal:content="structure subtitle"></div>
+	    <!-- <esi:include src="userxy/message"/> cached per user, purged on new message-->
+	    <div tal:condition="newtalk" class="usermessage" tal:content="structure newtalk"></div>
+	    <!-- the content area is cached with the remaining inexpensive sceleton, one version for all.
+	    The edit links and right-click section stuff can be attached from js -->
+	    <!-- start content -->
 
-            <div id="bodyContent">
-              <div tal:condition="catlinks" id="catlinks" tal:content="structure catlinks"></div>
-              <h3 id="siteSubtitle" i18n:translate="string:fromwikipedia">From Wikipedia, the free encyclopedia.</h3>
-              <div id="documentSubtitle" tal:content="structure subtitle"></div>
-              <!-- <esi:include src="userxy/message"/> cached per user, purged on new message-->
-              <div tal:condition="newtalk" class="portalMessage" tal:content="structure newtalk"></div>
-              <!-- the content area is cached with the remaining inexpensive sceleton, one version for all.
-              The edit links and right-click section stuff can be attached from js -->
-              <!-- start content -->
+	    ${bodytext}
 
-              ${bodytext}
-
-              <!-- end content -->
-              <div class="visualClear"></div>
-            </div>
-          </div>
-        </div>
+	    <!-- end content -->
+	    <div class="visualClear"></div>
+	  </div>
+	</div>
       </div>
       <!-- end of main content block -->
       <!-- start of the left (by default at least) column -->
-      <div id="portal-column-one">
-        <!--<esi:include src="thisurl?esiview=contentviews&watch=0&priv=sysop"/> tricky to purge because of the many different versions,
-        might not be worth it for non-anons -->
-        <div id="portlet-contentViews" class="portlet">
-          <h5>Views</h5>
-          <ul>
-            <li tal:repeat="action content_actions" 
-              tal:attributes="id string:contentaction-${repeat/action/key}; class action/class|default"><a
-              tal:attributes="title action/ttip|default;accesskey action/akey|default;href action/href|default"
-              tal:content="action/text">Linktext</a></li>
-          </ul>
-        </div>
-        <!--<esi:include src="userxy?personaltools"/> cached per user, just rendered once per session -->
-        <div class="portlet" id="portlet-personal">
-          <h5 i18n:translate="string:personaltools">Personal Tools</h5>
-          <div class="portletBody">
-            <div class="portletContent odd">
-              <ul id="portal-personaltools">
-                <li tal:repeat="item personal_urls" 
-                tal:attributes="id string:personaltools-${repeat/item/key};"><a href="myuserpage"
-                  tal:attributes="href item/href; accesskey item/akey|default; title item/ttip|default"
-                  tal:content="item/text">Log in</a></li>
-              </ul>
-            </div>
-          </div>
-        </div>
-        <!--<esi:include src="staticLogoNaviSearch"/> same for all pages, contains quite a few messages that are worth caching -->
-        <div class="portlet" id="portlet-logo">
-          <a style="background: url(${logopath}) no-repeat;" href="${nav_urls/mainpage/href}" i18n:attributes="title string:mainpage"></a>
-        </div>
-        <div class="portlet" id="portlet-navigation">
-          <h5 i18n:translate="string:navigation">Navigation</h5>
-          <div class="portletBody">
-            <div class="portletContent odd">
-              <ul>
-                <li><a href="${nav_urls/mainpage/href}"
-                  i18n:attributes="accesskey string:accesskey-mainpage | default; title string:tooltip-mainpage"
-                  i18n:translate="string:mainpage">Main Page</a></li>
-                <li tal:condition="nav_urls/portal/href"><a href="${nav_urls/portal/href}"
-                  i18n:attributes="accesskey string:accesskey-portal | default; title string:tooltip-portal|default"
-                  i18n:translate="string:portal">Community Portal</a></li>
-                <li tal:condition="nav_urls/currentevents/href"><a href="${nav_urls/currentevents/href}"
-                  i18n:attributes="title string:tooltip-currentevents|default" 
-                  i18n:translate="string:currentevents">Current Events</a></li>
-                <li><a href="${nav_urls/recentchanges/href}"
-                  i18n:attributes="accesskey string:accesskey-recentchanges|default; title string:tooltip-recentchanges|default" 
-                  i18n:translate="string:recentchanges">Recent Changes</a></li>
-                <li><a href="${nav_urls/randompage/href}"
-                  i18n:attributes="accesskey string:accesskey-randompage | default; title string:tooltip-randompage" 
-                  i18n:translate="string:randompage">Random Page</a></li>
-                <li><a href="${nav_urls/help/href}"
-                  i18n:attributes="title string:tooltip-help|default" 
-                  i18n:translate="string:help">Help</a></li>
-                <li tal:condition="nav_urls/sitesupport/href"><a href="${nav_urls/sitesupport/href}"
-                  i18n:attributes="title string:tooltip-sitesupport|default" 
-                  i18n:translate="string:sitesupport">Donations</a></li>
-              </ul>
-            </div>
-          </div>
-        </div>
-        <div id="portlet-search" class="portlet">
-          <h5 i18n:translate="string:search">Search</h5>
-          <div class="portletBody">
-            <div class="portletContent odd">
-              <form name="searchform" action="${searchaction}" id="searchform">
-                <input id="searchGadget" name="search" type="text" tabindex="30001"
-                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'
-                value="Search" class="searchButton"
-                i18n:attributes="value string:search"/>
-              </form>
-            </div>
-          </div>
-        </div>
-        <!--<esi:include src="thisurl?esiview=toolbox&loggedin=0"/> one anon, one logged-in user version per page because of the links -->
-        <div class="portlet" id="portlet-toolbox">
-          <h5 i18n:translate="string:toolbox">Toolbox</h5>
-
-          <div class="portletBody">
-            <div class="portletContent odd">
-              <ul>
-                <li><a href="${nav_urls/whatlinkshere/href}"
-                  i18n:attributes="accesskey string:accesskey-whatlinkshere|default; title string:tooltip-whatlinkshere|default" 
-                  i18n:translate="string:whatlinkshere">What links here</a></li>
-                <li><a href="${nav_urls/recentchangeslinked/href}"
-                  i18n:attributes="accesskey string:accesskey-recentchangeslinked|default;title string:tooltip-recentchangeslinked | default"
-                  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; title feed/ttip|default"
-                    tal:content="feed/text">rss</a>&nbsp;</span>
-                </li>
-                <li tal:condition="nav_urls/contributions/href"><a href="${nav_urls/contributions/href}"
-                  i18n:attributes="accesskey string:accesskey-contributions|default; title string:tooltip-contributions|default" 
-                  i18n:translate="string:contributions">Contributions</a></li>
-                <li tal:condition="nav_urls/emailuser/href"><a href="${nav_urls/emailuser/href}"
-                  i18n:attributes="accesskey string:accesskey-emailuser|default; title string:tooltip-emailuser|default" 
-                  i18n:translate="string:emailuser">Email this user</a></li>
-                <li tal:condition="loggedin"><a href="${nav_urls/upload/href}"
-                  i18n:attributes="accesskey string:accesskey-upload|default; title string:tooltip-upload|default" 
-                  i18n:translate="string:upload">Upload a file</a></li>
-                <li><a href="${nav_urls/specialpages/href}"
-                  i18n:attributes="accesskey string:accesskey-specialpages|default;title string:tooltip-specialpages|default"
-                  i18n:translate="string:specialpages">Special Pages</a></li>
-              </ul>
-            </div>
-          </div>
-        </div>
-        <!-- end staticLogoNaviSearch -->
+      <div id="column-one">
+	<!--<esi:include src="thisurl?esiview=contentviews&watch=0&priv=sysop"/> tricky to purge because of the many different versions,
+	might not be worth it for non-anons -->
+	<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="title action/ttip|default;accesskey action/akey|default;href action/href|default"
+	      tal:content="action/text">Linktext</a></li>
+	  </ul>
+	</div>
+	<!--<esi:include src="userxy?ptools"/> cached per user, just rendered once per session -->
+	<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; accesskey item/akey|default; title item/ttip|default"
+		tal:content="item/text">Log in</a></li>
+	    </ul>
+	  </div>
+	</div>
+	<!--<esi:include src="staticLogoNaviSearch"/> same for all pages, contains quite a few messages that are worth caching -->
+	<div class="portlet" id="p-logo">
+	  <a style="background: url(${logopath}) no-repeat;" 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><a href="${nav_urls/mainpage/href}"
+		i18n:attributes="accesskey string:accesskey-mainpage | default; title string:tooltip-mainpage"
+		i18n:translate="string:mainpage">Main Page</a></li>
+	      <li tal:condition="nav_urls/portal/href"><a href="${nav_urls/portal/href}"
+		i18n:attributes="accesskey string:accesskey-portal | default; title string:tooltip-portal|default"
+		i18n:translate="string:portal">Community Portal</a></li>
+	      <li tal:condition="nav_urls/currentevents/href"><a href="${nav_urls/currentevents/href}"
+		i18n:attributes="title string:tooltip-currentevents|default" 
+		i18n:translate="string:currentevents">Current Events</a></li>
+	      <li><a href="${nav_urls/recentchanges/href}"
+		i18n:attributes="accesskey string:accesskey-recentchanges|default; title string:tooltip-recentchanges|default" 
+		i18n:translate="string:recentchanges">Recent Changes</a></li>
+	      <li><a href="${nav_urls/randompage/href}"
+		i18n:attributes="accesskey string:accesskey-randompage | default; title string:tooltip-randompage" 
+		i18n:translate="string:randompage">Random Page</a></li>
+	      <li><a href="${nav_urls/help/href}"
+		i18n:attributes="title string:tooltip-help|default" 
+		i18n:translate="string:help">Help</a></li>
+	      <li tal:condition="nav_urls/sitesupport/href"><a href="${nav_urls/sitesupport/href}"
+		i18n:attributes="title string:tooltip-sitesupport|default" 
+		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" tabindex="30001"
+	      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'
+	      value="Search" class="searchButton"
+	      i18n:attributes="value string:search"/>
+	    </form>
+	  </div>
+	</div>
+	<!--<esi:include src="thisurl?esiview=toolbox&loggedin=0"/> one anon, one logged-in user version per page because of the links -->
+	<div class="portlet" id="p-tb">
+	  <h5 i18n:translate="string:toolbox">Toolbox</h5>
+	  <div class="pBody">
+	    <ul>
+	      <li><a href="${nav_urls/whatlinkshere/href}"
+		i18n:attributes="accesskey string:accesskey-whatlinkshere|default; title string:tooltip-whatlinkshere|default" 
+		i18n:translate="string:whatlinkshere">What links here</a></li>
+	      <li><a href="${nav_urls/recentchangeslinked/href}"
+		i18n:attributes="accesskey string:accesskey-recentchangeslinked|default;title string:tooltip-recentchangeslinked | default"
+		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; title feed/ttip|default"
+		  tal:content="feed/text">rss</a>&nbsp;</span>
+	      </li>
+	      <li tal:condition="nav_urls/contributions/href"><a href="${nav_urls/contributions/href}"
+		i18n:attributes="accesskey string:accesskey-contributions|default; title string:tooltip-contributions|default" 
+		i18n:translate="string:contributions">Contributions</a></li>
+	      <li tal:condition="nav_urls/emailuser/href"><a href="${nav_urls/emailuser/href}"
+		i18n:attributes="accesskey string:accesskey-emailuser|default; title string:tooltip-emailuser|default" 
+		i18n:translate="string:emailuser">Email this user</a></li>
+	      <li tal:condition="loggedin"><a href="${nav_urls/upload/href}"
+		i18n:attributes="accesskey string:accesskey-upload|default; title string:tooltip-upload|default" 
+		i18n:translate="string:upload">Upload a file</a></li>
+	      <li><a href="${nav_urls/specialpages/href}"
+		i18n:attributes="accesskey string:accesskey-specialpages|default;title string:tooltip-specialpages|default"
+		i18n:translate="string:specialpages">Special Pages</a></li>
+	    </ul>
+	  </div>
+	</div>
+	<!-- end staticLogoNaviSearch -->
 
-        <div id="portlet-language" class="portlet" tal:condition="language_urls">
-          <h5 i18n:translate="string:otherlanguages">Language</h5>
-          <div class="portletBody">
-            <div class="portletContent odd">
-              <ul>
-                <li tal:repeat="langlink language_urls">
-                <a href="mylanguagelink"
-                  tal:attributes="href langlink/href"
-                  tal:content="structure langlink/text">English</a>
-                </li>
-              </ul>
-            </div>
-          </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 -->
       <!--<esi:include src="thisurl?esiview=toolbox&loggedin=0"/> static footer, same for all pages but contains a few messaged that are worth caching --> 
       <div class="visualClear"></div>
-      <div id="portal-footer">
-        <div id="footer-poweredbyico" tal:condition="poweredbyico">${poweredbyico}</div>
-        <div id="footer-copyrightico" tal:condition="copyrightico">${copyrightico}</div>
-        <ul id="footer-list">
-          <li id="footer-lastmod" tal:condition="lastmod">${lastmod}</li>
-          <li id="footer-viewcount" tal:condition="viewcount">${viewcount}</li>
-          <li id="footer-copyright" tal:condition="copyright">${copyright}</li>
-          <li id="footer-about" tal:condition="about">${about}</li>
-          <li id="footer-disclaimer" tal:condition="disclaimer">${disclaimer}</li>
-        </ul>
+      <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-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 id="portal-colophon"></div>
+      <div id="colophon"></div>
     </div>
   </body>
 </html>
-- 
2.20.1