Massive improvements towards IE6 compatibility, but not quite back to normal yet...
authorTrevor Parscal <tparscal@users.mediawiki.org>
Wed, 24 Jun 2009 20:51:57 +0000 (20:51 +0000)
committerTrevor Parscal <tparscal@users.mediawiki.org>
Wed, 24 Jun 2009 20:51:57 +0000 (20:51 +0000)
23 files changed:
skins/Vector.php
skins/vector/images/action-fade.png [deleted file]
skins/vector/images/action-normal-fade.png [deleted file]
skins/vector/images/bullet-icon.png
skins/vector/images/foot-fade.png [deleted file]
skins/vector/images/head-base.png
skins/vector/images/head-break.png [deleted file]
skins/vector/images/namespace-current-fade.png [deleted file]
skins/vector/images/namespace-normal-fade.png [deleted file]
skins/vector/images/page-base.png
skins/vector/images/page-fade.png
skins/vector/images/panel-fade.png [deleted file]
skins/vector/images/personal-break.png [deleted file]
skins/vector/images/personal-current-fade.png [deleted file]
skins/vector/images/personal-fade.png [deleted file]
skins/vector/images/personal-normal-fade.png [deleted file]
skins/vector/images/portal-break.png [new file with mode: 0644]
skins/vector/images/tab-break.png [new file with mode: 0644]
skins/vector/images/tab-current-fade.png [new file with mode: 0644]
skins/vector/images/tab-normal-fade.png [new file with mode: 0644]
skins/vector/images/view-current-fade.png [deleted file]
skins/vector/images/view-normal-fade.png [deleted file]
skins/vector/main.css

index 1c5dfdb..c1622a2 100644 (file)
@@ -444,6 +444,7 @@ class VectorTemplate extends QuickTemplate {
                <!-- IEFixes -->
                <!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
                <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+               <style type="text/css">body{behavior:url("<?php $this->text('stylepath') ?>/vector/csshover.htc")}</style>
                <!-- /IEFixes -->
                <!-- globalVariablesScript -->
                <?php echo Skin::makeGlobalVariablesScript( $this->data ); ?>
@@ -486,219 +487,199 @@ class VectorTemplate extends QuickTemplate {
                <?php endif; ?>
        </head>
        <body<?php if($this->data['body_ondblclick']): ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php endif; ?> <?php if($this->data['body_onload']): ?> onload="<?php $this->text('body_onload') ?>"<?php endif; ?> class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>">
-               <div id="content-base"><div></div></div>
-               <div id="panel-base"></div>
-               <!-- page -->
-               <div id="page">
-                       <!-- content -->
-                       <div id="content">
-                               <div class="buffer">
-                                       <a name="top" id="top"></a>
-                                       <!-- sitenotice -->
-                                       <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-                                       <!-- /sitenotice -->
-                                       <!-- firstHeading -->
-                                       <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
-                                       <!-- /firstHeading -->
-                                       <!-- bodyContent -->
-                                       <div id="bodyContent">
-                                               <!-- tagline -->
-                                               <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
-                                               <!-- /tagline -->
-                                               <!-- subtitle -->
-                                               <div id="contentSub"><?php $this->html('subtitle') ?></div>
-                                               <!-- /subtitle -->
-                                               <?php if($this->data['undelete']): ?>
-                                               <!-- undelete -->
-                                               <div id="contentSub2"><?php $this->html('undelete') ?></div>
-                                               <!-- /undelete -->
-                                               <?php endif; ?>
-                                               <?php if($this->data['newtalk'] ): ?>
-                                               <!-- newtalk -->
-                                               <div class="usermessage"><?php $this->html('newtalk')  ?></div>
-                                               <!-- /newtalk -->
-                                               <?php endif; ?>
-                                               <?php if($this->data['showjumplinks']): ?>
-                                               <!-- jumpto -->
-                                               <div id="jump-to-nav">
-                                                       <?php $this->msg('jumpto') ?> <a href="#head"><?php $this->msg('jumptonavigation') ?></a>,
-                                                       <a href="#search"><?php $this->msg('jumptosearch') ?></a>
-                                               </div>
-                                               <!-- /jumpto -->
-                                               <?php endif; ?>
-                                               <!-- bodytext -->
-                                               <?php $this->html('bodytext') ?>
-                                               <!-- /bodytext -->
-                                               <!-- catlinks -->
-                                               <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
-                                               <!-- /catlinks -->
-                                               <!-- dataAfterContent -->
-                                               <?php if($this->data['dataAfterContent']) { $this->html('dataAfterContent'); } ?>
-                                               <!-- /dataAfterContent -->
-                                               <div class="visualClear"></div>
-                                       </div>
-                                       <!-- /bodyContent -->
+               <div id="page-base" class="noprint"></div>
+               <div id="head-base" class="noprint"></div>
+               <!-- content -->
+               <div id="content">
+                       <a name="top" id="top"></a>
+                       <!-- sitenotice -->
+                       <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
+                       <!-- /sitenotice -->
+                       <!-- firstHeading -->
+                       <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
+                       <!-- /firstHeading -->
+                       <!-- bodyContent -->
+                       <div id="bodyContent">
+                               <!-- tagline -->
+                               <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
+                               <!-- /tagline -->
+                               <!-- subtitle -->
+                               <div id="contentSub"><?php $this->html('subtitle') ?></div>
+                               <!-- /subtitle -->
+                               <?php if($this->data['undelete']): ?>
+                               <!-- undelete -->
+                               <div id="contentSub2"><?php $this->html('undelete') ?></div>
+                               <!-- /undelete -->
+                               <?php endif; ?>
+                               <?php if($this->data['newtalk'] ): ?>
+                               <!-- newtalk -->
+                               <div class="usermessage"><?php $this->html('newtalk')  ?></div>
+                               <!-- /newtalk -->
+                               <?php endif; ?>
+                               <?php if($this->data['showjumplinks']): ?>
+                               <!-- jumpto -->
+                               <div id="jump-to-nav">
+                                       <?php $this->msg('jumpto') ?> <a href="#head"><?php $this->msg('jumptonavigation') ?></a>,
+                                       <a href="#search"><?php $this->msg('jumptosearch') ?></a>
                                </div>
+                               <!-- /jumpto -->
+                               <?php endif; ?>
+                               <!-- bodytext -->
+                               <?php $this->html('bodytext') ?>
+                               <!-- /bodytext -->
+                               <!-- catlinks -->
+                               <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
+                               <!-- /catlinks -->
+                               <!-- dataAfterContent -->
+                               <?php if($this->data['dataAfterContent']) { $this->html('dataAfterContent'); } ?>
+                               <!-- /dataAfterContent -->
+                               <div class="visualClear"></div>
                        </div>
-                       <!-- /content -->
-                       <!-- header -->
-                       <div id="head" class="noprint">
-                               <div class="buffer">
-                                       <div class="top">
-                                               <!-- personal -->
-                                               <div id="personal">
-                                                       <div class="buffer">
-                                                               <h5><?php $this->msg('personaltools') ?></h5>
-                                                               <ul <?php $this->html('userlangattributes') ?>>
-                                                                       <?php foreach($this->data['personal_urls'] as $key => $item): ?>
-                                                                               <li <?php echo $item['attributes'] ?>><a href="<?php echo htmlspecialchars($item['href']) ?>"<?php echo $item['key'] ?><?php if(!empty($item['class'])): ?> class="<?php echo htmlspecialchars($item['class']) ?>"<?php endif; ?>><?php echo htmlspecialchars($item['text']) ?></a></li>
-                                                                       <?php endforeach; ?>
-                                                               </ul>
-                                                       </div>
-                                               </div>
-                                               <!-- /personal -->
-                                       </div>
-                                       <div class="middle">
-                                               <!-- namespaces -->
-                                               <div id="namespaces">
-                                                       <h5><?php $this->msg('namespaces') ?></h5>
-                                                       <ul <?php $this->html('userlangattributes') ?>>
-                                                               <?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
-                                                                       <li <?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
-                                                               <?php endforeach; ?>
-                                                       </ul>
-                                               </div>
-                                               <!-- /namespaces -->
-                                               <!-- variants -->
-                                               <?php if ( count( $this->data['variant_urls'] ) > 0 ): ?>
-                                               <div id="variants">
-                                                       <h5><div class="icon"><span><?php $this->msg('variants') ?></span></div></h5>
-                                                       <div class="menu">
-                                                               <ul <?php $this->html('userlangattributes') ?>>
-                                                                       <?php foreach ($this->data['variant_urls'] as $key => $link ): ?>
-                                                                               <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
-                                                                       <?php endforeach; ?>
-                                                               </ul>
-                                                       </div>
-                                               </div>
-                                               <?php endif; ?>
-                                               <!-- /variants -->
-                                       </div>
-                                       <div class="bottom">
-                                               <!-- views -->
-                                               <?php if ( count( $this->data['view_urls'] ) > 0 ): ?>
-                                               <div id="views">
-                                                       <h5><?php $this->msg('views') ?></h5>
-                                                       <ul <?php $this->html('userlangattributes') ?>>
-                                                               <?php foreach ($this->data['view_urls'] as $key => $link ): ?>
-                                                                       <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
-                                                               <?php endforeach; ?>
-                                                       </ul>
-                                               </div>
-                                               <?php endif; ?>
-                                               <!-- /views -->
-                                               <!-- actions -->
-                                               <?php if ( count( $this->data['action_urls'] ) > 0 ): ?>
-                                               <div id="actions">
-                                                       <h5><div class="icon"><span><?php $this->msg('actions') ?></span></div></h5>
-                                                       <div class="menu">
-                                                               <ul <?php $this->html('userlangattributes') ?>>
-                                                                       <?php foreach ($this->data['action_urls'] as $key => $link ): ?>
-                                                                               <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
-                                                                       <?php endforeach; ?>
-                                                               </ul>
-                                                       </div>
-                                               </div>
-                                               <?php endif; ?>
-                                               <!-- /actions -->
-                                               <!-- search -->
-                                               <div id="search">
-                                                       <div class="buffer">
-                                                               <h5 <?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
-                                                               <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
-                                                                       <div>
-                                                                               <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
-                                                                               <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
-                                                                               <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg( 'searcharticle' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> />
-                                                                               <?php if ( $wgUseTwoButtonsSearchForm ): ?>
-                                                                               <input type="submit" name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg( 'searchbutton' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
-                                                                               <?php else: ?>
-                                                                               <div><a href="<?php $this->text( 'searchaction' ) ?>" rel="search"><?php $this->msg( 'powersearch-legend' ) ?></a></div>
-                                                                               <?php endif; ?>
-                                                                       </div>
-                                                               </form>
-                                                       </div>
-                                               </div>
-                                               <!-- /search -->
-                                       </div>
-                               </div>
+                       <!-- /bodyContent -->
+               </div>
+               <!-- /content -->
+               <!-- header -->
+               <div id="head" class="noprint">
+                       <!-- personal -->
+                       <div id="personal">
+                               <h5><?php $this->msg('personaltools') ?></h5>
+                               <ul <?php $this->html('userlangattributes') ?>>
+                                       <?php foreach($this->data['personal_urls'] as $key => $item): ?>
+                                               <li <?php echo $item['attributes'] ?>><a href="<?php echo htmlspecialchars($item['href']) ?>"<?php echo $item['key'] ?><?php if(!empty($item['class'])): ?> class="<?php echo htmlspecialchars($item['class']) ?>"<?php endif; ?>><?php echo htmlspecialchars($item['text']) ?></a></li>
+                                       <?php endforeach; ?>
+                               </ul>
                        </div>
-                       <!-- /header -->
-                       <!-- panel -->
-                       <div id="panel" class="noprint">
-                               <div class="buffer">
-                                       <!-- fixalpha -->
-                                       <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
-                                       <!-- /fixalpha -->
-                                       <!-- sidebar -->
-                                       <?php
-                                               $sidebar = $this->data['sidebar'];
-                                               $sidebar['TOOLBOX'] = ( !isset( $sidebar['TOOLBOX'] ) );
-                                               $sidebar['LANGUAGES'] = ( !isset( $sidebar['LANGUAGES'] ) );
-                                               foreach ( $sidebar as $name => $content ) {
-                                                       switch( $name ) {
-                                                               case 'SEARCH':
-                                                                       break;
-                                                               case 'TOOLBOX':
-                                                                       $this->toolBox();
-                                                                       break;
-                                                               case 'LANGUAGES':
-                                                                       $this->languageBox();
-                                                                       break;
-                                                               default:
-                                                                       $this->customBox( $name, $content );
-                                                                       break;
-                                                       }
-                                               }
-                                       ?>
-                                       <!-- /sidebar -->
+                       <!-- /personal -->
+                       <div id="left-navigation">
+                               <!-- namespaces -->
+                               <div id="namespaces">
+                                       <h5><?php $this->msg('namespaces') ?></h5>
+                                       <ul <?php $this->html('userlangattributes') ?>>
+                                               <?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
+                                                       <li <?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
+                                               <?php endforeach; ?>
+                                       </ul>
+                               </div>
+                               <!-- /namespaces -->
+                               <!-- variants -->
+                               <?php if ( count( $this->data['variant_urls'] ) > 0 ): ?>
+                               <div id="variants">
+                                       <h5><div class="icon"><span><?php $this->msg('variants') ?></span></div></h5>
+                                       <div class="menu">
+                                               <ul <?php $this->html('userlangattributes') ?>>
+                                                       <?php foreach ($this->data['variant_urls'] as $key => $link ): ?>
+                                                               <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
+                                                       <?php endforeach; ?>
+                                               </ul>
+                                       </div>
                                </div>
+                               <?php endif; ?>
+                               <!-- /variants -->
                        </div>
-                       <!-- /panel -->
-                       <div class="break"></div>
-                       <!-- foot -->
-                       <div id="foot">
-                               <div class="buffer">
-                                       <ul id="foot-icons" class="noprint">
-                                               <?php if( $this->data['poweredbyico'] ): ?>
-                                               <li id="foot-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li>
-                                               <?php endif; ?>
-                                               <?php if( $this->data['copyrightico'] ): ?>
-                                               <li id="foot-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li>
-                                               <?php endif; ?>
+                       <div id="right-navigation">
+                               <!-- views -->
+                               <?php if ( count( $this->data['view_urls'] ) > 0 ): ?>
+                               <div id="views">
+                                       <h5><?php $this->msg('views') ?></h5>
+                                       <ul <?php $this->html('userlangattributes') ?>>
+                                               <?php foreach ($this->data['view_urls'] as $key => $link ): ?>
+                                                       <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
+                                               <?php endforeach; ?>
                                        </ul>
-                                       <?php foreach( $validFooterLinks as $category => $links ): ?>
-                                               <?php if ( count( $links ) > 0 ): ?>
-                                               <ul id="foot-<?php echo $category ?>">
-                                                       <?php foreach( $links as $link ): ?>
-                                                               <?php if( isset( $this->data[$link] ) && $this->data[$link] ): ?>
-                                                               <li id="foot-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li>
-                                                               <?php endif; ?>
+                               </div>
+                               <?php endif; ?>
+                               <!-- /views -->
+                               <!-- actions -->
+                               <?php if ( count( $this->data['action_urls'] ) > 0 ): ?>
+                               <div id="actions">
+                                       <h5><span><?php $this->msg('actions') ?></span><a href="#">&nbsp;</a></h5>
+                                       <div class="menu">
+                                               <ul <?php $this->html('userlangattributes') ?>>
+                                                       <?php foreach ($this->data['action_urls'] as $key => $link ): ?>
+                                                               <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
                                                        <?php endforeach; ?>
                                                </ul>
+                                       </div>
+                               </div>
+                               <?php endif; ?>
+                               <!-- /actions -->
+                               <!-- search -->
+                               <div id="search">
+                                       <h5 <?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
+                                       <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
+                                               <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
+                                               <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
+                                               <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg( 'searcharticle' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> />
+                                               <?php if ( $wgUseTwoButtonsSearchForm ): ?>
+                                               <input type="submit" name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg( 'searchbutton' ) ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
+                                               <?php else: ?>
+                                               <div><a href="<?php $this->text( 'searchaction' ) ?>" rel="search"><?php $this->msg( 'powersearch-legend' ) ?></a></div>
                                                <?php endif; ?>
-                                       <?php endforeach; ?>
-                                       <div style="clear:both"></div>
+                                       </form>
                                </div>
+                               <!-- /search -->
                        </div>
-                       <!-- /foot -->
                </div>
-               <!-- /page -->
+               <!-- /header -->
+               <!-- panel -->
+               <div id="panel" class="noprint">
+                       <!-- sidebar -->
+                       <?php
+                               $sidebar = $this->data['sidebar'];
+                               $sidebar['TOOLBOX'] = ( !isset( $sidebar['TOOLBOX'] ) );
+                               $sidebar['LANGUAGES'] = ( !isset( $sidebar['LANGUAGES'] ) );
+                               foreach ( $sidebar as $name => $content ) {
+                                       switch( $name ) {
+                                               case 'SEARCH':
+                                                       break;
+                                               case 'TOOLBOX':
+                                                       $this->toolBox();
+                                                       break;
+                                               case 'LANGUAGES':
+                                                       $this->languageBox();
+                                                       break;
+                                               default:
+                                                       $this->customBox( $name, $content );
+                                                       break;
+                                       }
+                               }
+                       ?>
+                       <!-- /sidebar -->
+               </div>
+               <!-- /panel -->
+               <div class="break"></div>
+               <!-- foot -->
+               <div id="foot">
+                       <?php foreach( $validFooterLinks as $category => $links ): ?>
+                               <?php if ( count( $links ) > 0 ): ?>
+                               <ul id="foot-<?php echo $category ?>">
+                                       <?php foreach( $links as $link ): ?>
+                                               <?php if( isset( $this->data[$link] ) && $this->data[$link] ): ?>
+                                               <li id="foot-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li>
+                                               <?php endif; ?>
+                                       <?php endforeach; ?>
+                               </ul>
+                               <?php endif; ?>
+                       <?php endforeach; ?>
+                       <ul id="foot-icons" class="noprint">
+                               <?php if( $this->data['poweredbyico'] ): ?>
+                               <li id="foot-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li>
+                               <?php endif; ?>
+                               <?php if( $this->data['copyrightico'] ): ?>
+                               <li id="foot-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li>
+                               <?php endif; ?>
+                       </ul>
+                       <div style="clear:both"></div>
+               </div>
+               <!-- /foot -->
                <!-- logo -->
                <div id="logo">
                        <a style="background-image: url(<?php $this->text('logopath') ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey('p-logo') ?>></a>
                </div>
                <!-- /logo -->
+               <!-- fixalpha -->
+               <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha( 'logo' ); </script>
+               <!-- /fixalpha -->
                <?php $this->html( 'bottomscripts' ); /* JS call to runBodyOnloadHook */ ?>
                <?php $this->html( 'reporttime' ) ?>
                <?php if ( $this->data['debug'] ): ?>
diff --git a/skins/vector/images/action-fade.png b/skins/vector/images/action-fade.png
deleted file mode 100644 (file)
index e85657a..0000000
Binary files a/skins/vector/images/action-fade.png and /dev/null differ
diff --git a/skins/vector/images/action-normal-fade.png b/skins/vector/images/action-normal-fade.png
deleted file mode 100644 (file)
index e85657a..0000000
Binary files a/skins/vector/images/action-normal-fade.png and /dev/null differ
index 72271ad..f51466b 100644 (file)
Binary files a/skins/vector/images/bullet-icon.png and b/skins/vector/images/bullet-icon.png differ
diff --git a/skins/vector/images/foot-fade.png b/skins/vector/images/foot-fade.png
deleted file mode 100644 (file)
index e163c88..0000000
Binary files a/skins/vector/images/foot-fade.png and /dev/null differ
index af63f73..1c2bea5 100644 (file)
Binary files a/skins/vector/images/head-base.png and b/skins/vector/images/head-base.png differ
diff --git a/skins/vector/images/head-break.png b/skins/vector/images/head-break.png
deleted file mode 100644 (file)
index c30175a..0000000
Binary files a/skins/vector/images/head-break.png and /dev/null differ
diff --git a/skins/vector/images/namespace-current-fade.png b/skins/vector/images/namespace-current-fade.png
deleted file mode 100644 (file)
index 44a68b8..0000000
Binary files a/skins/vector/images/namespace-current-fade.png and /dev/null differ
diff --git a/skins/vector/images/namespace-normal-fade.png b/skins/vector/images/namespace-normal-fade.png
deleted file mode 100644 (file)
index 491731d..0000000
Binary files a/skins/vector/images/namespace-normal-fade.png and /dev/null differ
index e661231..0a4d584 100644 (file)
Binary files a/skins/vector/images/page-base.png and b/skins/vector/images/page-base.png differ
index 441c1c3..b4c3c5c 100644 (file)
Binary files a/skins/vector/images/page-fade.png and b/skins/vector/images/page-fade.png differ
diff --git a/skins/vector/images/panel-fade.png b/skins/vector/images/panel-fade.png
deleted file mode 100644 (file)
index fd851f8..0000000
Binary files a/skins/vector/images/panel-fade.png and /dev/null differ
diff --git a/skins/vector/images/personal-break.png b/skins/vector/images/personal-break.png
deleted file mode 100644 (file)
index 5ba20c3..0000000
Binary files a/skins/vector/images/personal-break.png and /dev/null differ
diff --git a/skins/vector/images/personal-current-fade.png b/skins/vector/images/personal-current-fade.png
deleted file mode 100644 (file)
index 8634d95..0000000
Binary files a/skins/vector/images/personal-current-fade.png and /dev/null differ
diff --git a/skins/vector/images/personal-fade.png b/skins/vector/images/personal-fade.png
deleted file mode 100644 (file)
index 12f6ab4..0000000
Binary files a/skins/vector/images/personal-fade.png and /dev/null differ
diff --git a/skins/vector/images/personal-normal-fade.png b/skins/vector/images/personal-normal-fade.png
deleted file mode 100644 (file)
index 86bb15f..0000000
Binary files a/skins/vector/images/personal-normal-fade.png and /dev/null differ
diff --git a/skins/vector/images/portal-break.png b/skins/vector/images/portal-break.png
new file mode 100644 (file)
index 0000000..fd851f8
Binary files /dev/null and b/skins/vector/images/portal-break.png differ
diff --git a/skins/vector/images/tab-break.png b/skins/vector/images/tab-break.png
new file mode 100644 (file)
index 0000000..c30175a
Binary files /dev/null and b/skins/vector/images/tab-break.png differ
diff --git a/skins/vector/images/tab-current-fade.png b/skins/vector/images/tab-current-fade.png
new file mode 100644 (file)
index 0000000..65cd272
Binary files /dev/null and b/skins/vector/images/tab-current-fade.png differ
diff --git a/skins/vector/images/tab-normal-fade.png b/skins/vector/images/tab-normal-fade.png
new file mode 100644 (file)
index 0000000..8456b38
Binary files /dev/null and b/skins/vector/images/tab-normal-fade.png differ
diff --git a/skins/vector/images/view-current-fade.png b/skins/vector/images/view-current-fade.png
deleted file mode 100644 (file)
index 55ba5d2..0000000
Binary files a/skins/vector/images/view-current-fade.png and /dev/null differ
diff --git a/skins/vector/images/view-normal-fade.png b/skins/vector/images/view-normal-fade.png
deleted file mode 100644 (file)
index e85657a..0000000
Binary files a/skins/vector/images/view-normal-fade.png and /dev/null differ
index cb23cf8..4208da4 100644 (file)
@@ -10,678 +10,312 @@ body {
 body.rtl {
        direction: rtl;
        unicode-bidi: embed;
-       background-position: top right;
 }
-
-/* Content Base */
-div#content-base {
-       position: fixed;
-       top: 0;
-       left: 0;
-       height: 101%;
-       width: 100%;
-}
-       div#content-base > div {
-               height: 100%;
-               margin-left: 12em; /* PANEL WIDTH */
-               background-color: white;
-               background-image: url(images/content-base.png);
-               background-position: top left;
-               background-repeat: repeat-y;
-       }
-       body.rtl div#content-base > div {
-               margin-left: 0;
-               margin-right: 12em; /* PANEL WIDTH */
-               background-position: top right;
-       }
-
-/* Panel Base */
-div#panel-base {
-       position: fixed;
-       top: 0;
-       left: 0;
-       height: 101%;
-       width: 12em; /* PANEL WIDTH */
+body {
        background-image: url(images/page-base.png);
-       background-repeat: repeat;
-}
-body.rtl div#panel-base {
-       left: auto;
-       right: 0;
 }
 
-/* Page */
-div#page {
-       position: absolute;
-       top: 0;
-       left: 0;
-       height: 100%;
-       width: 100%;
-}
-       div#page div.break {
-               clear: both;
-       }
-
-/* Panel */
-div#panel {
-       margin-top: 155px; /* LOGO HEIGHT */
-       width: 12em; /* PANEL WIDTH */
+/* Content */
+div#content {
+       margin-left: 12em;
+       padding: 1em;
+       background-image: url(images/content-base.png);
+       background-position: top left;
+       background-repeat: repeat-y;
+       background-color: white;
 }
-       div#panel > div.buffer {
-               padding-top: 1em;
-       }
-       div#panel > div.buffer > div.portal {
-               padding-top: 1.5em;
-       }
-       div#panel > div.buffer:first-child {
-               padding-top: 0em;
-       }
-       div#panel > div.buffer > div.portal > h5 {
-               font-weight: normal;
-               color: #666666;
-               padding: 0.5em;
-               padding-top: 0;
-               padding-bottom: 0.33em;
-               padding-left: 1.25em;
-               cursor: default;
-       }
-       body.rtl div#panel > div.buffer > div.portal > h5 {
-               padding: 0;
-               margin: 0;
-               padding-left: 0;
-               padding-right: 1.25em;
-       }
-       div#panel > div.buffer > div.portal > div.body {
-               padding-top: 0.33em;
-               margin-left: 1.25em;
-               background-image: url(images/panel-fade.png);
-               background-repeat: no-repeat;
-               background-position: top left;
-       }
-       body.rtl div#panel > div.buffer > div.portal > div.body {
-               padding-left: 0;
-               margin-right: 1.25em;
-               background-position: top right;
-       }
-       div#panel > div.buffer > div.portal > div.body > ul {
-               list-style: none;
-               padding: 0;
-               margin: 0;
-       }
-       div#panel > div.buffer > div.portal > div.body > ul > li {
-               padding: 0;
-               padding-bottom: 0.5em;
-               margin: 0;
-               overflow: hidden;
-       }
-       div#panel > div.buffer > div.portal > div.body > ul > li > a {
-               color: #0645ad;
-       }
-       div#panel > div.buffer > div.portal > div.body > ul > li > a:visited {
-               color: #0b0080;
-       }
-
-/* Logo */
-#logo {
-       position: absolute;
-       top: 0;
-       left: 0;
-       height: 155px; /* LOGO HEIGHT */
-       width: 12em; /* PANEL WIDTH */
-       overflow: visible;
+/* Head */
+div#page-base {
+       height: 6em;
+       background-color: white;
        background-image: url(images/page-fade.png);
-       background-position: top left;
+       background-position: bottom left;
        background-repeat: repeat-x;
 }
-body.rtl #logo {
-       left: auto;
-       right: 0;
-       background-position: top right;
-}
-       #logo > a,
-       #logo > a:hover {
-               display: block;
-               height: 155px; /* LOGO HEIGHT */
-               width: 12em; /* PANEL WIDTH */
-               background-repeat: no-repeat;
-               background-position: center center;
-               text-decoration: none;
-       }
-
-/* Content */
-div#content {
-       float: right;
-       width: 100%;
-       margin-top: 6em; /* HEAD HEIGHT */
-       margin-left: -12em; /* PANEL WIDTH */
-}
-body.rtl div#content {
-       float: left;
-       margin-left: 0;
-       margin-right: -12em; /* PANEL WIDTH */
+div#head-base {
+       margin-top: -6em;
+       margin-left: 12em;
+       height: 6em;
+       background-image: url(images/head-base.png);
+       background-position: bottom left;
+       background-repeat: repeat-x;
 }
-       div#content > div.buffer {
-               margin-left: 12em; /* PANEL WIDTH */
-               padding: 10px;
-               background-color: white;
-               background-image: url(images/content-base.png);
-               background-position: top left;
-               background-repeat: repeat-y;
-       }
-       body.rtl div#content > div.buffer {
-               margin-left: 0;
-               margin-right: 12em; /* PANEL WIDTH */
-               background-position: top right;
-       }
-
-/* Head */
 div#head {
        position: absolute;
        top: 0;
-       height: 6em; /* HEAD HEIGHT */
+       right: 0;
        width: 100%;
-       background-image: url(images/page-fade.png);
-       background-position: top left;
-       background-repeat: repeat-x;
-}
-body.rtl div#head {
-       background-position: top right;
+       margin-right: 0.75em;
 }
-       div#head > div.buffer {
-               margin-left: 12em; /* PANEL WIDTH */
-               height: 100%;
-               background-image: url(images/head-base.png);
-               background-position: bottom left;
-               background-repeat: repeat-x;
-       }
-       body.rtl div#head > div.buffer {
-               margin-left: 0;
-               margin-right: 12em; /* PANEL WIDTH */
-               background-position: bottom right;
-       }
-       div#head > div.buffer > div.top {
-               height: 3em; /* HALF HEAD HEIGHT */
-               float: right;
-       }
-       body.rtl div#head > div.buffer > div.top {
-               float: left;
-       }
-       div#head > div.buffer > div.bottom {
-               margin-top: -3em; /* HALF HEAD HEIGHT */
-               height: 3em; /* HALF HEAD HEIGHT */
-               float: right;
-       }
-       body.rtl div#head > div.buffer > div.bottom {
-               float: left;
-       }
-       div#head > div.buffer > div.middle {
-               height: 3em; /* HALF HEAD HEIGHT */
-               width: 100%;
-               clear: both;
-       }
-       body.rtl div#head > div.buffer > div.middle {
-               float: right;
-       }
-
-/* Foot */
-div#foot {
-       margin-left: 12em; /* PANEL WIDTH */
-       background-image: url(images/page-base.png);
-       background-repeat: repeat;
+div#head ul,
+div#head li {
+       list-style: none;
+       margin: 0;
+       padding: 0;
 }
-body.rtl div#foot {
-       margin-left: 0;
-       margin-right: 12em; /* PANEL WIDTH */
-       background-position: top right;
+div#head h5 {
+       margin: 0;
+       padding: 0;
 }
-       div#foot > div.buffer {
-               background-image: url(images/foot-base.png);
-               background-position: top left;
-               background-repeat: repeat-x;
-               padding: 0.75em;
-       }
-       body.rtl div#foot > div.buffer {
-               margin-left: 0;
-               margin-right: 1px;
-               background-position: top right;
-       }
-       div#foot ul {
-               margin: 0;
-               padding: 0;
-               list-style: none;
-       }
-       div#foot li {
-               font-size: x-small;
-               color: #666666;
-       }
-       div#foot a {
-               color: #0645ad;
-               
+       /* Personal */
+       div#personal {
+               position: absolute;
+               top: 0;
+               right: 0;
        }
-       div#foot a:visited {
-               color: #0b0080;
+       div#personal h5 {
+               display: none;
        }
-
-/* Foot Icons */
-ul#foot-icons {
-       float: right;
-       width: 88px;
-       margin-right: 0.75em;
-}
-       body.rtl ul#foot-icons {
+       div#personal li {
                float: left;
                margin-left: 0.75em;
-               margin-right: 0;
+               margin-top: 0.5em;
+               /*font-size: 0.9em;*/
        }
-       ul#foot-icons > li {
-               margin-bottom: 0.75em;
-               margin-top: 0.2em;
+       /* Navigation */
+       div#left-navigation {
+               margin-top: 3em;
+               margin-left: 12.75em;
        }
-
-/* Foot Info */
-ul#foot-info {
-       float: left;
-}
-       body.rtl ul#foot-info {
+       div#right-navigation {
                float: right;
        }
-       ul#foot-info > li {
-               padding: 0em;
-               padding-bottom: 0.5em;
-               margin: 0em;
-               margin-bottom: 0.5em;
-               border-bottom: dashed 1px #DEDEDE;
-       }
-
-/* Foot Places */
-ul#foot-places {
-       clear: left;
-       float: left;
-}
-       body.rtl ul#foot-places {
-               clear: right;
-               float: right;
-       }
-       ul#foot-places > li {
-               float: left;
-               padding: 0;
-               padding-bottom: 0.5em;
-               margin: 0;
-               margin-right: 1.5em;
-       }
-       body.rtl ul#foot-places > li {
-               float: right;
-               margin-left: 1.5em;
-               margin-right: 0;
-       }
-
-/* Namespaces */
-div#namespaces {
-       float: left;
-       height: 3em; /* HALF HEAD HEIGHT */
-       background-image: url(images/head-break.png);
-       background-position: bottom right;
-       background-repeat: no-repeat;
-       padding-right: 1px;
-}
-body.rtl div#namespaces {
-       float: right;
-       background-position: bottom left;
-       padding-right: 0;
-       padding-left: 1px;
-}
-       div#namespaces h5 {
+       /* Navigation Labels */
+       div#namespaces h5,
+       div#variants h5,
+       div#views h5,
+       div#actions h5 span,
+       div#search h5 {
                display: none;
        }
-       div#namespaces > ul {
-               height: 100%;
-               list-style: none;
-               margin: 0;
-               padding: 0;
-       }
-       div#namespaces > ul > li {
+       /* Namespaces and Views */
+       div#namespaces,
+       div#views {
                float: left;
-               height: 100%;
-               margin: 0;
-               padding: 0;
-               background-image: url(images/namespace-normal-fade.png);
-               background-position: bottom left;
-               background-repeat: repeat-x;
-       }
-       body.rtl div#namespaces > ul > li {
-               float: right;
-               background-position: bottom right;
-       }
-       div#namespaces > ul > li > a {
-               display: block;
-               height: 100%;
-               line-height: 4em;
-               padding-left: 0.5em;
-               padding-right: 0.5em;
-               background-image: url(images/head-break.png);
+               background-image: url(images/tab-break.png);
                background-position: bottom left;
                background-repeat: no-repeat;
+               padding-left: 1px;
        }
-       body.rtl div#namespaces > ul > li > a {
-               background-position: bottom right;
-       }
-       div#namespaces > ul > li > a,
-       div#namespaces > ul > li > a:visited {
-               color: #0645ad;
-       }
-       div#namespaces > ul > li.selected > a,
-       div#namespaces > ul > li.selected > a:visited{
-               color: #333333;
-               cursor: default;
-               text-decoration: none;
-       }
-       div#namespaces > ul > li.new > a,
-       div#namespaces > ul > li.new > a:visited{
-               color: #a55858;
-       }
-       div#namespaces > ul > li.selected {
-               background-image: url(images/namespace-current-fade.png);
-               background-position: bottom left;
-               background-repeat: repeat-x;
-       }
-       body.rtl div#namespaces > ul > li.selected {
-               background-position: bottom right;
-       }
-
-/* Views */
-div#views {
-       float: left;
-       height: 3em; /* HALF HEAD HEIGHT */
-       background-image: url(images/head-break.png);
-       background-position: bottom right;
-       background-repeat: no-repeat;
-       padding-right: 1px;
-}
-body.rtl div#views {
-       float: right;
-       background-position: bottom left;
-       padding-right: 0;
-       padding-left: 1px;
-}
-       div#views h5 {
-               display: none;
-       }
-       div#views > ul {
-               height: 100%;
-               list-style: none;
-               margin: 0;
-               padding: 0;
+       div#namespaces ul,
+       div#views ul {
+               float: left;
        }
-       div#views > ul > li {
+       div#namespaces li,
+       div#views li {
                float: left;
-               height: 100%;
-               margin: 0;
-               padding: 0;
-               background-image: url(images/view-normal-fade.png);
+               line-height: 3em;
+               background-image: url(images/tab-normal-fade.png);
                background-position: bottom left;
                background-repeat: repeat-x;
        }
-       body.rtl div#views > ul > li {
-               float: right;
-               background-position: bottom right;
+       div#namespaces li.selected,
+       div#views li.selected {
+               background-image: url(images/tab-current-fade.png);
        }
-       div#views > ul > li > a {
-               display: block;
-               height: 100%;
-               line-height: 4em;
+       div#namespaces a,
+       div#views a {
+               display: inline-block;
+               height: 3em;
                padding-left: 0.5em;
                padding-right: 0.5em;
-               background-image: url(images/head-break.png);
-               background-position: bottom left;
-               background-repeat: no-repeat;
-       }
-       body.rtl div#views > ul > li > a {
+               background-image: url(images/tab-break.png);
                background-position: bottom right;
-       }
-       div#views > ul > li > a,
-       div#views > ul > li > a:visited {
+               background-repeat: no-repeat;
                color: #0645ad;
        }
-       div#views > ul > li.selected > a,
-       div#views > ul > li.selected > a:visited{
+       div#namespaces li.selected a,
+       div#views li.selected a:visited {
                color: #333333;
                cursor: default;
                text-decoration: none;
        }
-       div#views > ul > li.new > a,
-       div#views > ul > li.new > a:visited{
+       div#namespaces li.new a,
+       div#namespaces li.new a:visited{
                color: #a55858;
        }
-       div#views > ul > li.selected {
-               background-image: url(images/view-current-fade.png);
-               background-position: bottom left;
-               background-repeat: repeat-x;
-       }
-       body.rlt div#views > ul > li.selected {
-               background-position: bottom right;
+       /* Variants and Actions */
+       div#variants,
+       div#actions {
+               float: left;
+               background-image: url(images/arrow-down-icon.png);
+               background-position: center center;
+               background-repeat: no-repeat;
        }
-
-/* Actions */
-div#actions {
-       float: left;
-       height: 3em; /* HALF HEAD HEIGHT */
-       background-image: url(images/head-break.png);
-       background-position: bottom right;
-       background-repeat: no-repeat;
-       padding-right: 1px;
-}
-body.rtl div#actions {
-       float: right;
-       background-position: bottom left;
-       padding-right: 0;
-       padding-left: 1px;
-}
-       div#actions > h5 {
-               height: 100%;
-               margin: 0;
-               padding: 0;
-               background-image: url(images/action-normal-fade.png);
-               background-position: bottom left;
-               background-repeat: repeat-x;
+       div#variants h5,
+       div#actions h5 {
+               float: left;
        }
-       body.rtl div#actions > h5 {
+       div#variants h5 a,
+       div#actions h5 a {
+               display: inline-block;
+               width: 24px;
+               height: 3em;
+               text-decoration: none;
+               background-image: url(images/tab-break.png);
                background-position: bottom right;
-       }
-       div#actions > h5 > div.icon {
-               height: 80%;
-               width: 16px;
-               margin-left: 0.25em;
-               margin-right: 0.25em;
-               background-image: url(images/arrow-down-icon.png);
-               background-position: bottom center;
                background-repeat: no-repeat;
-               cursor: default;
-       }
-       div#actions > h5 > div.icon > span {
-               display: none;
        }
-       div#actions > div.menu {
+       div#variants div.menu,
+       div#actions div.menu {
                display: none;
+               clear: both;
        }
-       div#actions:hover > div.menu {
+       div#variants:hover div.menu,
+       div#actions:hover div.menu {
                display: block;
        }
-       div#actions > div.menu > ul {
+       div#variants ul,
+       div#actions ul {
                position: absolute;
-               list-style: none;
                background-color: white;
                border: solid 1px silver;
                border-top-width: 0;
+               padding: 0;
                margin: 0;
                margin-left: -1px;
-               padding: 0;
-       }
-       body.rtl div#actions > div.menu > ul {
-               margin-left: 0;
-               margin-right: -1px;
        }
-       div#actions > div.menu > ul > li {
-               margin: 0;
-               padding: 0;
+       div#variants:hover li a,
+       div#actions li a {
+               display: inline-block;
+               padding: 0.5em;
        }
-       div#actions > div.menu > ul > li > a {
-               display: block;
-               padding-top: 0.25em;
-               padding-bottom: 0.25em;
-               padding-left: 0.5em;
-               padding-right: 0.5em;
+       /* Search */
+       div#search {
+               float: left;
        }
-       div#actions > div.menu > ul > li > a,
-       div#actions > div.menu > ul > li > a:visited {
-               color: #0645ad;
+       div#search form,
+       div#search input {
+               float: left;
+               margin-top: 0.4em;
+               margin-left: 0.25em;
        }
-
-/* I DON"T THINK THIS IS AWESOME, BUT IT"S SOMETHING... */
-
-/* Variants */
-div#variants {
-       float: left;
-       height: 3em; /* HALF HEAD HEIGHT */
-       background-image: url(images/head-break.png);
-       background-position: bottom right;
-       background-repeat: no-repeat;
-       padding-right: 1px;
-}
-body.rtl div#variants {
-       float: right;
-       background-position: bottom left;
-       padding-right: 0;
-       padding-left: 1px;
+/* Panel */
+div#panel {
+       position: absolute;
+       top: 12em;
+       width: 12em;
+       left: 0;
 }
-       div#variants > h5 {
-               height: 100%;
-               margin: 0;
-               padding: 0;
-               background-image: url(images/action-normal-fade.png);
-               background-position: bottom left;
-               background-repeat: repeat-x;
-       }
-       body.rtl div#variants > h5 {
-               background-position: bottom right;
+       div#panel div.portal {
+               padding-top: 1.5em;
        }
-       div#variants > h5 > div.icon {
-               height: 80%;
-               width: 16px;
-               margin-left: 0.25em;
-               margin-right: 0.25em;
-               background-image: url(images/arrow-down-icon.png);
-               background-position: bottom center;
-               background-repeat: no-repeat;
+       div#panel div.portal h5 {
+               font-weight: normal;
+               color: #666666;
+               padding: 0.5em;
+               padding-top: 0;
+               padding-bottom: 0.33em;
+               padding-left: 1.25em;
                cursor: default;
        }
-       div#variants > h5 > div.icon > span {
-               display: none;
+       body.rtl div#panel div.portal h5 {
+               padding: 0;
+               margin: 0;
+               padding-left: 0;
+               padding-right: 1.25em;
        }
-       div#variants > div.menu {
-               display: none;
+       div#panel div.portal div.body {
+               padding-top: 0.33em;
+               margin-left: 1.25em;
+               background-image: url(images/portal-break.png);
+               background-repeat: no-repeat;
+               background-position: top left;
        }
-       div#variants:hover > div.menu {
-               display: block;
+       body.rtl div#panel div.portal div.body {
+               padding-left: 0;
+               margin-right: 1.25em;
+               background-position: top right;
        }
-       div#variants > div.menu > ul {
-               position: absolute;
+       div#panel div.portal div.body ul {
                list-style: none;
-               background-color: white;
-               border: solid 1px silver;
-               border-top-width: 0;
-               margin: 0;
-               margin-left: -1px;
                padding: 0;
-       }
-       body.rtl div#variants > div.menu > ul {
-               margin-left: 0;
-               margin-right: -1px;
-       }
-       div#variants > div.menu > ul > li {
                margin: 0;
-               padding: 0;
        }
-       div#variants > div.menu > ul > li > a {
-               display: block;
-               padding-top: 0.25em;
-               padding-bottom: 0.25em;
-               padding-left: 0.5em;
-               padding-right: 0.5em;
+       div#panel div.portal div.body ul li {
+               padding: 0;
+               padding-bottom: 0.5em;
+               margin: 0;
+               overflow: hidden;
        }
-       div#variants > div.menu > ul > li > a,
-       div#variants > div.menu > ul > li > a:visited {
+       div#panel div.portal div.body ul li a {
                color: #0645ad;
        }
-
-/* END OF STUFF I"M NOT SURE ABOUT... */
-
-/* Search */
-div#search {
-       margin-top: 0.75em;
-       margin-right: 0.5em;
-       margin-left: 0.75em;
+       div#panel div.portal div.body ul li a:visited {
+               color: #0b0080;
+       }
+/* Foot */
+div#foot {
+       margin-left: 12em;
+       margin-top: 0;
+       padding: 0.75em;
+       background-image: url(images/foot-base.png);
+       background-position: top left;
+       background-repeat: repeat-x;
+}
+div#foot ul {
+       list-style: none;
+       margin: 0;
+       padding: 0;
+}
+div#foot ul li {
+       margin: 0;
+       padding: 0;
+       padding-top: 0.5em;
+       padding-bottom: 0.5em;
+       color: #333333;
+       font-size: 0.9em;
+}
+div#foot ul#foot-icons {
+       float: right;
+}
+div#foot ul#foot-places {
        float: left;
 }
-body.rtl div#search {
-       margin-right: 0.75em;
+div#foot ul#foot-icons li {
+       float: left;
        margin-left: 0.5em;
-       float: right;
+       line-height: 2em;
+}
+div#foot ul#foot-places li {
+       float: left;
+       margin-right: 0.5em;
+       line-height: 2em;
 }
-       div#search h5 {
-               display: none;
-       }
 
-/* Personal */
-div#personal {
-       float: right;
-       margin-top: 0.25em;
-       margin-right: 0.75em;
-       margin-left: 0.75em;
+/* Logo */
+div#logo {
+       position: absolute;
+       top: 0;
+       left: 0;
+       height: 12em;
+       width: 12em;
 }
-body.rtl div#personal {
-       float: left;
+body.rtl #logo {
+       left: auto;
+       right: 0;
+}
+div#logo a {
+       display: block;
+       width: 12em;
+       height: 12em;
+       background-repeat: no-repeat;
+       background-position: 50% 50%;
+       text-decoration: none;
 }
-       div#personal > div.buffer > h5 {
-               display: none;
-       }
-       div#personal > div.buffer > ul {
-               list-style: none;
-               margin: 0;
-               padding: 0;
-       }
-       div#personal > div.buffer > ul > li {
-               float: left;
-               margin: 0;
-               padding-bottom: 0.5em;
-               padding-left: 1em;
-               font-size: 0.9em;
-       }
-       body.rtl div#personal > div.buffer > ul > li {
-               float: right;
-               padding-left: 0;
-               padding-right: 1em;
-       }
-       div#personal > div.buffer > ul > li > a,
-       div#personal > div.buffer > ul > li > a:visited {
-               color: #0645ad;
-       }
-       div#personal > div.buffer > ul > li > a.new,
-       div#personal > div.buffer > ul > li > a.new:visited {
-               color: #a55858;
-       }
 
 /*
  * 
  * The following code is highly modified from monobook. It would be nice if the
  * preftoc id was more human readable like preferences-toc for instance,
  * howerver this would require backporting the other skins.
- * 
  */
 
 /* Preferences */
 #preftoc {
        /* Tabs */
        float: left;
+       zoom: 1;
        clear: both;
        margin: 0 !important;
        padding: 0 !important;
@@ -696,6 +330,7 @@ body.rtl #preftoc {
        #preftoc li {
                /* Tab */
                float: left;
+               zoom: 1;
                margin: 0;
                padding: 0;
                padding-right: 1px;
@@ -718,8 +353,7 @@ body.rtl #preftoc {
        }
        #preftoc a,
        #preftoc a:active {
-               /* Tab Label */
-               display: block;
+               display: inline-block;
                position: relative;
                color: #0645ad;
                padding: 0.5em;
@@ -730,7 +364,6 @@ body.rtl #preftoc {
                text-decoration: underline;
        }
        #preftoc li.selected a {
-               /* Selected Tab Label */
                cursor: default;
                background-image: url(images/preferences-fade.png);
                background-position: bottom;
@@ -741,6 +374,7 @@ body.rtl #preftoc {
        }
 #preferences {
        float: left;
+       zoom: 1;
        width: 100%;
        margin: 0;
        clear: both;