Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 Nov 2011 00:54:26 +0000 (13:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 Nov 2011 00:54:26 +0000 (13:54 +1300)
report/backups/index.php
report/configlog/index.php
report/courseoverview/index.php
report/log/index.php
report/loglive/index.php
report/questioninstances/index.php
report/security/index.php
report/stats/index.php

index f127277..5a70587 100644 (file)
@@ -27,7 +27,7 @@ require_once('../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot.'/backup/lib.php');
 
-admin_externalpage_setup('reportbackups');
+admin_externalpage_setup('reportbackups', '', null, '', array('pagelayout'=>'report'));
 
 $table = new html_table;
 $table->head = array(
index 20fd5c6..8372727 100644 (file)
@@ -32,7 +32,7 @@ $perpage = optional_param('perpage', 30, PARAM_INT);    // how many per page
 $sort    = optional_param('sort', 'timemodified', PARAM_ALPHA);
 $dir     = optional_param('dir', 'DESC', PARAM_ALPHA);
 
-admin_externalpage_setup('reportconfiglog');
+admin_externalpage_setup('reportconfiglog', '', null, '', array('pagelayout'=>'report'));
 echo $OUTPUT->header();
 
 echo $OUTPUT->heading(get_string('configlog', 'report_configlog'));
index 04faf7c..9fe5c13 100644 (file)
@@ -39,7 +39,7 @@ if (empty($CFG->enablestats)) {
     }
 }
 
-admin_externalpage_setup('reportcourseoverview');
+admin_externalpage_setup('reportcourseoverview', '', null, '', array('pagelayout'=>'report'));
 echo $OUTPUT->header();
 
 $course = get_site();
index d7cd8f6..08434eb 100644 (file)
@@ -186,7 +186,7 @@ if (!empty($chooselog)) {
 
 } else {
     if ($hostid != $CFG->mnet_localhost_id || $course->id == SITEID) {
-        admin_externalpage_setup('reportlog');
+        admin_externalpage_setup('reportlog', '', null, '', array('pagelayout'=>'report'));
         echo $OUTPUT->header();
     } else {
         $PAGE->set_title($course->shortname .': '. $strlogs);
index ba9fc30..57ae10f 100644 (file)
@@ -72,7 +72,7 @@ if ($inpopup) {
 
 
 if ($course->id == SITEID) {
-    admin_externalpage_setup('reportloglive');
+    admin_externalpage_setup('reportloglive', '', null, '', array('pagelayout'=>'report'));
     echo $OUTPUT->header();
 
 } else {
index 0273c83..9f8a3f7 100644 (file)
@@ -31,7 +31,7 @@ require_once($CFG->libdir.'/questionlib.php');
 $requestedqtype = optional_param('qtype', '', PARAM_PLUGIN);
 
 // Print the header & check permissions.
-admin_externalpage_setup('reportquestioninstances');
+admin_externalpage_setup('reportquestioninstances', '', null, '', array('pagelayout'=>'report'));
 echo $OUTPUT->header();
 
 // Log.
index 863db1c..339ddaa 100644 (file)
@@ -45,7 +45,7 @@ raise_memory_limit(MEMORY_EXTRA);
 @set_time_limit(0);
 
 // Print the header.
-admin_externalpage_setup('reportsecurity');
+admin_externalpage_setup('reportsecurity', '', null, '', array('pagelayout'=>'report'));
 echo $OUTPUT->header();
 
 echo $OUTPUT->heading(get_string('pluginname', 'report_security'));
index 9675fdc..8238cde 100644 (file)
@@ -71,7 +71,7 @@ add_to_log($course->id, "course", "report stats", "report/stats/index.php?course
 stats_check_uptodate($course->id);
 
 if ($course->id == SITEID) {
-    admin_externalpage_setup('reportstats');
+    admin_externalpage_setup('reportstats', '', null, '', array('pagelayout'=>'report'));
     echo $OUTPUT->header();
 } else {
     $strreports = get_string("reports");