Merge IE conditoinal comments from 1.4

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index a9e7104..6ebc3a4 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -50,8 +50,10 @@ class MonoBookTemplate extends QuickTemplate {
     <title><?php $this->text('pagetitle') ?></title>
     <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css"; /*]]>*/</style>
     <link rel="stylesheet" type="text/css" media="print" href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
-    <!--[if IE]><style type="text/css" media="all">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IEFixes.css";</style>
-    <script type="text/javascript" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
+    <!--[if lt IE 5.5]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css";</style><![endif]-->
+    <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css";</style><![endif]-->
+    <!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]-->
+    <!--[if IE]><script type="text/javascript" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
     <?php if($this->data['jsvarurl'  ]) { ?><script type="text/javascript" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
     <script type="text/javascript" src="<?php                                   $this->text('stylepath' ) ?>/common/wikibits.js"></script>

diff --git a/skins/disabled/MonoBook.pt b/skins/disabled/MonoBook.pt
index 59a2e20..8851049 100644 (file)
--- a/skins/disabled/MonoBook.pt
+++ b/skins/disabled/MonoBook.pt
@@ -6,8 +6,10 @@
     <title tal:content="pagetitle">Exciting xhtml slimfast</title>
     <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "${stylepath}/${stylename}/main.css"; /*]]>*/</style>
     <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/common/commonPrint.css" />
-    <!--[if IE]><style type="text/css" media="all">@import "${stylepath}/${stylename}/IEFixes.css";</style>
-    <script type="text/javascript" src="${stylepath}/common/IEFixes.js"></script>
+    <!--[if lt IE 5.5]><style type="text/css"> @import "${stylepath}/${stylename}/IE50Fixes.css"; </style><![endif]-->
+    <!--[if IE 5.5000]><style type="text/css"> @import "${stylepath}/${stylename}/IE55Fixes.css"; </style><![endif]-->
+    <!--[if IE 6]><style type="text/css"> @import "${stylepath}/${stylename}/IE60Fixes.css"; </style><![endif]-->
+    <!--[if IE]><script type="text/javascript" src="${stylepath}/common/IEFixes.js"></script>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
     <script tal:condition="jsvarurl" type="text/javascript" tal:attributes="src jsvarurl"></script>
     <script type="text/javascript" src="${stylepath}/common/wikibits.js"></script>

diff --git a/skins/monobook/IEFixes.css b/skins/monobook/IEFixes.css
deleted file mode 100644 (file)
index fd3c000..0000000
--- a/skins/monobook/IEFixes.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-** Stylesheet filter for some b0rked browser
-** Don't touch, don't add anything here (can break the filter)
-** Add rules to the individual stylesheets.
-*/
-/* IE6.0 */
-@import "null?\"\{"; 
-@import "IE60Fixes.css";
-
-voice-family: "\"}\"";
-voice-family:inherit; 
-
-/* IE5.0 */
-@media tty { 
-    i{content:"\";/*" "*/}}; @import 'IE50Fixes.css'; {;}/*";} 
-}
-
-/* IE5.5 */
-@media tty {
-    i{content:"\";/*" "*/}}@m; @import 'IE55Fixes.css'; /*";}
-}
-
-
-

diff --git a/skins/monobook/null b/skins/monobook/null
deleted file mode 100644 (file)
index e69de29..0000000