From: urs_hunkler <urs_hunkler>
Date: Sat, 13 Oct 2007 09:16:46 +0000 (+0000)
Subject: Merged from 1.9 ::
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=9939a83dee8335a3eb2a41475df462bebce706a7;p=moodle.git

Merged from 1.9 ::
MDL-11729 :: Removed commenting out loading of the Chameleon files loading.
MDL-11664 :: IE6 can't display transparent PNGs. Added not transparent gifs instead and changed the background for IE6 to a solid colour.
---

diff --git a/theme/custom_corners/footer.html b/theme/custom_corners/footer.html
index 3bb3a6d173..6cfc0f2e1a 100644
--- a/theme/custom_corners/footer.html
+++ b/theme/custom_corners/footer.html
@@ -26,5 +26,12 @@
      }
 ?>
 
+<script type="text/javascript">
+/* <![CDATA[ */
+    $(document).ready(function() {
+        script.init();
+    });
+/* ]]> */
+</script>
 </body>
 </html>
diff --git a/theme/custom_corners/js/jquery.php b/theme/custom_corners/js/jquery.php
index ae27e65478..6863f1a9ea 100644
--- a/theme/custom_corners/js/jquery.php
+++ b/theme/custom_corners/js/jquery.php
@@ -1,15 +1,46 @@
 <script src="<?php echo $CFG->themewww .'/'. current_theme() ?>/js/jquery-latest.pack.js" type="text/javascript"></script>
 
 <script type="text/javascript">
-    $(document).ready(function() {
-        script.init();
-    });
-
+/* <![CDATA[ */
     var script = {
         corrections: function () {
             if (top.user) {
                 top.document.getElementsByTagName('frameset')[0].rows = "117,30%,0,200";
             }
+            
+            // correct sideblock width for MSIE for columns with a calender 
+            if (window.browserIE6 !== undefined || window.browserIE7 !== undefined) {
+                var calendar = $('#right-column .block_calendar_month');
+                if (calendar.length) {
+                    var w = $('#right-column').width();
+                    $('#right-column .sideblock').width(w);
+                }
+                calendar = $('#left-column .block_calendar_month');
+                if (calendar.length) {
+                    w = $('#left-column').width();
+                    $('#left-column .sideblock').width(w);
+                }
+            }
+            if (window.browserIE6 !== undefined) {
+                if ($('header-home')) {
+                    w = $('#header-home').width();
+                    $('#header-home .i2').width(w - 24);
+                }
+                if ($('header')) {
+                    w = $('#header').width();
+                    $('#header .i2').width(w - 24);
+                }
+            }
+            if (window.browserIE7 !== undefined) {
+                if ($('header-home')) {
+                    w = $('#header-home').width();
+                    $('#header-home .i2').width(w - 28);
+                }
+                if ($('header')) {
+                    w = $('#header').width();
+                    $('#header .i2').width(w - 24);
+                }
+            }
         },
         
         info: function() {
@@ -27,5 +58,6 @@
             script.corrections();
             // script.info();
         }
-    }
+    };
+/* ]]> */
 </script>
\ No newline at end of file
diff --git a/theme/custom_corners/meta.php b/theme/custom_corners/meta.php
index 371974ac41..ef51a8bdab 100644
--- a/theme/custom_corners/meta.php
+++ b/theme/custom_corners/meta.php
@@ -1,6 +1,18 @@
 <!--[if IE 7]>
     <link rel="stylesheet" type="text/css" href="<?php echo $CFG->themewww .'/'. current_theme() ?>/styles_ie7.css" />
+    
+	<script type="text/javascript">
+	/* <![CDATA[ */
+		var browserIE7 = true;
+	/* ]]> */
+	</script>
 <![endif]-->
 <!--[if IE 6]>
     <link rel="stylesheet" type="text/css" href="<?php echo $CFG->themewww .'/'. current_theme() ?>/styles_ie6.css" />
+    
+	<script type="text/javascript">
+	/* <![CDATA[ */
+		var browserIE6 = true;
+	/* ]]> */
+	</script>
 <![endif]-->
diff --git a/theme/custom_corners/pix/beige_borders.gif b/theme/custom_corners/pix/beige_borders.gif
new file mode 100644
index 0000000000..66dd5e4314
Binary files /dev/null and b/theme/custom_corners/pix/beige_borders.gif differ
diff --git a/theme/custom_corners/pix/beige_box.gif b/theme/custom_corners/pix/beige_box.gif
new file mode 100644
index 0000000000..4ee537fa76
Binary files /dev/null and b/theme/custom_corners/pix/beige_box.gif differ
diff --git a/theme/custom_corners/pix/borders.gif b/theme/custom_corners/pix/borders.gif
new file mode 100644
index 0000000000..473d227bcc
Binary files /dev/null and b/theme/custom_corners/pix/borders.gif differ
diff --git a/theme/custom_corners/pix/box.gif b/theme/custom_corners/pix/box.gif
new file mode 100644
index 0000000000..96926fce75
Binary files /dev/null and b/theme/custom_corners/pix/box.gif differ
diff --git a/theme/custom_corners/pix/header.gif b/theme/custom_corners/pix/header.gif
new file mode 100644
index 0000000000..bad6567b0c
Binary files /dev/null and b/theme/custom_corners/pix/header.gif differ
diff --git a/theme/custom_corners/styles_ie6.css b/theme/custom_corners/styles_ie6.css
index e2f5a461b2..e67d57b822 100644
--- a/theme/custom_corners/styles_ie6.css
+++ b/theme/custom_corners/styles_ie6.css
@@ -13,4 +13,138 @@ div.i1 {
 }
 div#header div.i3 {
     min-width: 0;
+}
+.skip-block-to {
+  font-size: 1%;
+  line-height: 1%;
+}
+body {
+  background-image: none;
+  background-color: #F1ECE6;
+}
+div.sideblock div.bt div {
+  background-image: url(pix/box.gif);
+}
+div.sideblock div.bt {
+  background-image: url(pix/box.gif);
+}
+div.sideblock div.header div.bt div {
+  background-image: url(pix/box.gif);
+}
+div.sideblock div.header div.bt {
+  background-image: url(pix/box.gif);
+}
+div.sideblock div.header div.i1 {
+  background-image: url(pix/borders.gif);
+}
+div.sideblock div.header div.i2 {
+  background-image: url(pix/borders.gif);
+}
+div.sideblock div.i1 {
+  background-image: url(pix/beige_borders.gif);
+}
+div.sideblock div.i2 {
+  background-image: url(pix/beige_borders.gif);
+}
+div.sideblock div.bb div {
+  background-image: url(pix/beige_box.gif);
+}
+div.sideblock div.bb {
+  background-image: url(pix/beige_box.gif);
+}
+td#middle-column div.bt div {
+  background-image: url(pix/box.gif);
+}
+td#middle-column div.bt {
+  background-image: url(pix/box.gif);
+}
+td#middle-column div.i1 {
+  background-image: url(pix/borders.gif);
+}
+td#middle-column div.i2 {
+  background-image: url(pix/borders.gif);
+}
+td#middle-column div.bb div {
+  background-image: url(pix/box.gif);
+}
+td#middle-column div.bb {
+  background-image: url(pix/box.gif);
+}
+div#footer div.bt div {
+  background-image: url(pix/beige_box.gif);
+}
+div#footer div.bt {
+  background-image: url(pix/beige_box.gif);
+}
+div#footer div.i1 {
+  background-image: url(pix/beige_borders.gif);
+}
+div#footer div.i2 {
+  background-image: url(pix/beige_borders.gif);
+}
+div#footer div.bb div {
+  background-image: url(pix/beige_box.gif);
+}
+div#footer div.bb {
+  background-image: url(pix/beige_box.gif);
+}
+div#header div.bt div {
+  background-image: url(pix/beige_box.gif);
+}
+div#header div.bt {
+  background-image: url(pix/beige_box.gif);
+}
+div#header div.i1 {
+  background-image: url(pix/beige_borders.gif);
+}
+div#header div.i2 {
+  background-image: url(pix/beige_borders.gif);
+}
+div#header div.bb div {
+  background-image: url(pix/beige_box.gif);
+}
+div#header div.bb {
+  background-image: url(pix/beige_box.gif);
+}
+div#header-home div.bt div {
+  background-image: url(pix/beige_box.gif);
+}
+div#header-home div.bt {
+  background-image: url(pix/beige_box.gif);
+}
+div#header-home div.i1 {
+  background-image: url(pix/beige_borders.gif);
+}
+div#header-home div.i2 {
+  background-image: url(pix/beige_borders.gif);
+}
+div#header-home div.bb div {
+  background-image: url(pix/beige_box.gif);
+}
+div#header-home div.bb {
+  background-image: url(pix/beige_box.gif);
+}
+body.nocoursepage div#content div.bt div {
+  background-image: url(pix/box.gif);
+}
+body.nocoursepage div#content div.bt {
+  background-image: url(pix/box.gif);
+}
+body.nocoursepage div#content div.i1 {
+  background-image: url(pix/borders.gif);
+}
+body.nocoursepage div#content div.i2 {
+  background-image: url(pix/borders.gif);
+}
+body.nocoursepage div#content div.bb div {
+  background-image: url(pix/box.gif);
+}
+body.nocoursepage div#content div.bb {
+  background-image: url(pix/box.gif);
+}
+th.header {
+  background-image: url(pix/header.gif);
+}
+table.forumpost tr.header {
+  background-image: url(pix/header.gif);
 }
\ No newline at end of file