Changed XML IDs to be compatible with monobook things, and now tabs and menus are...

diff --git a/skins/Vector.php b/skins/Vector.php
index a5b0117..1db531b 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -572,7 +572,7 @@ class VectorTemplate extends QuickTemplate {
                        <!-- /personal -->
                        <div id="left-navigation">
                                <!-- namespaces -->
-                               <div id="namespaces">
+                               <div id="namespaces" class="vectorTabs">
                                        <h5><?php $this->msg('namespaces') ?></h5>
                                        <ul <?php $this->html('userlangattributes') ?>>
                                                <?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
@@ -583,7 +583,7 @@ class VectorTemplate extends QuickTemplate {
                                <!-- /namespaces -->
                                <!-- variants -->
                                <?php if ( count( $this->data['variant_urls'] ) > 0 ): ?>
-                               <div id="variants">
+                               <div id="variants" class="vectorMenu">
                                        <h5><span><?php $this->msg('variants') ?></span><a href="#">&nbsp;</a></h5>
                                        <div class="menu">
                                                <ul <?php $this->html('userlangattributes') ?>>
@@ -599,7 +599,7 @@ class VectorTemplate extends QuickTemplate {
                        <div id="right-navigation">
                                <!-- views -->
                                <?php if ( count( $this->data['view_urls'] ) > 0 ): ?>
-                               <div id="views">
+                               <div id="views" class="vectorTabs">
                                        <h5><?php $this->msg('views') ?></h5>
                                        <ul <?php $this->html('userlangattributes') ?>>
                                                <?php foreach ($this->data['view_urls'] as $key => $link ): ?>
@@ -611,7 +611,7 @@ class VectorTemplate extends QuickTemplate {
                                <!-- /views -->
                                <!-- actions -->
                                <?php if ( count( $this->data['action_urls'] ) > 0 ): ?>
-                               <div id="actions">
+                               <div id="actions" class="vectorMenu">
                                        <h5><span><?php $this->msg('actions') ?></span><a href="#">&nbsp;</a></h5>
                                        <div class="menu">
                                                <ul <?php $this->html('userlangattributes') ?>>
@@ -624,7 +624,7 @@ class VectorTemplate extends QuickTemplate {
                                <?php endif; ?>
                                <!-- /actions -->
                                <!-- search -->
-                               <div id="search">
+                               <div id="p-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' ) ?>"/>

diff --git a/skins/vector/main-ltr.css b/skins/vector/main-ltr.css
index 662a721..90d0263 100644 (file)
--- a/skins/vector/main-ltr.css
+++ b/skins/vector/main-ltr.css
@@ -41,12 +41,6 @@ div#head {
        right: 0;
        width: 100%;
 }
-div#head ul,
-div#head li {
-       list-style: none;
-       margin: 0;
-       padding: 0;
-}
 div#head h5 {
        margin: 0;
        padding: 0;
@@ -60,6 +54,11 @@ div#head h5 {
        div#p-personal h5 {
                display: none;
        }
+       div#p-personal ul {
+               list-style: none;
+               margin: 0;
+               padding: 0;
+       }
        div#p-personal li {
                float: left;
                margin-left: 0.75em;
@@ -77,49 +76,45 @@ div#head h5 {
                margin-top: 3em;
        }
        /* Navigation Labels */
-       div#namespaces h5,
-       div#variants h5 span,
-       div#views h5,
-       div#actions h5 span,
-       div#search h5 {
+       div.vectorTabs h5,
+       div.vectorMenu h5 span {
                display: none;
        }
        /* Namespaces and Views */
-       div#namespaces,
-       div#views {
+       div.vectorTabs {
                float: left;
                background-image: url(images/tab-break.png);
                background-position: bottom left;
                background-repeat: no-repeat;
                padding-left: 1px;
        }
-       div#namespaces ul,
-       div#views ul {
+       div.vectorTabs ul {
                float: left;
                height: 100%;
+               list-style: none;
+               margin: 0;
+               padding: 0;
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#namespaces ul li,
-       div#views ul li {
+       div.vectorTabs ul li {
                display: inline-block;
                float: left;
                height: 100%;
+               margin: 0;
+               padding: 0;
                background-image: url(images/tab-normal-fade.png);
                background-position: bottom left;
                background-repeat: repeat-x;
        }
        /* IGNORED BY IE6 */
-       div#namespaces ul > li,
-       div#views ul > li {
+       div.vectorTabs ul > li {
                display: block;
        }
-       div#namespaces li.selected,
-       div#views li.selected {
+       div.vectorTabs li.selected {
                background-image: url(images/tab-current-fade.png);
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#namespaces li a,
-       div#views li a {
+       div.vectorTabs li a {
                display: inline-block;
                height: 3em;
                padding-left: 0.5em;
@@ -129,49 +124,43 @@ div#head h5 {
                background-repeat: no-repeat;
        }
        /* IGNORED BY IE6 */
-       div#namespaces li > a,
-       div#views li > a {
+       div.vectorTabs li > a {
                display: block;
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#namespaces a span,
-       div#views a span {
+       div.vectorTabs a span {
                color: #0645ad;
                display: inline-block;
                padding-top: 1.25em;
                cursor: pointer;
        }
        /* IGNORED BY IE6 */
-       div#namespaces a > span,
-       div#views a > span {
+       div.vectorTabs a > span {
                float: left;
                display: block;
        }
-       div#namespaces li.selected a span,
-       div#views li.selected a:visited span {
+       div.vectorTabs li.selected a span,
+       div.vectorTabs li.selected a:visited span {
                color: #333333;
                cursor: default;
                text-decoration: none;
        }
-       div#namespaces li.new a span,
-       div#namespaces li.new a:visited span{
+       div.vectorTabs li.new a span,
+       div.vectorTabs li.new a:visited span {
                color: #a55858;
        }
        /* Variants and Actions */
-       div#variants,
-       div#actions {
+       div.vectorMenu {
                float: left;
                background-image: url(images/arrow-down-icon.png);
                background-position: center center;
                background-repeat: no-repeat;
        }
-       div#variants h5,
-       div#actions h5 {
+       div.vectorMenu h5 {
                float: left;
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#variants h5 a,
-       div#actions h5 a {
+       div.vectorMenu h5 a {
                display: inline-block;
                width: 24px;
                height: 3em;
@@ -181,47 +170,49 @@ div#head h5 {
                background-repeat: no-repeat;
        }
        /* IGNORED BY IE6 */
-       div#variants h5 > a,
-       div#actions h5 > a {
+       div.vectorMenu h5 > a {
                display: block;
        }
-       div#variants div.menu,
-       div#actions div.menu {
+       div.vectorMenu div.menu {
                display: none;
                clear: both;
        }
-       div#variants:hover div.menu,
-       div#actions:hover div.menu {
+       div.vectorMenu:hover div.menu {
                display: block;
        }
-       div#variants ul,
-       div#actions ul {
+       div.vectorMenu ul {
                position: absolute;
                background-color: white;
                border: solid 1px silver;
                border-top-width: 0;
+               list-style: none;
                padding: 0;
                margin: 0;
                margin-left: -1px;
        }
+       div.vectorMenu li {
+               padding: 0;
+               margin: 0;
+       }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#variants:hover li a,
-       div#actions li a {
+       div.vectorMenu li a {
                display: inline-block;
                padding: 0.5em;
        }
        /* IGNORED BY IE6 */
-       div#variants:hover li > a,
-       div#actions li > a {
+       div.vectorMenu li > a {
                display: block;
        }
        /* Search */
-       div#search {
+       div#p-search h5 {
+               display: none;
+       }
+       div#p-search {
                float: left;
                margin-right: 0.75em;
        }
-       div#search form,
-       div#search input {
+       div#p-search form,
+       div#p-search input {
                float: left;
                margin-top: 0.4em;
                margin-left: 0.25em;

diff --git a/skins/vector/main-rtl.css b/skins/vector/main-rtl.css
index c63353a..8b09833 100644 (file)
--- a/skins/vector/main-rtl.css
+++ b/skins/vector/main-rtl.css
@@ -54,12 +54,6 @@ div#head {
        left: 0;
        width: 100%;
 }
-div#head ul,
-div#head li {
-       list-style: none;
-       margin: 0;
-       padding: 0;
-}
 div#head h5 {
        margin: 0;
        padding: 0;
@@ -73,6 +67,11 @@ div#head h5 {
        div#p-personal h5 {
                display: none;
        }
+       div#p-personal ul {
+               list-style: none;
+               margin: 0;
+               padding: 0;
+       }
        div#p-personal li {
                float: right;
                margin-right: 0.75em;
@@ -90,49 +89,45 @@ div#head h5 {
                margin-top: 3em;
        }
        /* Navigation Labels */
-       div#namespaces h5,
-       div#variants h5 span,
-       div#views h5,
-       div#actions h5 span,
-       div#search h5 {
+       div.vectorTabs h5,
+       div.vectorMenu h5 span {
                display: none;
        }
        /* Namespaces and Views */
-       div#namespaces,
-       div#views {
+       div.vectorTabs {
                float: right;
                background-image: url(images/tab-break.png);
                background-position: bottom right;
                background-repeat: no-repeat;
                padding-right: 1px;
        }
-       div#namespaces ul,
-       div#views ul {
+       div.vectorTabs ul {
                float: right;
                height: 100%;
+               list-style: none;
+               margin: 0;
+               padding: 0;
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#namespaces ul li,
-       div#views ul li {
+       div.vectorTabs ul li {
                display: inline-block;
                float: right;
                height: 100%;
+               margin: 0;
+               padding: 0;
                background-image: url(images/tab-normal-fade.png);
                background-position: bottom right;
                background-repeat: repeat-x;
        }
        /* IGNORED BY IE6 */
-       div#namespaces ul > li,
-       div#views ul > li {
+       div.vectorTabs ul > li {
                display: block;
        }
-       div#namespaces li.selected,
-       div#views li.selected {
+       div.vectorTabs li.selected {
                background-image: url(images/tab-current-fade.png);
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#namespaces li a,
-       div#views li a {
+       div.vectorTabs li a {
                display: inline-block;
                height: 3em;
                padding-right: 0.5em;
@@ -142,49 +137,44 @@ div#head h5 {
                background-repeat: no-repeat;
        }
        /* IGNORED BY IE6 */
-       div#namespaces li > a,
-       div#views li > a {
+       div.vectorTabs li > a {
                display: block;
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#namespaces a span,
-       div#views a span {
+       div.vectorTabs a span {
                color: #0645ad;
                display: inline-block;
                padding-top: 1.25em;
                cursor: pointer;
        }
        /* IGNORED BY IE6 */
-       div#namespaces a > span,
-       div#views a > span {
+       div.vectorTabs a > span {
                float: right;
                display: block;
        }
-       div#namespaces li.selected a span,
-       div#views li.selected a:visited span {
+       div.vectorTabs li.selected a span,
+       div.vectorTabs li.selected a:visited span {
                color: #333333;
                cursor: default;
                text-decoration: none;
        }
-       div#namespaces li.new a span,
-       div#namespaces li.new a:visited span{
+       div.vectorTabs li.new a span,
+       div.vectorTabs li.new a:visited span{
                color: #a55858;
        }
+       
        /* Variants and Actions */
-       div#variants,
-       div#actions {
+       div.vectorMenu {
                float: right;
                background-image: url(images/arrow-down-icon.png);
                background-position: center center;
                background-repeat: no-repeat;
        }
-       div#variants h5,
-       div#actions h5 {
+       div.vectorMenu h5 {
                float: right;
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#variants h5 a,
-       div#actions h5 a {
+       div.vectorMenu h5 a {
                display: inline-block;
                width: 24px;
                height: 3em;
@@ -194,47 +184,49 @@ div#head h5 {
                background-repeat: no-repeat;
        }
        /* IGNORED BY IE6 */
-       div#variants h5 > a,
-       div#actions h5 > a {
+       div.vectorMenu h5 > a {
                display: block;
        }
-       div#variants div.menu,
-       div#actions div.menu {
+       div.vectorMenu div.menu {
                display: none;
                clear: both;
        }
-       div#variants:hover div.menu,
-       div#actions:hover div.menu {
+       div.vectorMenu:hover div.menu {
                display: block;
        }
-       div#variants ul,
-       div#actions ul {
+       div.vectorMenu ul {
                position: absolute;
                background-color: white;
                border: solid 1px silver;
                border-top-width: 0;
+               list-style: none;
                padding: 0;
                margin: 0;
                margin-right: -1px;
        }
+       div.vectorMenu li {
+               padding: 0;
+               margin: 0;
+       }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
-       div#variants:hover li a,
-       div#actions li a {
+       div.vectorMenu li a {
                display: inline-block;
                padding: 0.5em;
        }
        /* IGNORED BY IE6 */
-       div#variants:hover li > a,
-       div#actions li > a {
+       div.vectorMenu li > a {
                display: block;
        }
        /* Search */
-       div#search {
+       div#p-search h5 {
+               display: none;
+       }
+       div#p-search {
                float: right;
                margin-left: 0.75em;
        }
-       div#search form,
-       div#search input {
+       div#p-search form,
+       div#p-search input {
                float: right;
                margin-top: 0.4em;
                margin-right: 0.25em;