V2.8.3

gjbarnard · Nov 21, 2015 · ed44949 · ed44949
1 parent c184b30
commit ed44949
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/Readme.md b/Readme.md
@@ -255,6 +255,7 @@ Version 2.8.3
      provided if you don't have a responsive theme.
   5. Fixed #18, Collapsed Topics Edit menu and MDL-42634-28, ref: https://github.com/gjb2048/moodle-format_topcoll/issues/18
   6. Fixed slight issue with heading colour conflict and themes.
+  7. Fixed #19, Drag and drop handle does not show when editing in RTL.
 
 Version 2.8.2.5
   1. Fixed display of sections when 'Hidden sections' is set to 'Hidden sections are shown in collapsed form' and the

diff --git a/renderer.php b/renderer.php
@@ -382,13 +382,12 @@ protected function section_header($section, $course, $onsectionpage, $sectionret
 
             if ($this->rtl) {
                 // Swap content.
-                $tempcontent = $leftcontent;
-                $leftcontent = $rightcontent;
-                $rightcontent = $tempcontent;
+                $o .= html_writer::tag('div', $rightcontent, array('class' => 'right side'));
+                $o .= html_writer::tag('div', $leftcontent, array('class' => 'left side'));
+            } else {
+                $o .= html_writer::tag('div', $leftcontent, array('class' => 'left side'));
+                $o .= html_writer::tag('div', $rightcontent, array('class' => 'right side'));
             }
-
-            $o .= html_writer::tag('div', $leftcontent, array('class' => 'left side'));
-            $o .= html_writer::tag('div', $rightcontent, array('class' => 'right side'));
         }
         $o .= html_writer::start_tag('div', array('class' => 'content'));
 
@@ -527,13 +526,13 @@ protected function section_hidden($section, $courseorid = NULL) {
 
             if ($this->rtl) {
                 // Swap content.
-                $tempcontent = $leftcontent;
-                $leftcontent = $rightcontent;
-                $rightcontent = $tempcontent;
+                $o .= html_writer::tag('div', $leftcontent, array('class' => 'right side'));
+                $o .= html_writer::tag('div', $rightcontent, array('class' => 'left side'));
+            } else {
+                $o .= html_writer::tag('div', $leftcontent, array('class' => 'left side'));
+                $o .= html_writer::tag('div', $rightcontent, array('class' => 'right side'));
             }
 
-            $o .= html_writer::tag('div', $leftcontent, array('class' => 'left side'));
-            $o .= html_writer::tag('div', $rightcontent, array('class' => 'right side'));
         }
 
         $o .= html_writer::start_tag('div', array('class' => 'content sectionhidden'));

diff --git a/styles.css b/styles.css
@@ -633,6 +633,14 @@ body#page-admin-setting-formatsettingtopcoll.lang-en_ar select#id_s_format_topco
 }
 
 /* Assist the layout. */
+body.format-topcoll.dir-rtl .course-content ul.ctopics li.section .left {
+    float: right;
+}
+
+body.format-topcoll.dir-rtl .course-content ul.ctopics li.section .right {
+    float: left;
+}
+
 body.format-topcoll .ctopics .section .activity .mod-indent-outer,
 body.format-topcoll.editing.dir-rtl .ctopics .section .activity .mod-indent-outer {
     padding-left: 0px;