Permalink
Browse files

'deleted old block width definition'

  • Loading branch information...
urs_hunkler
urs_hunkler committed Feb 6, 2007
1 parent 7969038 commit 689456eb159f31bf4d89b571c8176ece148d27d9
@@ -6,12 +6,6 @@
$module = $course->format;
require_once($CFG->dirroot.'/mod/'.$module.'/locallib.php');
- // Bounds for block widths
- // define('BLOCK_L_MIN_WIDTH', 100);
- // define('BLOCK_L_MAX_WIDTH', 210);
- // define('BLOCK_R_MIN_WIDTH', 100);
- // define('BLOCK_R_MAX_WIDTH', 210);
-
// Bounds for block widths
// more flexible for theme designers taken from theme config.php
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
@@ -4,12 +4,6 @@
require_once($CFG->dirroot.'/mod/forum/lib.php');
- // Bounds for block widths
- // define('BLOCK_L_MIN_WIDTH', 100);
- // define('BLOCK_L_MAX_WIDTH', 210);
- // define('BLOCK_R_MIN_WIDTH', 100);
- // define('BLOCK_R_MAX_WIDTH', 210);
-
// Bounds for block widths
// more flexible for theme designers taken from theme config.php
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
@@ -13,12 +13,17 @@
$topic = optional_param('topic', -1, PARAM_INT);
-
// Bounds for block widths
- define('BLOCK_L_MIN_WIDTH', 100);
- define('BLOCK_L_MAX_WIDTH', 210);
- define('BLOCK_R_MIN_WIDTH', 100);
- define('BLOCK_R_MAX_WIDTH', 210);
+ // more flexible for theme designers taken from theme config.php
+ $lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
+ $lmax = (empty($THEME->block_l_max_width)) ? 210 : $THEME->block_l_max_width;
+ $rmin = (empty($THEME->block_r_min_width)) ? 100 : $THEME->block_r_min_width;
+ $rmax = (empty($THEME->block_r_max_width)) ? 210 : $THEME->block_r_max_width;
+
+ define('BLOCK_L_MIN_WIDTH', $lmin);
+ define('BLOCK_L_MAX_WIDTH', $lmax);
+ define('BLOCK_R_MIN_WIDTH', $rmin);
+ define('BLOCK_R_MAX_WIDTH', $rmax);
$preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
BLOCK_L_MAX_WIDTH);
@@ -7,12 +7,6 @@
$week = optional_param('week', -1, PARAM_INT);
- // Bounds for block widths
- // define('BLOCK_L_MIN_WIDTH', 100);
- // define('BLOCK_L_MAX_WIDTH', 210);
- // define('BLOCK_R_MIN_WIDTH', 100);
- // define('BLOCK_R_MAX_WIDTH', 210);
-
// Bounds for block widths
// more flexible for theme designers taken from theme config.php
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
View
@@ -30,11 +30,17 @@
die;
}
-/// Bounds for block widths on this page
- define('BLOCK_L_MIN_WIDTH', 160);
- define('BLOCK_L_MAX_WIDTH', 210);
- define('BLOCK_R_MIN_WIDTH', 160);
- define('BLOCK_R_MAX_WIDTH', 210);
+ // Bounds for block widths
+ // more flexible for theme designers taken from theme config.php
+ $lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
+ $lmax = (empty($THEME->block_l_max_width)) ? 210 : $THEME->block_l_max_width;
+ $rmin = (empty($THEME->block_r_min_width)) ? 100 : $THEME->block_r_min_width;
+ $rmax = (empty($THEME->block_r_max_width)) ? 210 : $THEME->block_r_max_width;
+
+ define('BLOCK_L_MIN_WIDTH', $lmin);
+ define('BLOCK_L_MAX_WIDTH', $lmax);
+ define('BLOCK_R_MIN_WIDTH', $rmin);
+ define('BLOCK_R_MAX_WIDTH', $rmax);
require_once('config.php');
require_once($CFG->dirroot .'/course/lib.php');

0 comments on commit 689456e

Please sign in to comment.