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

MDL-12221 custom themes revisited - implemented container concept; merged from MOODLE_19_STABLE

Browse source
This commit is contained in:
skodak 2007-11-23 16:49:51 +00:00
parent 220f149cfc
commit 9f7f1a74a0
48 changed files with 653 additions and 732 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/adminlib.php
View file

@ -2950,10 +2950,6 @@ function admin_externalpage_print_header() {
global $CFG, $PAGE, $SITE, $THEME;
if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
}
define('ADMIN_EXT_HEADER_PRINTED', 'true');
if (!empty($SITE->fullname)) {
@ -2962,6 +2958,10 @@ function admin_externalpage_print_header() {
$preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH,
blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
BLOCK_L_MAX_WIDTH);
$preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH,
blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
BLOCK_R_MAX_WIDTH);
$PAGE->print_header();
echo '<table id="layout-table" summary=""><tr>';
@ -2974,23 +2974,23 @@ function admin_externalpage_print_header() {
switch ($column) {
case 'left':
echo '<td style="width: ' . $preferred_width_left . '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>';
break;
case 'middle':
echo '<td id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(true);
print_container_start(true);
break;
case 'right':
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
echo '<td style="width: ' . $preferred_width_right . '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>';
}
break;
@ -3005,14 +3005,13 @@ function admin_externalpage_print_footer() {
global $CFG, $PAGE, $SITE, $THEME;
if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
}
define('ADMIN_EXT_FOOTER_PRINTED', 'true');
if (!empty($SITE->fullname)) {
$pageblocks = blocks_setup($PAGE);
$preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH,
blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
BLOCK_L_MAX_WIDTH);
$preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH,
blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
BLOCK_R_MAX_WIDTH);
@ -3029,24 +3028,24 @@ function admin_externalpage_print_footer() {
switch ($column) {
case 'left':
echo '<td style="width: ' . $preferred_width_left . '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>';
break;
case 'middle':
if (!empty($THEME->customcorners)) print_custom_corners_end();
print_container_end();
echo '</td>';
break;
case 'right':
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
echo '<td style="width: ' . $preferred_width_right . '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>';
}
break;