mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
'deleted old block width definition'
This commit is contained in:
parent
796903809e
commit
689456eb15
5 changed files with 21 additions and 28 deletions
|
@ -6,12 +6,6 @@
|
||||||
$module = $course->format;
|
$module = $course->format;
|
||||||
require_once($CFG->dirroot.'/mod/'.$module.'/locallib.php');
|
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
|
// Bounds for block widths
|
||||||
// more flexible for theme designers taken from theme config.php
|
// more flexible for theme designers taken from theme config.php
|
||||||
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
|
$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');
|
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
|
// Bounds for block widths
|
||||||
// more flexible for theme designers taken from theme config.php
|
// more flexible for theme designers taken from theme config.php
|
||||||
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
|
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
|
||||||
|
|
|
@ -13,12 +13,17 @@
|
||||||
|
|
||||||
$topic = optional_param('topic', -1, PARAM_INT);
|
$topic = optional_param('topic', -1, PARAM_INT);
|
||||||
|
|
||||||
|
|
||||||
// Bounds for block widths
|
// Bounds for block widths
|
||||||
define('BLOCK_L_MIN_WIDTH', 100);
|
// more flexible for theme designers taken from theme config.php
|
||||||
define('BLOCK_L_MAX_WIDTH', 210);
|
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
|
||||||
define('BLOCK_R_MIN_WIDTH', 100);
|
$lmax = (empty($THEME->block_l_max_width)) ? 210 : $THEME->block_l_max_width;
|
||||||
define('BLOCK_R_MAX_WIDTH', 210);
|
$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]),
|
$preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
|
||||||
BLOCK_L_MAX_WIDTH);
|
BLOCK_L_MAX_WIDTH);
|
||||||
|
|
|
@ -7,12 +7,6 @@
|
||||||
|
|
||||||
$week = optional_param('week', -1, PARAM_INT);
|
$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
|
// Bounds for block widths
|
||||||
// more flexible for theme designers taken from theme config.php
|
// more flexible for theme designers taken from theme config.php
|
||||||
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
|
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
|
||||||
|
|
16
index.php
16
index.php
|
@ -30,11 +30,17 @@
|
||||||
die;
|
die;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Bounds for block widths on this page
|
// Bounds for block widths
|
||||||
define('BLOCK_L_MIN_WIDTH', 160);
|
// more flexible for theme designers taken from theme config.php
|
||||||
define('BLOCK_L_MAX_WIDTH', 210);
|
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
|
||||||
define('BLOCK_R_MIN_WIDTH', 160);
|
$lmax = (empty($THEME->block_l_max_width)) ? 210 : $THEME->block_l_max_width;
|
||||||
define('BLOCK_R_MAX_WIDTH', 210);
|
$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('config.php');
|
||||||
require_once($CFG->dirroot .'/course/lib.php');
|
require_once($CFG->dirroot .'/course/lib.php');
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue