mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-40065-master_4' of git://github.com/gjb2048/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2013-06-25 09:59:24 +12:00
commit 10a741cc64
7 changed files with 49 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pagelib.php
View File

@ -1852,7 +1852,14 @@ class moodle_page {
*/
public function apply_theme_region_manipulations($region) {
if ($this->blockmanipulations && isset($this->blockmanipulations[$region])) {
return $this->blockmanipulations[$region];
$regionwas = $region;
$regionnow = $this->blockmanipulations[$region];
if ($this->blocks->is_known_region($regionwas) && $this->blocks->is_known_region($regionnow)) {
// Both the before and after regions are known so we can swap them over.
return $regionnow;
}
// We didn't know about both, we won't swap them over.
return $regionwas;
}
return $region;
}

18
theme/bootstrapbase/layout/columns1.php
View File

@ -60,16 +60,14 @@ echo $OUTPUT->doctype() ?>
</div>
</header>
<div id="page-content">
<div id="region-bs-main-and-pre">
<section id="region-main">
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->course_content_footer();
?>
</section>
</div>
<div id="page-content" class="row-fluid">
<section id="region-main" class="span12">
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->course_content_footer();
?>
</section>
</div>
<footer id="page-footer">

29
theme/bootstrapbase/layout/columns2.php
View File

@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
$left = (!right_to_left()); // To know if to add 'pull-right' and 'desktop-first-column' classes in the layout for LTR.
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes(); ?>>
<head>
@ -61,25 +62,19 @@ echo $OUTPUT->doctype() ?>
</header>
<div id="page-content" class="row-fluid">
<div id="region-bs-main-and-pre" class="span9">
<div class="row-fluid">
<section id="region-main" class="span9 pull-right">
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->course_content_footer();
?>
</section>
<?php
if (!right_to_left()) {
echo $OUTPUT->blocks('side-pre', 'span3 desktop-first-column');
} ?>
</div>
</div>
<section id="region-main" class="span9<?php if ($left) { echo ' pull-right'; } ?>">
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->course_content_footer();
?>
</section>
<?php
if (right_to_left()) {
echo $OUTPUT->blocks('side-post', 'span3');
$classextra = '';
if ($left) {
$classextra = ' desktop-first-column';
}
echo $OUTPUT->blocks('side-pre', 'span3'.$classextra);
?>
</div>

2
theme/bootstrapbase/less/moodle/core.less
View File

@ -14,8 +14,6 @@
display:none;
}
.dir-ltr.two-column #region-bs-main-and-pre.span9,
.dir-rtl.two-column #region-main.span9,
.empty-region-side-post #region-bs-main-and-pre.span9 {
width:100%;
}

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long

18
theme/clean/layout/columns1.php
View File

@ -63,16 +63,14 @@ echo $OUTPUT->doctype() ?>
</div>
</header>
<div id="page-content">
<div id="region-bs-main-and-pre">
<section id="region-main">
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->course_content_footer();
?>
</section>
</div>
<div id="page-content" class="row-fluid">
<section id="region-main" class="span12">
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->course_content_footer();
?>
</section>
</div>
<footer id="page-footer">

29
theme/clean/layout/columns2.php
View File

@ -17,6 +17,7 @@
// Get the HTML for the settings bits.
$html = theme_clean_get_html_for_settings($OUTPUT, $PAGE);
$left = (!right_to_left()); // To know if to add 'pull-right' and 'desktop-first-column' classes in the layout for LTR.
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes(); ?>>
<head>
@ -64,25 +65,19 @@ echo $OUTPUT->doctype() ?>
</header>
<div id="page-content" class="row-fluid">
<div id="region-bs-main-and-pre" class="span9">
<div class="row-fluid">
<section id="region-main" class="span9 pull-right">
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->course_content_footer();
?>
</section>
<?php
if (!right_to_left()) {
echo $OUTPUT->blocks('side-pre', 'span3 desktop-first-column');
} ?>
</div>
</div>
<section id="region-main" class="span9<?php if ($left) { echo ' pull-right'; } ?>">
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->course_content_footer();
?>
</section>
<?php
if (right_to_left()) {
echo $OUTPUT->blocks('side-post', 'span3');
$classextra = '';
if ($left) {
$classextra = ' desktop-first-column';
}
echo $OUTPUT->blocks('side-pre', 'span3'.$classextra);
?>
</div>