mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +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
|
@ -66,10 +66,6 @@ foreach ($RESOURCE_WINDOW_OPTIONS as $popupoption) {
|
|||
}
|
||||
}
|
||||
|
||||
if (!empty($THEME->customcorners)) {
|
||||
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
|
||||
}
|
||||
|
||||
/**
|
||||
* resource_base is the base class for resource types
|
||||
*
|
||||
|
@ -170,14 +166,14 @@ class resource_base {
|
|||
|
||||
if((blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) {
|
||||
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
|
||||
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();
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
echo '<td id="middle-column">';
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_start();
|
||||
print_container_start();
|
||||
echo '<div id="resource">';
|
||||
|
||||
}
|
||||
|
@ -195,14 +191,14 @@ class resource_base {
|
|||
$blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210);
|
||||
|
||||
echo '</div>';
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_end();
|
||||
print_container_end();
|
||||
echo '</td>';
|
||||
|
||||
if((blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing())) {
|
||||
echo '<td style="width: '.$blocks_preferred_width.'px;" id="right-column">';
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_start();
|
||||
print_container_start();
|
||||
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_end();
|
||||
print_container_end();
|
||||
echo '</td>';
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue