L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-38898_master' of git://github.com/lazydaisy/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2013-04-22 09:52:09 +08:00
parent 54ed002fdc c9ff4d0e0f
commit 80333fd96f
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/bootstrap/layout/general.php
+13 -6
View File
@@ -131,29 +131,36 @@ echo $OUTPUT->doctype() ?>
<?php if ($layout !== 'content-only') {
if ($layout === 'pre-and-post') { ?>
<aside id="region-pre" class="span4 block-region desktop-first-column region-content">
<aside class="span4 desktop-first-column">
<?php } else if ($layout === 'side-pre-only') { ?>
<aside id="region-pre" class="span3 block-region desktop-first-column region-content">
<aside class="span3 desktop-first-column">
<?php } ?>
<div id="region-pre" class="block-region">
<div class="region-content">
<?php
if (!right_to_left()) {
echo $OUTPUT->blocks_for_region('side-pre');
} else if ($hassidepost) {
echo $OUTPUT->blocks_for_region('side-post');
}
?>
</aside>
} ?>
</div>
</div>
</aside>
<?php if ($layout === 'pre-and-post') {
?></div></div><?php // Close row-fluid and span9.
}
if ($layout === 'side-post-only' OR $layout === 'pre-and-post') { ?>
<aside id="region-post" class="span3 block-region region-content">
<aside class="span3">
<div id="region-post" class="block-region">
<div class="region-content">
<?php if (!right_to_left()) {
echo $OUTPUT->blocks_for_region('side-post');
} else {
echo $OUTPUT->blocks_for_region('side-pre');
} ?>
</div>
</div>
</aside>
<?php } ?>
<?php } ?>