2.7.4b

README.txt

@@ -21,8 +21,11 @@ New in 2.7.4
 - FIX: Issue #58.  Add font colour setting.
 - FIX: Issue #63.  Slider caption overlap.
 - FIX: Issue #66.  Link Colour Not Working.
+- FIX: Issue #85.  Header logo location in RTL.
 - FIX: Reverted icons back to #999.
 - FIX: Alternative colour sets all now have the same CSS, docking fixed and consistent with settings.
+- FIX: Moved all RTL to separate sheet from main CSS.  Sheet 'essential-rtl' uses 'flipped' technology whilst 'rtl' sheet has manual styles.
+- FIX: Issue #78.  Category icon issue in RTL.
 - NEW: Alternative colour sets have text and link colour settings.
 - NEW: Optimised svg's to be smaller.
 - NEW: Warning about IE8 as M2.6 does not support it - http://docs.moodle.org/dev/Moodle_2.6_release_notes#Requirements.

config.php

@@ -33,7 +33,14 @@
 $THEME->doctype = 'html5';
 $THEME->yuicssmodules = array();
 $THEME->parents = array('bootstrapbase');
-$THEME->sheets = array('fontawesome', 'essential', 'custom');
+$THEME->sheets = array('fontawesome');
+if ('ltr' === get_string('thisdirection', 'langconfig')) {
+    $THEME->sheets[] = 'essential';
+} else {
+    $THEME->sheets[] = 'essential-rtl';
+    $THEME->sheets[] = 'rtl';
+}
+$THEME->sheets[] = 'custom';
 $THEME->supportscssoptimisation = false;
 
 if ($CFG->version >= 2014051200.10 ) {
@@ -42,11 +49,7 @@
 
 $THEME->editor_sheets = array();
 
-$THEME->plugins_exclude_sheets = array(
-    'block' => array(
-        'html',
-    ),
-);
+$THEME->plugins_exclude_sheets = array();
 
 $THEME->layouts = array(
     // Most backwards compatible layout without the blocks - this is the layout used by default.

layout/includes/header.php

@@ -34,7 +34,7 @@
         <div class="container-fluid">
             <div class="row-fluid">
             <!-- HEADER: LOGO AREA -->
-                <div class="<?php echo $logoclass;?>">
+                <div class="<?php echo $logoclass; echo (!$left) ? ' pull-right': '';?>">
                     <?php if (!$haslogo) { ?>
                         <i id="headerlogo" class="fa fa-<?php echo $PAGE->theme->settings->siteicon ?>"></i>
                             <h1 id="title"><?php echo $SITE->shortname; ?></h1>
@@ -43,20 +43,20 @@
                     <?php } ?>
                 </div>
                 <?php if (isloggedin() && $hasprofilepic) { ?>
-                <div class="span1 pull-right" id="profilepic">
+                <div class="span1<?php echo ($left) ? ' pull-right': '';?>" id="profilepic">
                     <p id="socialheading"><?php echo $USER->firstname; ?></p>
                     <ul class="socials unstyled">
                         <li>
                             <?php echo $OUTPUT->user_picture($USER); ?>
                         </li>
-                    </ul>            
+                    </ul>
                 </div>
                 <?php
                 }
                 // If true, displays the heading and available social links; displays nothing if false.
                 if ($hassocialnetworks) {
                 ?>
-                <div class="span3 pull-right">
+                <div class="span3<?php echo ($left) ? ' pull-right': '';?>">
                 <p id="socialheading"><?php echo get_string('socialnetworks','theme_essential')?></p>
                     <ul class="socials unstyled">
                         <?php

layout/includes/pagesettings.php

@@ -71,11 +71,11 @@
 
 $logoclass = 'span12';
 if (($hassocialnetworks || $hasmobileapps) && $hasprofilepic) {
-	$logoclass = 'span6';
+    $logoclass = 'span6';
 } else if (!($hassocialnetworks || $hasmobileapps) && $hasprofilepic) {
-	$logoclass = 'span11';
+    $logoclass = 'span11';
 } else if (($hassocialnetworks || $hasmobileapps) && !$hasprofilepic) {
-	$logoclass = 'span7';
+    $logoclass = 'span7';
 }
 
 $oldnavbar = $PAGE->theme->settings->oldnavbar;