diff --git a/theme/clean/config.php b/theme/clean/config.php index d13ea7446e1..240f5b67939 100644 --- a/theme/clean/config.php +++ b/theme/clean/config.php @@ -55,3 +55,8 @@ $THEME->plugins_exclude_sheets = array( $THEME->rendererfactory = 'theme_overridden_renderer_factory'; $THEME->csspostprocess = 'clean_process_css'; + +$THEME->blockrtlmanipulations = array( + 'side-pre' => 'side-post', + 'side-post' => 'side-pre' +); \ No newline at end of file diff --git a/theme/clean/layout/columns1.php b/theme/clean/layout/columns1.php new file mode 100644 index 00000000000..16d10fe9e5d --- /dev/null +++ b/theme/clean/layout/columns1.php @@ -0,0 +1,91 @@ +. + +// Get the HTML for the settings bits. +$html = theme_clean_get_html_for_settings($OUTPUT, $PAGE); + +echo $OUTPUT->doctype() ?> +htmlattributes(); ?>> + + <?php echo $OUTPUT->page_title(); ?> + + standard_head_html() ?> + + + +body_attributes(); ?>> + +standard_top_of_body_html() ?> + + + +
+ +
+
+ + navbar(); ?> +
+ heading; ?> +
+ course_header(); ?> +
+
+ +
+
+
+ course_content_header(); + echo $OUTPUT->main_content(); + echo $OUTPUT->course_content_footer(); + ?> +
+
+
+ + + + standard_end_of_body_html() ?> + +
+ + \ No newline at end of file diff --git a/theme/clean/layout/columns2.php b/theme/clean/layout/columns2.php new file mode 100644 index 00000000000..9882767fe7c --- /dev/null +++ b/theme/clean/layout/columns2.php @@ -0,0 +1,102 @@ +. + +// Get the HTML for the settings bits. +$html = theme_clean_get_html_for_settings($OUTPUT, $PAGE); + +echo $OUTPUT->doctype() ?> +htmlattributes(); ?>> + + <?php echo $OUTPUT->page_title(); ?> + + standard_head_html() ?> + + + +body_attributes('two-column'); ?>> + +standard_top_of_body_html() ?> + + + +
+ +
+
+ + navbar(); ?> +
+ heading; ?> +
+ course_header(); ?> +
+
+ +
+
+
+
+ course_content_header(); + echo $OUTPUT->main_content(); + echo $OUTPUT->course_content_footer(); + ?> +
+ blocks('side-pre', 'span3 desktop-first-column'); + } ?> +
+
+ blocks('side-post', 'span3'); + } + ?> +
+ + + + standard_end_of_body_html() ?> + +
+ + \ No newline at end of file diff --git a/theme/clean/layout/columns3.php b/theme/clean/layout/columns3.php index 48958bd49eb..50120d2137f 100644 --- a/theme/clean/layout/columns3.php +++ b/theme/clean/layout/columns3.php @@ -28,81 +28,23 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$hasheading = ($PAGE->heading); -$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); -$hasfooter = (empty($PAGE->layout_options['nofooter'])); -$hasheader = (empty($PAGE->layout_options['noheader'])); - -$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); -$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT)); - -$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT)); -$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT)); - -// If there can be a sidepost region on this page and we are editing, always -// show it so blocks can be dragged into it. -if ($PAGE->user_is_editing()) { - if ($PAGE->blocks->is_known_region('side-pre')) { - $showsidepre = true; - } - if ($PAGE->blocks->is_known_region('side-post')) { - $showsidepost = true; - } -} - -$haslogo = (!empty($PAGE->theme->settings->logo)); - -$hasfootnote = (!empty($PAGE->theme->settings->footnote)); -$navbar_inverse = ''; -if (!empty($PAGE->theme->settings->invert)) { - $navbar_inverse = 'navbar-inverse'; -} -$custommenu = $OUTPUT->custom_menu(); -$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); - -$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = ''; - -if (empty($PAGE->layout_options['nocourseheaderfooter'])) { - $courseheader = $OUTPUT->course_header(); - $coursecontentheader = $OUTPUT->course_content_header(); - if (empty($PAGE->layout_options['nocoursefooter'])) { - $coursecontentfooter = $OUTPUT->course_content_footer(); - $coursefooter = $OUTPUT->course_footer(); - } -} - -$layout = 'pre-and-post'; -if ($showsidepre && !$showsidepost) { - if (!right_to_left()) { - $layout = 'side-pre-only'; - } else { - $layout = 'side-post-only'; - } -} else if ($showsidepost && !$showsidepre) { - if (!right_to_left()) { - $layout = 'side-post-only'; - } else { - $layout = 'side-pre-only'; - } -} else if (!$showsidepost && !$showsidepre) { - $layout = 'content-only'; -} -$bodyclasses[] = $layout; +// Get the HTML for the settings bits. +$html = theme_clean_get_html_for_settings($OUTPUT, $PAGE); echo $OUTPUT->doctype() ?> -htmlattributes() ?>> +htmlattributes(); ?>> - <?php echo $PAGE->title ?> - + <?php echo $OUTPUT->page_title(); ?> + standard_head_html() ?> - +body_attributes(); ?>> standard_top_of_body_html() ?> -