From 042df07f7f9786bd883d195337478646815c757f Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sat, 4 Aug 2012 17:34:39 +0100 Subject: [PATCH 1/2] MDL-32412 theme_afterburner: converting afterburner to percentage layout to better enable RTL access in IE7 + support for RTL in general --- theme/afterburner/config.php | 5 +- theme/afterburner/layout/default.php | 60 ++++--- theme/afterburner/pix/menu/nav-arrow-left.png | Bin 0 -> 216 bytes .../pix/menu/nav-arrowover-left.png | Bin 0 -> 219 bytes ...-arrowover.png => nav-arrowover-right.png} | Bin theme/afterburner/style/afterburner_dock.css | 67 ++++---- .../afterburner/style/afterburner_layout.css | 161 ------------------ theme/afterburner/style/afterburner_menu.css | 6 +- .../style/afterburner_pagelayout.css | 112 ++++++++++++ theme/afterburner/style/afterburner_rtl.css | 120 +++++++++++++ .../afterburner/style/afterburner_styles.css | 95 ++++++----- theme/afterburner/style/rtl.css | 7 - 12 files changed, 362 insertions(+), 271 deletions(-) create mode 100644 theme/afterburner/pix/menu/nav-arrow-left.png create mode 100644 theme/afterburner/pix/menu/nav-arrowover-left.png rename theme/afterburner/pix/menu/{ab-arrowover.png => nav-arrowover-right.png} (100%) delete mode 100644 theme/afterburner/style/afterburner_layout.css create mode 100644 theme/afterburner/style/afterburner_pagelayout.css create mode 100644 theme/afterburner/style/afterburner_rtl.css delete mode 100644 theme/afterburner/style/rtl.css diff --git a/theme/afterburner/config.php b/theme/afterburner/config.php index b0e70063884..da3742da0fb 100644 --- a/theme/afterburner/config.php +++ b/theme/afterburner/config.php @@ -5,15 +5,16 @@ $THEME->name = 'afterburner'; $THEME->parents = array('base'); $THEME->sheets = array( - 'afterburner_layout', /** Must come first: Page layout **/ + 'afterburner_pagelayout', /** Must come first: page layout **/ 'afterburner_styles', /** Must come second: default styles **/ 'afterburner_menu', 'afterburner_blocks', 'afterburner_mod', 'afterburner_calendar', 'afterburner_dock', + 'afterburner_rtl', 'afterburner_settings', - 'rtl' + ); $THEME->parents_exclude_sheets = array( diff --git a/theme/afterburner/layout/default.php b/theme/afterburner/layout/default.php index fa3713af406..0bc2bfa88d3 100644 --- a/theme/afterburner/layout/default.php +++ b/theme/afterburner/layout/default.php @@ -17,9 +17,17 @@ $hasfootnote = (!empty($PAGE->theme->settings->footnote)); $bodyclasses = array(); if ($showsidepre && !$showsidepost) { - $bodyclasses[] = 'side-pre-only'; + if (!right_to_left()) { + $bodyclasses[] = 'side-pre-only'; + } else { + $bodyclasses[] = 'side-post-only'; + } } else if ($showsidepost && !$showsidepre) { - $bodyclasses[] = 'side-post-only'; + if (!right_to_left()) { + $bodyclasses[] = 'side-post-only'; + } else { + $bodyclasses[] = 'side-pre-only'; + } } else if (!$showsidepost && !$showsidepre) { $bodyclasses[] = 'content-only'; } @@ -74,32 +82,40 @@ echo $OUTPUT->doctype() ?>
-
-
-
-
-
- main_content() ?> -
+
+
+
+ main_content() ?>
-
- -
+ +
- blocks_for_region('side-pre') ?> -
-
- + blocks_for_region('side-pre'); + } elseif ($hassidepost) { + echo $OUTPUT->blocks_for_region('side-post'); + } ?> - -
-
- blocks_for_region('side-post') ?>
-
- +
+ + + +
+
+ blocks_for_region('side-post'); + } elseif ($hassidepre) { + echo $OUTPUT->blocks_for_region('side-pre'); + } ?> +
+
+ +
diff --git a/theme/afterburner/pix/menu/nav-arrow-left.png b/theme/afterburner/pix/menu/nav-arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b2f20a763029d5f8263bef3710ad04e0fdb79fdb GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^azGrw!3HGxl8){JQY^(zo*^7SP{WbZ0pxQQctjR6 zFmQbUVMeDlCNqG7Rh}-6AsLNtZx{+TIPkDI$oWP%aH?{x&-c4jzBwFBFp%J3Ylcwbhpz9e<#)eeBI6odz{Yzx(u5^^f#MFW^$#m;e;o*| t*zrnd-mXG6fBSHe{APTC>E{DfSXiUsv`!>@s3ZT&MfR<^qK{ z3p^r=85p>QK$!8;-MT+OL6&q!Uq=Rpjs4tz5?O)#EKe85kcwMxZ#eQcIPkCrcB$Dc zzTbyO