merged from 1.9 :: Updates for IE problems, mainly for RTL language display. IE6...

diff --git a/theme/custom_corners/header.html b/theme/custom_corners/header.html
index 27c8d1b444d294bba669b933cb7ec4e31541f5cd..2653551b00e90c2317a66d78d79ccd76547a4582 100644 (file)
--- a/theme/custom_corners/header.html
+++ b/theme/custom_corners/header.html
@@ -67,18 +67,21 @@
 <?php if ($home) {  // This is what gets printed on the home page only
 ?>
     <div id="header-home" class="clearfix">
-      <?php print_custom_corners_start(TRUE); ?>
-          <h1 class="headermain"><?php echo $heading ?></h1>
-          <div class="headermenu"><?php echo $menu ?></div>
+      <?php print_custom_corners_start(); ?>
+          <div class="wraphome">
+              <h1 class="headermain"><?php echo $heading ?></h1>
+              <div class="headermenu"><?php echo $menu ?></div>
+              <div class="clearer">&nbsp;</div>
+          </div>
       <?php print_custom_corners_end(); ?>
     </div>
 <?php } else {  // This is what gets printed on any other page with a heading
 ?>
     <div id="header" class="clearfix">
-      <?php print_custom_corners_start(); ?>
+        <?php print_custom_corners_start(); ?>
           <h1 class="headermain"><?php echo $heading ?></h1>
           <div class="headermenu"><?php echo $menu ?></div>
-    <div class="navbar clearfix">
+        <div class="navbar clearfix">
     <?php if ($navigation) { // This is the navigation table with breadcrumbs
     ?>
         <div class="breadcrumb"><?php print_navigation($navigation); ?></div>

diff --git a/theme/custom_corners/rtl.css b/theme/custom_corners/rtl.css
index f6b19980eb8ab25e80b93f23c2f6f36a99bbbfef..5e66ae2812cfc0fd632e89ba9bcaf60eb0d19551 100644 (file)
--- a/theme/custom_corners/rtl.css
+++ b/theme/custom_corners/rtl.css
@@ -1,3 +1,20 @@
+td#left-column {
+  padding-right: 0;
+  padding-left: 5px;
+}
+td#right-column {
+  padding-right: 5px;
+  padding-left: 0;
+}
+div.coursebox {
+  float: right;
+}
+div.sideblock div.content * {
+  text-align: right;
+}
+div.calendar-controls a.next {
+  text-align: left;
+}
 div.sideblock div.header div.bt  div {
   background-position: 100% 0;
   right: -13px;
@@ -6,6 +23,7 @@ div.sideblock div.header div.bt {
   background-position: 0 0;
   left: -13px;
   margin: 0 13px 0 0;
+  text-align: right;
 }
 div.sideblock div.bt  div {
   background-position: 100% 0;
@@ -34,7 +52,7 @@ td#middle-column div.bt {
   left: -13px;
   margin: 0 13px 0 0;
 }
-td#middle-column div.bb  div {
+td#middle-column div.bb div {
   background-position: 100% 100%;
   right: -13px;
 }

diff --git a/theme/custom_corners/styles_ie6.css b/theme/custom_corners/styles_ie6.css
index e67d57b8220a449049d2fe4f48122eb7a8312112..f99454bdba928a739347c4e24838d3af3873cfae 100644 (file)
--- a/theme/custom_corners/styles_ie6.css
+++ b/theme/custom_corners/styles_ie6.css
@@ -18,19 +18,47 @@ div#header div.i3 {
   font-size: 1%;
   line-height: 1%;
 }
+span.arrow {
+  font-family: Arial, sans-serif;
+}
+div.clearer {
+  font-size: 1%;
+  line-height: 1%;
+}
 body {
   background-image: none;
   background-color: #F1ECE6;
 }
+/*div.block_calendar_month div.calendar-controls span.hide {
+  display: none
+}
+div.block_calendar_month div.calendar-controls span.clearer {
+  display: none;
+}
+div.block_calendar_month div.calendar-controls span.current {
+  display: inline;
+}
+div.block_calendar_month div.calendar-controls a.previous {
+  float: left;
+}
+div.block_calendar_month div.calendar-controls a.next {
+  float: right;
+}*/
 div.sideblock div.bt div {
   background-image: url(pix/box.gif);
 }
+body.dir-rtl div.sideblock div.bt div {
+  margin-right: 1px;
+}
 div.sideblock div.bt {
   background-image: url(pix/box.gif);
 }
 div.sideblock div.header div.bt div {
   background-image: url(pix/box.gif);
 }
+body.dir-rtl div.sideblock div.header div.bt div {
+  margin-right: 1px;
+}
 div.sideblock div.header div.bt {
   background-image: url(pix/box.gif);
 }
@@ -49,15 +77,30 @@ div.sideblock div.i2 {
 div.sideblock div.bb div {
   background-image: url(pix/beige_box.gif);
 }
+body.dir-rtl div.sideblock div.bb div {
+  margin-right: 1px;
+  right: 0;
+}
 div.sideblock div.bb {
   background-image: url(pix/beige_box.gif);
 }
+body.dir-rtl div.sideblock div.bb {
+  /*margin-left: 2px;*/
+}
 td#middle-column div.bt div {
   background-image: url(pix/box.gif);
 }
+body.dir-rtl td#middle-column div.bt div {
+  margin-right: 1px;
+  right: -13px;
+}
 td#middle-column div.bt {
   background-image: url(pix/box.gif);
 }
+body.dir-rtl td#middle-column div.bt {
+  margin-left: 2px;
+  margin-right: 12px;
+}
 td#middle-column div.i1 {
   background-image: url(pix/borders.gif);
 }
@@ -67,12 +110,22 @@ td#middle-column div.i2 {
 td#middle-column div.bb div {
   background-image: url(pix/box.gif);
 }
+body.dir-rtl td#middle-column div.bb div {
+  margin-right: 1px;
+  right: -3px;
+}
 td#middle-column div.bb {
   background-image: url(pix/box.gif);
 }
+body.dir-rtl td#middle-column div.bb {
+  margin-left: 2px;
+}
 div#footer div.bt div {
   background-image: url(pix/beige_box.gif);
 }
+body.dir-rtl div#footer div.bt div {
+  margin-right: 1px;
+}
 div#footer div.bt {
   background-image: url(pix/beige_box.gif);
 }
@@ -85,12 +138,18 @@ div#footer div.i2 {
 div#footer div.bb div {
   background-image: url(pix/beige_box.gif);
 }
+body.dir-rtl div#footer div.bb div {
+  margin-right: 1px;
+}
 div#footer div.bb {
   background-image: url(pix/beige_box.gif);
 }
 div#header div.bt div {
   background-image: url(pix/beige_box.gif);
 }
+body.dir-rtl div#header div.bt div {
+  margin-right: 1px;
+}
 div#header div.bt {
   background-image: url(pix/beige_box.gif);
 }
@@ -103,12 +162,18 @@ div#header div.i2 {
 div#header div.bb div {
   background-image: url(pix/beige_box.gif);
 }
+body.dir-rtl div#header div.bb div {
+  margin-right: 1px;
+}
 div#header div.bb {
   background-image: url(pix/beige_box.gif);
 }
 div#header-home div.bt div {
   background-image: url(pix/beige_box.gif);
 }
+body.dir-rtl div#header-home div.bt div {
+  margin-right: 1px;
+}
 div#header-home div.bt {
   background-image: url(pix/beige_box.gif);
 }
@@ -121,12 +186,19 @@ div#header-home div.i2 {
 div#header-home div.bb div {
   background-image: url(pix/beige_box.gif);
 }
+body.dir-rtl div#header-home div.bb div {
+  margin-right: 1px;
+  right: -3px;
+}
 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.dir-rtl div#content div.bt div {
+  margin-right: 1px;
+}
 body.nocoursepage div#content div.bt {
   background-image: url(pix/box.gif);
 }
@@ -139,9 +211,16 @@ body.nocoursepage div#content div.i2 {
 body.nocoursepage div#content div.bb div {
   background-image: url(pix/box.gif);
 }
+body.nocoursepage.dir-rtl div#content div.bb div {
+  margin-right: 1px;
+  right: -3px;
+}
 body.nocoursepage div#content div.bb {
   background-image: url(pix/box.gif);
 }
+body.nocoursepage.dir-rtl div#content div.bb {
+  margin-right: 1px;
+}
 th.header {
   background-image: url(pix/header.gif);
 }

diff --git a/theme/custom_corners/styles_ie7.css b/theme/custom_corners/styles_ie7.css
index b1bf49e89c5b0f79e668e2b45999bf05a9efbe05..add9c4a90121abcd0f2c1eedb0b428e8a0d02f8d 100644 (file)
--- a/theme/custom_corners/styles_ie7.css
+++ b/theme/custom_corners/styles_ie7.css
@@ -13,4 +13,31 @@ div.i1 {
 }
 div#header div.i3 {
     min-width: 0;
+}
+div.block_calendar_month div.calendar-controls span.hide {
+  display: none
+}
+div.block_calendar_month div.calendar-controls span.clearer {
+  display: none;
+}
+div.block_calendar_month div.calendar-controls span.current {
+  display: inline;
+}
+div.block_calendar_month div.calendar-controls a.previous {
+  float: left;
+}
+div.block_calendar_month div.calendar-controls a.next {
+  float: right;
+}
+body.dir-rtl div.block_calendar_month div.calendar-controls a.previous {
+  float: right;
+}
+body.dir-rtl div.block_calendar_month div.calendar-controls a.next {
+  float: left;
+}
+body.dir-rtl div.block_calendar_month div.i1 {
+  padding-left: 10px;
+}
+body.dir-rtl div.block_calendar_month div.i2 {
+  padding-right: 10px;
 }
\ No newline at end of file

diff --git a/theme/custom_corners/user_styles.css b/theme/custom_corners/user_styles.css
index 113eda46eb4d164fe822961511b2421e1b6b1019..da450a3596ee60417c6e6b61a18e6f4178134d95 100644 (file)
--- a/theme/custom_corners/user_styles.css
+++ b/theme/custom_corners/user_styles.css
@@ -177,6 +177,9 @@ ul.section li {
 div.sideblock div.content * {
   text-align: left;
 }
+div.calendar-controls a.next {
+  text-align: right;
+}
 div.block_login div.content div.c1 {
   text-align: right;
   margin: 0.3em 0;
@@ -231,6 +234,7 @@ div.sideblock table.minicalendar tr.weekdays {
 div.coursebox {
   border-style: solid;
   border-color: #F1ECE6;
+  /*float: none;*/
 }
 div.courseboxcontent {
   background-color: #EEEEEE;
@@ -317,9 +321,35 @@ td.courseboxcontent {
   background-color: #DCE7EC;
   border-color: #DCE7EC;
 }
+h3.eventskey {
+  font-size: 100%;
+}
+div.block_calendar_month div.content {
+  padding: 0;
+}
 div.sideblock div.calendar-controls span.current {
   text-align: center;
 }
+#calendar td.sidecalendar div.sideblock {
+  border-color: #ccc;
+}
+#calendar td.maincalendar {
+  border-color: #ccc;
+}
+#calendar .nottoday,
+.minicalendar .today {
+  border-color: #ccc;
+}
+#calendar .event_global,
+#calendar .event_course,
+#calendar .event_group,
+#calendar .event_user,
+.minicalendar .event_global,
+.minicalendar .event_course,
+.minicalendar .event_group,
+.minicalendar .event_user {
+  border: 1px solid  #ccc !important;
+}
 body.admin table.generaltable {
   width: 100%;
 }
@@ -772,13 +802,18 @@ div#header-home div.i2 {
 }
 div#header-home div.i3 {
   background-color: #F1ECE6;
-  padding: 0 10px;
+  padding: 0;
   border-top-width: 1px;
   border-bottom-width: 1px;
   border-style: solid none;
   border-top-color: #F1ECE6;
   border-bottom-color: #F1ECE6;
 }
+div#header-home div.i3 div.wraphome {
+  background-color: #F1ECE6;
+  border: 1px solid #F1ECE6;
+  padding: 0 10px;
+}
 div#header-home div.bb div {
   background-image: url(pix/beige_box.png);
   background-repeat: no-repeat;