* Opera tweaks: fixes for Opera 6 don't influence 7 anymore, cosmetiv tweaks to the...

* IE50 footer slightly wider

diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 53420d9..f87ddff 100644 (file)
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -304,7 +304,7 @@
                                        );
                                } else {
                                        $content_actions['talk'] = array(
-                                               'class' => $talk_class.' new',
+                                               'class' => $talk_class?$talk_class.' new':'new',
                                                'text' => wfMsg('talk'),
                                                'href' => $this->makeTalkUrl($this->titletxt,'action=edit'),
                                                'ttip' => wfMsg('tooltip-talk'),

diff --git a/stylesheets/monobook/IE50Fixes.css b/stylesheets/monobook/IE50Fixes.css
index ff3bc23..6c8a76c 100644 (file)
--- a/stylesheets/monobook/IE50Fixes.css
+++ b/stylesheets/monobook/IE50Fixes.css
@@ -18,7 +18,7 @@
 }
 
 #portal-footer {
-    margin: 0 1.8em 0 15em;
+    margin: 0 0 0 14.5em;
 }
 
 /* IE 4&5 interpret keyword sizes one off */

diff --git a/stylesheets/monobook/IE60Fixes.css b/stylesheets/monobook/IE60Fixes.css
index d973398..1397fb9 100644 (file)
--- a/stylesheets/monobook/IE60Fixes.css
+++ b/stylesheets/monobook/IE60Fixes.css
@@ -41,10 +41,6 @@
     width: 98%;
 }
 
-div.thumbnail-none p, div.thumbnail-right p, div.thumbnail-left p {
-    position:relative;
-}
-
 /* show the hand */
 #portlet-logo a,
 #portlet-logo a:hover {

diff --git a/stylesheets/monobook/Opera6Fixes.css b/stylesheets/monobook/Opera6Fixes.css
index 9f679ca..9db566f 100644 (file)
--- a/stylesheets/monobook/Opera6Fixes.css
+++ b/stylesheets/monobook/Opera6Fixes.css
@@ -8,3 +8,7 @@
     margin-left: 8.6em;
     right: 0;
 }
+#bodyContent a.external {
+    background: url(external.png) center right no-repeat;
+    padding-right: 13px;
+}

diff --git a/stylesheets/monobook/Opera7Fixes.css b/stylesheets/monobook/Opera7Fixes.css
index e9f9ccf..79fa42f 100644 (file)
--- a/stylesheets/monobook/Opera7Fixes.css
+++ b/stylesheets/monobook/Opera7Fixes.css
@@ -5,4 +5,7 @@
 #portlet-contentViews li a {
     top: 2px;
 }
-
+#bodyContent a.external {
+    background: url(external.png) center right no-repeat;
+    padding-right: 13px;
+}

diff --git a/stylesheets/monobook/main.css b/stylesheets/monobook/main.css
index e91e00f..0a806ae 100644 (file)
--- a/stylesheets/monobook/main.css
+++ b/stylesheets/monobook/main.css
@@ -403,7 +403,7 @@ div.thumb div a img {
 div div.thumbcaption {
     border: none;
     text-align: left;
-    padding: 0.3em 0 0.2em 0 !important;
+    padding: 0.3em 0 0.1em 0 !important;
 }
 div.magnify {
     float: right;
@@ -788,14 +788,11 @@ input.searchButton {
 }
 #portal-personaltools li a {
     text-decoration: none;
-/*    color: #436976;*/
     color: #005896;
     padding-bottom: 0.2em;
-    background-color: transparent;
+    background: none;
 }
 #portal-personaltools li a:hover {
-    text-decoration: none;
-/*    color: #436976;*/
     background-color: White;
     padding-bottom: 0.2em;
 }
@@ -821,7 +818,6 @@ li#personaltools-login {
     left: 11.5em;
     margin: 0;
     white-space:nowrap;
-    /*width:auto;*/
     width: 76%;
     line-height: 1.1em;
     overflow: visible;
@@ -831,11 +827,7 @@ li#personaltools-login {
     list-style: none;
     font-size: 95%;
 }
-
-#portlet-contentViews .hiddenStructure {
-    display: none;
-}
-
+#portlet-contentViews .hiddenStructure { display: none; }
 #portlet-contentViews ul {
     list-style: none;
 }
@@ -846,13 +838,12 @@ li#personaltools-login {
     padding: 0 0 0.1em 0;
     margin: 0 0.3em 0 0;
     overflow: visible;
+    background: White;
 }
-
 #portlet-contentViews li.selected {
     border-color: #fabd23;
     padding: 0 0 0.2em 0;
 }
-    
 #portlet-contentViews li a {
     background-color: White;
     color: #005189;
@@ -864,7 +855,6 @@ li#personaltools-login {
     z-index: 0;
     margin: 0;
 }
-
 #portlet-contentViews .selected a {
     z-index: 3;
 }
@@ -976,25 +966,6 @@ head:first-child+body #portal-footer li {
     font-size: smaller;
 }
 
-/* opera 6 fixes */
-html>body #portal-column-one {
-    position: relative;
-    max-width: 11.7em;
-}
-head:first-child+body #portal-column-one {
-    position: static; 
-    width: auto;
-}
-
-html>body #portlet-personal {
-    width: 45em;
-    margin-left: 8.6em;
-    right: 0;
-}
-head:first-child+body #portlet-personal {
-    margin-left: 0;
-    width: 100%;
-}
 /* debugging tool.. */
 /*div{ border:1px solid #000000;}*/
 

diff --git a/stylesheets/wikibits.js b/stylesheets/wikibits.js
index cd489e5..f928892 100644 (file)
--- a/stylesheets/wikibits.js
+++ b/stylesheets/wikibits.js
@@ -7,6 +7,21 @@ var clientPC = navigator.userAgent.toLowerCase(); // Get client info
 var is_gecko = ((clientPC.indexOf('gecko')!=-1) && (clientPC.indexOf('spoofer')==-1)
                 && (clientPC.indexOf('khtml') == -1));
 var is_safari = ((clientPC.indexOf('AppleWebKit')!=-1) && (clientPC.indexOf('spoofer')==-1));
+if (clientPC.indexOf('opera')!=-1) {
+    var is_opera = true;
+    var is_opera_preseven = (window.opera && !document.childNodes);
+    var is_opera_seven = (window.opera && document.childNodes);
+}
+
+// document.write special stylesheet links
+function addcss ( stylepath ) {
+    if (is_opera_preseven) {
+        document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'Opera6Fixes.css">');
+    } else if (is_opera_seven) {
+        document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'Opera7Fixes.css">');
+    }
+    return;
+}
 
 // Un-trap us from framesets
 if( window.top != window ) window.top.location = window.location;

diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt
index 90407e9..262da1a 100644 (file)
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -18,8 +18,8 @@
     <script type="text/javascript" src="${stylepath}/IEFixes.js"></script>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
     <link tal:condition="favicon" rel="shortcut icon" href="${favicon}" type="image/x-icon" />
-    <script type="text/javascript" src="${stylepath}/wikibits.js">
-    </script>
+    <script type="text/javascript" src="${stylepath}/wikibits.js"></script>
+    <script type="text/javascript"> /*<![CDATA[*/ if(addcss){addcss('${stylepath}/${skinname}/');} /*]]>*/</script>
   </head>
 
   <body tal:attributes="ondblclick body-ondblclick|default">
@@ -59,7 +59,7 @@
           <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="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>