V2.9.2.1 - #19

gjbarnard · Nov 19, 2015 · 71106a6 · 71106a6
1 parent 0ca6bb0
commit 71106a6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/Readme.md b/Readme.md
@@ -249,6 +249,7 @@ Version Information
 Version 2.9.2.1
   1. Fixed #18, Collapsed Topics Edit menu and MDL-42634-28, ref: https://github.com/gjb2048/moodle-format_topcoll/issues/18
   2. Fixed slight issue with heading colour conflict and themes.
+  3. Fixed #19, Drag and drop handle does not show when editing in RTL.
 
 Version 2.9.2
   1. Added responsive theme support, now a new 'Format responsive' setting in Site Administration -> Plugins ->

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
@@ -630,6 +630,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;