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

Removed set_default() calls and fixed some function calls that seem to have changed

Browse source 
in blocks library.
This commit is contained in:
thepurpleblob 2005-07-07 14:10:19 +00:00
parent 10942acb38
commit 26f747277b
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
blocks/pagedemo.php
View file

@ -119,10 +119,18 @@
// minor tweaks to display the page layout! // minor tweaks to display the page layout!
// Calculate the preferred width for left, right and center (both center positions will use the same) // Calculate the preferred width for left, right and center (both center positions will use the same)
set_default($preferred_width_left, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT])); if (empty($preferred_width_left)) {
set_default($preferred_width_right, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT])); $preferred_width_left = blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]);
set_default($preferred_width_centerup, blocks_preferred_width($pageblocks[BLOCK_POS_CENTERUP])); }
set_default($preferred_width_centerdown, blocks_preferred_width($pageblocks[BLOCK_POS_CENTERDOWN])); if (empty($preferred_width_right)) {
$preferred_width_right = blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]);
}
if (empty($preferred_width_centerup)) {
$preferred_width_centerup = blocks_preferred_width($pageblocks[BLOCK_POS_CENTERUP]);
}
if (empty($preferred_width_centerdown)) {
$preferred_width_centerdown = blocks_preferred_width($pageblocks[BLOCK_POS_CENTERDOWN]);
}
$preferred_width_left = min($preferred_width_left, BLOCK_L_MAX_WIDTH); $preferred_width_left = min($preferred_width_left, BLOCK_L_MAX_WIDTH);
$preferred_width_left = max($preferred_width_left, BLOCK_L_MIN_WIDTH); $preferred_width_left = max($preferred_width_left, BLOCK_L_MIN_WIDTH);
$preferred_width_right = min($preferred_width_right, BLOCK_R_MAX_WIDTH); $preferred_width_right = min($preferred_width_right, BLOCK_R_MAX_WIDTH);
@ -153,15 +161,15 @@
// The actual display logic is here // The actual display logic is here
echo '<table style="width: 100%;"><tr>'; echo '<table style="width: 100%;"><tr>';
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) { if(blocks_have_content($pageblocks,BLOCK_POS_LEFT) || $editing) {
echo '<td style="vertical-align: top; width: '.$preferred_width_left.'px;">'; echo '<td style="vertical-align: top; width: '.$preferred_width_left.'px;">';
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]); blocks_print_group($PAGE, $pageblocks,BLOCK_POS_LEFT);
echo '</td>'; echo '</td>';
} }
echo '<td style="border: 1px black solid; width: '.$preferred_width_center.'px;"><p style="text-align: center; padding: 10px; background: black; color: white;">Center-up position:</p>'; echo '<td style="border: 1px black solid; width: '.$preferred_width_center.'px;"><p style="text-align: center; padding: 10px; background: black; color: white;">Center-up position:</p>';
if(blocks_have_content($pageblocks[BLOCK_POS_CENTERUP]) || $editing) { if(blocks_have_content($pageblocks,BLOCK_POS_CENTERUP) || $editing) {
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_CENTERUP]); blocks_print_group($PAGE, $pageblocks,BLOCK_POS_CENTERUP);
} }
echo '<div style="padding: 10px; background: gold; text-align: center;">Content Here'; echo '<div style="padding: 10px; background: gold; text-align: center;">Content Here';
@ -171,14 +179,14 @@
echo '</div>'; echo '</div>';
echo '<p style="text-align: center; padding: 10px; background: black; color: white;">Center-down position:</p>'; echo '<p style="text-align: center; padding: 10px; background: black; color: white;">Center-down position:</p>';
if(blocks_have_content($pageblocks[BLOCK_POS_CENTERDOWN]) || $editing) { if(blocks_have_content($pageblocks,BLOCK_POS_CENTERDOWN) || $editing) {
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_CENTERDOWN]); blocks_print_group($PAGE, $pageblocks,BLOCK_POS_CENTERDOWN);
} }
echo '</td>'; echo '</td>';
if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) { if(blocks_have_content($pageblocks,BLOCK_POS_RIGHT) || $editing) {
echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;">'; echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;">';
blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]); blocks_print_group($PAGE, $pageblocks,BLOCK_POS_RIGHT);
if ($editing) { if ($editing) {
blocks_print_adminblock($PAGE, $pageblocks); blocks_print_adminblock($PAGE, $pageblocks);
} }