MDL-14399 Merged RTL fixes from 1.9

diff --git a/lib/ajax/section_classes.js b/lib/ajax/section_classes.js
index 24c9ca2d1c100f1671791c5841eaa6a406647823..dede0df45f102041c66dd529b820f6201bed4cbe 100755 (executable)
--- a/lib/ajax/section_classes.js
+++ b/lib/ajax/section_classes.js
@@ -589,6 +589,9 @@ resource_class.prototype.init_buttons = function() {
     var moveLeft = false;
     var moveRight = false;
     var updateButton = null;
+       
+       // for RTL support
+       var isrtl = (document.getElementsByTagName("html")[0].dir=="rtl");
 
     for (var x=0; x<buttons.length; x++) {
         if (buttons[x].className == 'editing_moveleft') {
@@ -626,7 +629,7 @@ resource_class.prototype.init_buttons = function() {
 
     // Add indentation buttons if needed (move left, move right).
     if (moveLeft) {
-        var button = main.mk_button('a', '/t/left.gif', main.portal.strings['moveleft'],
+        var button = main.mk_button('a', (isrtl?'/t/right.gif':'/t/left.gif'), main.portal.strings['moveleft'],
                 [['class', 'editing_moveleft']]);
         YAHOO.util.Event.addListener(button, 'click', this.indent_left, this, true);
         commandContainer.appendChild(button);
@@ -634,7 +637,7 @@ resource_class.prototype.init_buttons = function() {
     }
 
     if (moveRight) {
-        var button = main.mk_button('a', '/t/right.gif', main.portal.strings['moveright'],
+        var button = main.mk_button('a', (isrtl?'/t/left.gif':'/t/right.gif'), main.portal.strings['moveright'],
                 [['class', 'editing_moveright']]);
         YAHOO.util.Event.addListener(button, 'click', this.indent_right, this, true);
         commandContainer.appendChild(button);
@@ -706,7 +709,10 @@ resource_class.prototype.indent_left = function() {
 
 resource_class.prototype.indent_right = function() {
 
-    var spacer = YAHOO.util.Dom.getElementsByClassName('spacer',
+       // for RTL support
+       var isrtl = (document.getElementsByTagName("html")[0].dir=="rtl");
+
+       var spacer = YAHOO.util.Dom.getElementsByClassName('spacer',
             'img', this.getEl())[0];
     if (!spacer) {
         var spacer = document.createElement('img');
@@ -727,7 +733,7 @@ resource_class.prototype.indent_right = function() {
             'span', this.getEl())[0];
 
     if (!this.indentLeftButton) {
-        var button = main.mk_button('a', '/t/left.gif', main.portal.strings['moveleft'],
+        var button = main.mk_button('a', (isrtl?'/t/right.gif':'/t/left.gif'), main.portal.strings['moveleft'],
                 [['class', 'editing_moveleft']]);
         YAHOO.util.Event.addListener(button, 'click', this.indent_left, this, true);
         commandContainer.insertBefore(button, this.indentRightButton);

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 97fbf0bbcf67ef500eb75a07aa15a869458dd514..924804a4169fe1fa703bdc2a2d8fb8dc9cf44bf2 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -35,9 +35,15 @@
     function module_specific_actions($pageurl, $questionid, $cmid, $canuse){
         global $CFG;
         if ($canuse){
+                       // for RTL languages: switch right and left arrows /****/
+                       if (right_to_left()) { 
+                               $movearrow = 'removeright.gif'; 
+                       } else { 
+                               $movearrow = 'moveleft.gif'; 
+                       } 
             $straddtoquiz = get_string("addtoquiz", "quiz");
             $out = "<a title=\"$straddtoquiz\" href=\"edit.php?".$pageurl->get_query_string()."&amp;addquestion=$questionid&amp;sesskey=".sesskey()."\"><img
-                  src=\"$CFG->pixpath/t/moveleft.gif\" alt=\"$straddtoquiz\" /></a>&nbsp;";
+                  src=\"$CFG->pixpath/t/$movearrow\" alt=\"$straddtoquiz\" /></a>&nbsp;";
             return $out;
         } else {
             return '';

diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 1ea548f590b47602444f958df8470de530d24fdf..5c47077b582ed66b1d3b2b7d90cba0a1b4a3771a 100644 (file)
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -189,6 +189,14 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true, $showbreak
     echo "<th style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$strgrade</th>";
     echo "<th align=\"center\" style=\"white-space:nowrap;\" class=\"header\" scope=\"col\">$straction</th>";
     echo "</tr>\n";
+
+       // for RTL languages: switch right and left arrows /****/
+    if (right_to_left()) { 
+        $movearrow = 'moveleft.gif'; 
+    } else { 
+        $movearrow = 'removeright.gif'; 
+    } 
+
     foreach ($order as $i => $qnum) {
 
         if ($qnum and empty($questions[$qnum])) {
@@ -290,7 +298,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true, $showbreak
         }
         if ($allowdelete && question_has_capability_on($question, 'use', $question->category)) { // remove from quiz, not question delete.
             echo "<a title=\"$strremove\" href=\"".$pageurl->out_action(array('delete'=>$count))."\">
-                    <img src=\"$CFG->pixpath/t/removeright.gif\" class=\"iconsmall\" alt=\"$strremove\" /></a>";
+                    <img src=\"$CFG->pixpath/t/$movearrow\" class=\"iconsmall\" alt=\"$strremove\" /></a>";
         }
 
         echo "</td></tr>";

diff --git a/theme/standard/rtl.css b/theme/standard/rtl.css
index 5dd007a845700c56d53335f5540bf8fded57e0a7..960b9303b60ad3d6e3d98680910e6908c17a263e 100755 (executable)
--- a/theme/standard/rtl.css
+++ b/theme/standard/rtl.css
@@ -79,6 +79,10 @@ body, td, li, div {
     text-align: right;
 }
 
+.categorylist .category.number {
+       text-align: left;
+}
+
 .calendar-controls .previous, .calendar-controls .current, .calendar-controls .next {
     float: right;
 }
@@ -136,6 +140,30 @@ form.mform .fdescription.required {
     direction: ltr;
 }
 
+/* on firefox the main layout-table might be pushed to the right by editing buttons **** */
+
+#layout-table {
+       clear: both;
+}
+
+/* admin > appearance > themes > theme settings */
+
+#adminsettings .form-label {
+       float: right;
+       text-align: left;
+}
+
+#adminsettings .form-setting {
+       text-align: right;
+       margin-right: 13em;
+       margin-left: 0px;
+}
+
+#adminsettings .form-description {
+       margin: 0.5em 13em 0em 0pt;
+       text-align: right;
+}
+
 #id_lang {
     direction: ltr;
 }
@@ -151,6 +179,11 @@ select#uninstalllang {
 }
 
 .mod-forum .indent {
+/* in forums, fix top and bottom navigation bars' buttons */
+li form .invisiblefieldset {
+       display: inline;
+}
+
     margin-right: 30px;
     margin-left: 0px;
 }
@@ -204,6 +237,22 @@ h1.main, h2.main, h3.main, h4.main, h5.main, h6.main {
     direction: ltr;
 }
 
+.block_admin_tree .admintree .depth1 {
+       padding-right:16px;
+}
+
+.block_admin_tree .admintree .depth2 {
+       padding-right:32px;
+}
+
+.block_admin_tree .admintree .depth3 {
+       padding-right:48px;
+}
+
+.block_admin_tree .admintree .depth4 {
+       padding-right:64px;
+}
+
 .block_admin_tree .admintree {
     text-align: right;
 }
@@ -232,13 +281,11 @@ body#user-index table#participants td, body#user-index table#participants th {
 /* Admin > Security */
 
 #adminsettings label {
-    float: right;
     text-align: left;
 }
 
 #adminsettings select, #adminsettings input {
-    float: right;
-    margin: 0pt 10pt 0pt 0px;
+    margin: 0pt 5pt 0pt 5pt;
 }
 
 #adminsettings .description {
@@ -277,10 +324,19 @@ form.mform div.felement, form.mform fieldset.felement {
     text-align: right;
 }
 
+.invisiblefieldset {
+       display: block;
+}
+
 body#mod-quiz-report table#attempts .header {
     text-align: right;
 }
 
+#mod-quiz-mod #reviewoptionshdr fieldset.fgroup span {
+       clear: right;
+       float: right;
+}
+
 .logtable th {
     text-align: right;
 }
@@ -299,20 +355,32 @@ form.mform .fitemtitle {
     border-right-style: none;
 }
 
+.form-setting .form-time {
+    direction: ltr;
+       float:right;
+}
+
 /* ========================
        for tabs support
    ======================== */
 
 .tabrow0 {
-    overflow: auto;
     PADDING-BOTTOM: 2.75em;
 }
 
+/* IE6 requires overflow: auto. IE7 requires overflow: hidden.
+   exploit IE's "star html selector bug" to apply to IE6 ONLY */
+.tabrow0 {
+       #overflow: hidden; /* for IE7. to eliminate extra scroll bars . the # hides from firefox */
+    * html overflow: auto; /* for IE6 only **** */
+}
+
 .tabrow0  LI {
     float: right;
     MARGIN: 0px;
     width: 130px;
     BACKGROUND: url(pix/tab/rtlbg.gif) no-repeat right top;
+       overflow: hidden; /* for IE7. to prevent long titles from 'falling' 3cm down */
 }
 
 .tabrow0 A SPAN {
@@ -333,10 +401,21 @@ form.mform .fitemtitle {
     BACKGROUND-IMAGE: none
 }
 
+.tabrow0 .here A:link,
+.tabrow0 .here A:visited {
+       /* has to override styles.css 'position:relative', otherwise the active tab title disappears on IE6/7 */
+    position: static;
+}
 .tabrow0 ul a {
     PADDING-LEFT: 0px;
 }
 
+div.tabrow1 {
+/* without that, IE will leave a short line floating, when there's ho secondary menu */
+       #right: 0px;   /* IE only */
+       #width: 800px; /* IE only */
+}
+
 UL.tabrow1 {
     right: 0px;
     width: 800px;
@@ -349,10 +428,23 @@ UL.tabrow1  li {
     float: right;
 }
 
+.tabtree {
+       /* give some space below the tabs row (when there's a secondary row) on firefox */
+       margin-bottom:15px;
+
+       /* has to override 'height:100%' in styles_ie6.css, otherwise it causes a huge height in quiz report overview, e.g.: moodle/mod/quiz/report.php?q=14&mode=overview */
+    height: auto !important;
+}
+
 .tabtree * {
     width: auto;
 }
 
+/* notify-problem line gets covered by secondary tabs line (tabrow1), add some height to the line **** */
+.notifyproblem {
+       line-height: 40px;
+}
+
 /* ========================
        overrides styles_ie6 
    ======================== */
@@ -370,7 +462,7 @@ FORM.mform INPUT {
     direction: rtl;
 }
 
-form#adminsettings div.htmlarea {
-    clear: right;
+.htmlarea * select {
+       max-width: 100px;
 }