From e524c0ed56125ecdafd24f868848b9eebffc99f7 Mon Sep 17 00:00:00 2001 From: vyshane Date: Mon, 15 Jan 2007 07:29:25 +0000 Subject: [PATCH] Fixes for MDL-7861. --- admin/report/courseoverview/index.php | 14 +++++++------- lib/adminlib.php | 9 ++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php index c32e3b0928..b0721e936f 100644 --- a/admin/report/courseoverview/index.php +++ b/admin/report/courseoverview/index.php @@ -46,13 +46,13 @@ $timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth); if (empty($timeoptions)) { - error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id); + error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id, $adminroot); } echo '
'."\n"; + echo '
'; $table->width = '*'; - $table->align = array('left','left','left','left','left','left'); $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true), get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true), @@ -60,6 +60,7 @@ '') ; print_table($table); + echo '
'; echo '
'; if (!empty($report) && !empty($time)) { @@ -79,13 +80,13 @@ $courses = get_records_sql($sql, 0, $numcourses); if (empty($courses)) { - notify(get_string('statsnodata')); + notify(get_string('statsnodata'));echo '';echo '

after notify

'; } else { if (empty($CFG->gdversion)) { - echo '
(' . get_string("gdneed") .')
'; + echo '
(' . get_string("gdneed") .')
'; } else { - echo '
'.get_string('courseoverviewgraph').'
'; + echo '
'.get_string('courseoverviewgraph').'
'; } $table = new StdClass; @@ -114,7 +115,6 @@ print_table($table); } } - admin_externalpage_print_footer($adminroot); -?> +?> \ No newline at end of file diff --git a/lib/adminlib.php b/lib/adminlib.php index fbacaffd47..767f7e04d3 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -2596,9 +2596,9 @@ function admin_externalpage_print_header($adminroot) { if (!empty($SITE->fullname)) { $pageblocks = blocks_setup($PAGE); - $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); - $PAGE->print_header(); echo ''; echo ''; echo '
'; @@ -2608,7 +2608,6 @@ function admin_externalpage_print_header($adminroot) { } else { print_header(); } - } function admin_externalpage_print_footer($adminroot) { @@ -2617,14 +2616,14 @@ function admin_externalpage_print_footer($adminroot) { if (!empty($SITE->fullname)) { $pageblocks = blocks_setup($PAGE); - $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), + $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, + blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), BLOCK_R_MAX_WIDTH); echo ''; blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); echo '
'; } - print_footer(); } -- 2.39.5