mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 00:16:46 +02:00
MDL-12221 custom themes revisited - implemented container concept; merged from MOODLE_19_STABLE
This commit is contained in:
parent
220f149cfc
commit
9f7f1a74a0
48 changed files with 653 additions and 732 deletions
|
@ -1,7 +1,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<?php if (!empty($THEME->customcorners)) print_custom_corners_end(); ?>
|
||||
<?php print_container_end(); ?>
|
||||
</td>
|
||||
<?php
|
||||
print '<!-- End page content -->'."\n";
|
||||
|
@ -10,10 +10,10 @@ print '<!-- End page content -->'."\n";
|
|||
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
|
||||
echo '<td style="vertical-align: top; width: '. $preferred_width_right .'px;" id="right-column">';
|
||||
echo '<!-- Begin right side blocks -->'."\n";
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_start();
|
||||
print_container_start();
|
||||
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
|
||||
print_spacer(1, 120, true);
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_end();
|
||||
print_container_end();
|
||||
echo '<!-- End right side blocks -->'."\n";
|
||||
echo '</td>';
|
||||
}
|
||||
|
|
|
@ -8,10 +8,6 @@ require_once($CFG->dirroot .'/blog/blogpage.php');
|
|||
require_once($CFG->libdir .'/blocklib.php');
|
||||
require_once($CFG->dirroot .'/course/lib.php');
|
||||
|
||||
if (!empty($THEME->customcorners)) {
|
||||
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
|
||||
}
|
||||
|
||||
$blockaction = optional_param('blockaction','', PARAM_ALPHA);
|
||||
$instanceid = optional_param('instanceid', 0, PARAM_INT);
|
||||
$blockid = optional_param('blockid', 0, PARAM_INT);
|
||||
|
@ -263,9 +259,9 @@ print '<tr valign="top">' . "\n";
|
|||
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
|
||||
print '<td style="vertical-align: top; width: '. $preferred_width_left .'px;" id="left-column">' . "\n";
|
||||
print '<!-- Begin left side blocks -->' . "\n";
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_start();
|
||||
print_container_start();
|
||||
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_end();
|
||||
print_container_end();
|
||||
print '<!-- End left side blocks -->' . "\n";
|
||||
print '</td>' . "\n";
|
||||
}
|
||||
|
@ -273,7 +269,7 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
|
|||
/// Start main column
|
||||
print '<!-- Begin page content -->' . "\n";
|
||||
print '<td>';
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_start();
|
||||
print_container_start();
|
||||
?>
|
||||
<table width="100%">
|
||||
<tr>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue