moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2013-09-24 10:02:58 +12:00
commit 0fd451b7ad
5 changed files with 38 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/outputlib.php
View file

@ -487,6 +487,11 @@ class theme_config {
}
}
// Use parent theme's "blockrtlmanipulations" if it was defined and if it was not defined on current theme.
if (empty($this->blockrtlmanipulations) and !empty($parent_config->blockrtlmanipulations)) {
$this->blockrtlmanipulations = $parent_config->blockrtlmanipulations;
}
//fix arrows if needed
$this->check_theme_arrows();
}

4
theme/base/config.php
View file

@ -174,3 +174,7 @@ $THEME->hidefromselector = true;
/** List of javascript files that need to included on each page */
$THEME->javascripts = array();
$THEME->javascripts_footer = array();
// Swap side-pre with side-post blocks regions, in RTL mode (can be override on derived themes)
$THEME->blockrtlmanipulations = array('side-pre'=>'side-post','side-post'=>'side-pre');

33
theme/base/layout/frontpage.php
View file

@ -10,17 +10,9 @@ $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custom
$bodyclasses = array();
if ($showsidepre && !$showsidepost) {
if (!right_to_left()) {
$bodyclasses[] = 'side-pre-only';
}else{
$bodyclasses[] = 'side-post-only';
}
$bodyclasses[] = 'side-pre-only';
} else if ($showsidepost && !$showsidepre) {
if (!right_to_left()) {
$bodyclasses[] = 'side-post-only';
}else{
$bodyclasses[] = 'side-pre-only';
}
$bodyclasses[] = 'side-post-only';
} else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only';
}
@ -66,29 +58,22 @@ echo $OUTPUT->doctype() ?>
</div>
</div>
<?php if ($hassidepre OR (right_to_left() AND $hassidepost)) { ?>
<?php if ($hassidepre) { ?>
<div id="region-pre" class="block-region">
<div class="region-content">
<?php
if (!right_to_left()) {
<?php
echo $OUTPUT->blocks_for_region('side-pre');
} elseif ($hassidepost) {
echo $OUTPUT->blocks_for_region('side-post');
} ?>
?>
</div>
</div>
<?php } ?>
<?php if ($hassidepost OR (right_to_left() AND $hassidepre)) { ?>
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
<?php
if (!right_to_left()) {
echo $OUTPUT->blocks_for_region('side-post');
} elseif ($hassidepre) {
echo $OUTPUT->blocks_for_region('side-pre');
} ?>
<?php
echo $OUTPUT->blocks_for_region('side-post');
?>
</div>
</div>
<?php } ?>

27
theme/base/layout/general.php
View file

@ -25,17 +25,9 @@ if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
$bodyclasses = array();
if ($showsidepre && !$showsidepost) {
if (!right_to_left()) {
$bodyclasses[] = 'side-pre-only';
}else{
$bodyclasses[] = 'side-post-only';
}
} else if ($showsidepost && !$showsidepre) {
if (!right_to_left()) {
$bodyclasses[] = 'side-post-only';
}else{
$bodyclasses[] = 'side-pre-only';
}
} else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only';
}
@ -96,29 +88,18 @@ echo $OUTPUT->doctype() ?>
</div>
</div>
<?php if ($hassidepre OR (right_to_left() AND $hassidepost)) { ?>
<?php if ($hassidepre) { ?>
<div id="region-pre" class="block-region">
<div class="region-content">
<?php
if (!right_to_left()) {
echo $OUTPUT->blocks_for_region('side-pre');
} elseif ($hassidepost) {
echo $OUTPUT->blocks_for_region('side-post');
} ?>
<?php echo $OUTPUT->blocks_for_region('side-pre'); ?>
</div>
</div>
<?php } ?>
<?php if ($hassidepost OR (right_to_left() AND $hassidepre)) { ?>
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
<?php
if (!right_to_left()) {
echo $OUTPUT->blocks_for_region('side-post');
} elseif ($hassidepre) {
echo $OUTPUT->blocks_for_region('side-pre');
} ?>
<?php echo $OUTPUT->blocks_for_region('side-post'); ?>
</div>
</div>
<?php } ?>

17
theme/base/style/pagelayout.css
View file

@ -97,4 +97,19 @@ body {margin:auto 0px;width:auto;}
.ie6.pagelayout-report #report-main-content {float:none;width:auto;}
.ie6.pagelayout-report #report-region-wrap {float:none;width:200px;left:auto;position:absolute;top:0;}
.ie6.pagelayout-report #report-region-pre,
.ie6.pagelayout-report #report-region-pre .block {width:100%;}
.ie6.pagelayout-report #report-region-pre .block {width:100%;}
/** Only side PRE **/
.dir-rtl.side-pre-only #page-content #region-main-box {left:0px;}
.dir-rtl.side-pre-only #page-content #region-post-box {margin-left:-200px;}
.dir-rtl.side-pre-only #page-content #region-main {margin-left:200px;}
.dir-rtl.side-pre-only #page-content #region-post {width:0px;}
.dir-rtl.side-pre-only #page-content #region-pre {left:50%; width: 200px;}
/**RTL Only side POST **/
.dir-rtl.side-post-only #page-content {clear:both;float:left;overflow:hidden;position:relative;width:100%;min-width:900px;}
.dir-rtl.side-post-only #page-content #region-main-box {float:left;left:200px;position:relative;width:200%;}
.dir-rtl.side-post-only #page-content #region-post-box {margin-left:-200px;}
.dir-rtl.side-post-only #page-content #region-main {margin-left:200px;}
.dir-rtl.side-post-only #page-content #region-pre {width: 0;}
.dir-rtl.side-post-only #page-content #region-post {float:left;left:0px;overflow:hidden;position:relative;width:200px;margin-left:-50%;}