### Eclipse Workspace Patch 1.0 #P moodle19 Index: theme/oceanblue/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/oceanblue/footer.html,v retrieving revision 1.24 diff -u -r1.24 footer.html --- theme/oceanblue/footer.html 24 Aug 2007 12:45:21 -0000 1.24 +++ theme/oceanblue/footer.html 23 Nov 2007 16:19:39 -0000 @@ -1,41 +1,40 @@ + - - - Index: theme/oceanblue/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/oceanblue/header.html,v retrieving revision 1.19 diff -u -r1.19 header.html --- theme/oceanblue/header.html 24 Aug 2007 12:45:21 -0000 1.19 +++ theme/oceanblue/header.html 23 Nov 2007 16:19:39 -0000 @@ -20,16 +20,16 @@ -
+

-
+ - + @@ -42,4 +42,4 @@
-
+ Index: blog/header.php =================================================================== RCS file: /cvsroot/moodle/moodle/blog/header.php,v retrieving revision 1.41.2.1 diff -u -r1.41.2.1 header.php --- blog/header.php 11 Oct 2007 08:12:46 -0000 1.41.2.1 +++ blog/header.php 23 Nov 2007 16:19:26 -0000 @@ -8,10 +8,6 @@ require_once($CFG->libdir .'/blocklib.php'); require_once($CFG->dirroot .'/course/lib.php'); -if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); -} - $blockaction = optional_param('blockaction','', PARAM_ALPHA); $instanceid = optional_param('instanceid', 0, PARAM_INT); $blockid = optional_param('blockid', 0, PARAM_INT); @@ -263,9 +259,9 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { print '' . "\n"; print '' . "\n"; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); print '' . "\n"; print '' . "\n"; } @@ -273,7 +269,7 @@ /// Start main column print '' . "\n"; print ''; -if (!empty($THEME->customcorners)) print_custom_corners_start(); +print_container_start(); ?> Index: blog/footer.php =================================================================== RCS file: /cvsroot/moodle/moodle/blog/footer.php,v retrieving revision 1.6 diff -u -r1.6 footer.php --- blog/footer.php 9 May 2007 14:47:03 -0000 1.6 +++ blog/footer.php 23 Nov 2007 16:19:26 -0000 @@ -1,7 +1,7 @@
- customcorners)) print_custom_corners_end(); ?> + '."\n"; @@ -10,10 +10,10 @@ if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { echo ''; echo ''."\n"; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); print_spacer(1, 120, true); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''."\n"; echo ''; } Index: theme/orangewhite/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/orangewhite/footer.html,v retrieving revision 1.9 diff -u -r1.9 footer.html --- theme/orangewhite/footer.html 23 Apr 2006 19:02:39 -0000 1.9 +++ theme/orangewhite/footer.html 23 Nov 2007 16:19:39 -0000 @@ -1,18 +1,18 @@ + - + print_container_end(); // content container + + print_container_start(false, '', 'footer'); - + print_container_end(); +?>
Index: theme/orangewhite/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/orangewhite/header.html,v retrieving revision 1.12 diff -u -r1.12 header.html --- theme/orangewhite/header.html 24 Aug 2007 12:45:21 -0000 1.12 +++ theme/orangewhite/header.html 23 Nov 2007 16:19:39 -0000 @@ -19,19 +19,19 @@ -
+

-
+
- + @@ -41,4 +41,4 @@ -
+ Index: theme/standardgreen/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/standardgreen/header.html,v retrieving revision 1.23 diff -u -r1.23 header.html --- theme/standardgreen/header.html 24 Aug 2007 12:45:23 -0000 1.23 +++ theme/standardgreen/header.html 23 Nov 2007 16:19:40 -0000 @@ -20,16 +20,16 @@ -
+

-
+ - + @@ -42,4 +42,4 @@
-
+ Index: theme/standardgreen/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/standardgreen/footer.html,v retrieving revision 1.12 diff -u -r1.12 footer.html --- theme/standardgreen/footer.html 4 Jan 2007 04:44:54 -0000 1.12 +++ theme/standardgreen/footer.html 23 Nov 2007 16:19:40 -0000 @@ -1,19 +1,19 @@ + + print_container_end(); // content container - + print_container_end(); +?>
Index: course/format/weeks/format.php =================================================================== RCS file: /cvsroot/moodle/moodle/course/format/weeks/format.php,v retrieving revision 1.74.2.1 diff -u -r1.74.2.1 format.php --- course/format/weeks/format.php 22 Oct 2007 06:54:40 -0000 1.74.2.1 +++ course/format/weeks/format.php 23 Nov 2007 16:19:26 -0000 @@ -3,10 +3,6 @@ // Included from "view.php" require_once($CFG->libdir.'/ajax/ajaxlib.php'); - - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } $week = optional_param('week', -1, PARAM_INT); @@ -67,9 +63,9 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } @@ -78,7 +74,7 @@ /// Start main column echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); echo skip_main_destination(); @@ -266,7 +262,7 @@ echo '
'; } - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; @@ -276,9 +272,9 @@ if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } Index: course/format/social/format.php =================================================================== RCS file: /cvsroot/moodle/moodle/course/format/social/format.php,v retrieving revision 1.41.2.1 diff -u -r1.41.2.1 format.php --- course/format/social/format.php 22 Oct 2007 06:54:41 -0000 1.41.2.1 +++ course/format/social/format.php 23 Nov 2007 16:19:26 -0000 @@ -1,10 +1,6 @@ customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } // Bounds for block widths // more flexible for theme designers taken from theme config.php @@ -32,14 +28,14 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); echo skip_main_destination(); if ($forum = forum_get_course_forum($course->id, 'social')) { print_heading_block(get_string('socialheadline')); @@ -52,15 +48,15 @@ } else { notify('Could not find or create a social forum here'); } - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; // The right column if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } Index: theme/metal/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/metal/header.html,v retrieving revision 1.12 diff -u -r1.12 header.html --- theme/metal/header.html 24 Aug 2007 12:45:20 -0000 1.12 +++ theme/metal/header.html 23 Nov 2007 16:19:39 -0000 @@ -19,16 +19,16 @@ -
+

-
+ - +
 
@@ -42,4 +42,4 @@
 
-
+ Index: theme/metal/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/metal/footer.html,v retrieving revision 1.8 diff -u -r1.8 footer.html --- theme/metal/footer.html 5 Jan 2007 19:48:58 -0000 1.8 +++ theme/metal/footer.html 23 Nov 2007 16:19:39 -0000 @@ -1,29 +1,33 @@ + + print_container_end(); // content container -
Index: mod/resource/type/ims/resource.class.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/resource.class.php,v retrieving revision 1.47.2.2 diff -u -r1.47.2.2 resource.class.php --- mod/resource/type/ims/resource.class.php 20 Nov 2007 23:43:15 -0000 1.47.2.2 +++ mod/resource/type/ims/resource.class.php 23 Nov 2007 16:19:38 -0000 @@ -482,10 +482,9 @@ /// Now, let's print the footer. It's harcoded here to save some space /// because it's impossible to use print_footer() to print NOTHING /// Added programatic support to customcorners themes. - if (!empty($THEME->customcorners)) { - print_custom_corners_end(false, 'content'); - } - echo ''; /// Close everything. + // this is hack! + print_container_end(); // container "content" started in header + echo ''; // close page div started in header /// log it. add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id); Index: mod/scorm/player.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/scorm/player.php,v retrieving revision 1.34 diff -u -r1.34 player.php --- mod/scorm/player.php 5 Jul 2007 04:55:34 -0000 1.34 +++ mod/scorm/player.php 23 Nov 2007 16:19:39 -0000 @@ -287,8 +287,7 @@ customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - print_custom_corners_end(); + print_container_end(); } ?>
 
Index: theme/standardwhite/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/standardwhite/footer.html,v retrieving revision 1.20 diff -u -r1.20 footer.html --- theme/standardwhite/footer.html 30 Jan 2007 09:33:11 -0000 1.20 +++ theme/standardwhite/footer.html 23 Nov 2007 16:19:40 -0000 @@ -1,21 +1,18 @@ + + print_container_end(); // content container - - - + - Index: theme/standardwhite/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/standardwhite/header.html,v retrieving revision 1.16 diff -u -r1.16 header.html --- theme/standardwhite/header.html 24 Aug 2007 12:45:25 -0000 1.16 +++ theme/standardwhite/header.html 23 Nov 2007 16:19:40 -0000 @@ -20,16 +20,16 @@ -
+

-
+ - + @@ -40,7 +40,7 @@
- -
 
+ -
+ Index: theme/orangewhitepda/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/orangewhitepda/header.html,v retrieving revision 1.12 diff -u -r1.12 header.html --- theme/orangewhitepda/header.html 24 Aug 2007 12:45:22 -0000 1.12 +++ theme/orangewhitepda/header.html 23 Nov 2007 16:19:40 -0000 @@ -19,19 +19,19 @@ -
+

-
+
- + @@ -41,4 +41,4 @@
-
+ Index: theme/orangewhitepda/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/orangewhitepda/footer.html,v retrieving revision 1.6 diff -u -r1.6 footer.html --- theme/orangewhitepda/footer.html 23 Apr 2006 19:02:17 -0000 1.6 +++ theme/orangewhitepda/footer.html 23 Nov 2007 16:19:39 -0000 @@ -1,18 +1,18 @@ + - + print_container_end(); // content container + + print_container_start(false, '', 'footer'); - + print_container_end(); +?>
Index: mod/quiz/view.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/quiz/view.php,v retrieving revision 1.124.2.6 diff -u -r1.124.2.6 view.php --- mod/quiz/view.php 2 Nov 2007 16:20:04 -0000 1.124.2.6 +++ mod/quiz/view.php 23 Nov 2007 16:19:38 -0000 @@ -8,10 +8,6 @@ require_once($CFG->dirroot.'/mod/quiz/locallib.php'); require_once($CFG->dirroot.'/mod/quiz/pagelib.php'); - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - $id = optional_param('id', 0, PARAM_INT); // Course Module ID, or $q = optional_param('q', 0, PARAM_INT); // quiz ID $edit = optional_param('edit', -1, PARAM_BOOL); @@ -68,14 +64,14 @@ if(!empty($CFG->showblocksonmodpages) && (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); // Print the main part of the page @@ -457,7 +453,7 @@ function finish_page($course) { global $THEME; - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; print_footer($course); exit; Index: my/index.php =================================================================== RCS file: /cvsroot/moodle/moodle/my/index.php,v retrieving revision 1.16 diff -u -r1.16 index.php --- my/index.php 10 Oct 2007 14:31:27 -0000 1.16 +++ my/index.php 23 Nov 2007 16:19:39 -0000 @@ -7,10 +7,6 @@ require_once($CFG->dirroot.'/course/lib.php'); require_once('pagelib.php'); - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - require_login(); $mymoodlestr = get_string('mymoodle','my'); @@ -54,9 +50,9 @@ if(blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } @@ -64,7 +60,7 @@ case 'middle': echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(TRUE); + print_container_start(TRUE); /// The main overview in the middle of the page @@ -96,7 +92,7 @@ echo '
...'; } - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; break; @@ -106,9 +102,9 @@ if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing()) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } break; Index: admin/stickyblocks.php =================================================================== RCS file: /cvsroot/moodle/moodle/admin/stickyblocks.php,v retrieving revision 1.18 diff -u -r1.18 stickyblocks.php --- admin/stickyblocks.php 31 Aug 2007 19:05:26 -0000 1.18 +++ admin/stickyblocks.php 23 Nov 2007 16:19:26 -0000 @@ -5,10 +5,6 @@ require_once($CFG->dirroot.'/lib/pagelib.php'); require_once($CFG->dirroot.'/lib/blocklib.php'); - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - $pt = optional_param('pt', null, PARAM_SAFEDIR); //alhanumeric and - $pagetypes = array(PAGE_MY_MOODLE => array('id' => PAGE_MY_MOODLE, @@ -58,12 +54,12 @@ echo ''; echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $blocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); } else { require_once($CFG->libdir.'/adminlib.php'); @@ -80,12 +76,12 @@ if (!empty($pt)) { - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $blocks, BLOCK_POS_RIGHT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; echo ''; print_footer(); Index: admin/settings.php =================================================================== RCS file: /cvsroot/moodle/moodle/admin/settings.php,v retrieving revision 1.40 diff -u -r1.40 settings.php --- admin/settings.php 18 Jul 2007 15:54:30 -0000 1.40 +++ admin/settings.php 23 Nov 2007 16:19:26 -0000 @@ -5,10 +5,6 @@ require_once($CFG->libdir.'/blocklib.php'); require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.php'); -if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); -} - if ($site = get_site()) { require_login(); } @@ -132,14 +128,14 @@ switch ($column) { case 'left': echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; break; case 'middle': echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); echo ''; if ($statusmsg != '') { @@ -162,15 +158,15 @@ echo ''; echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; break; case 'right': if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } break; Index: theme/formal_white/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/formal_white/footer.html,v retrieving revision 1.18 diff -u -r1.18 footer.html --- theme/formal_white/footer.html 24 Aug 2007 12:45:19 -0000 1.18 +++ theme/formal_white/footer.html 23 Nov 2007 16:19:39 -0000 @@ -1,39 +1,40 @@ + - - Index: theme/formal_white/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/formal_white/header.html,v retrieving revision 1.18 diff -u -r1.18 header.html --- theme/formal_white/header.html 24 Aug 2007 12:45:19 -0000 1.18 +++ theme/formal_white/header.html 23 Nov 2007 16:19:39 -0000 @@ -20,16 +20,16 @@ -
+

Moodle/logo.jpg' />

-
+ - + @@ -42,4 +42,4 @@
-
+ Index: index.php =================================================================== RCS file: /cvsroot/moodle/moodle/index.php,v retrieving revision 1.201.2.1 diff -u -r1.201.2.1 index.php --- index.php 22 Oct 2007 09:25:55 -0000 1.201.2.1 +++ index.php 23 Nov 2007 16:19:26 -0000 @@ -34,10 +34,6 @@ require_once($CFG->dirroot .'/course/lib.php'); require_once($CFG->dirroot .'/lib/blocklib.php'); - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - if (empty($SITE)) { redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php'); } @@ -127,16 +123,16 @@ case 'left': if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } break; case 'middle': echo ''. skip_main_destination(); - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); /// Print Section if ($SITE->numsections > 0) { @@ -253,7 +249,7 @@ echo '
'; } - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; break; @@ -261,13 +257,13 @@ // The right column if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing || $PAGE->user_allowed_editing()) { echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); if ($PAGE->user_allowed_editing()) { echo '
'.update_course_icon($SITE->id).'
'; echo '
'; } blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; } break; Index: mod/forum/view.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/forum/view.php,v retrieving revision 1.106.2.3 diff -u -r1.106.2.3 view.php --- mod/forum/view.php 16 Nov 2007 12:49:10 -0000 1.106.2.3 +++ mod/forum/view.php 23 Nov 2007 16:19:37 -0000 @@ -220,7 +220,7 @@ case 'eachuser': if (!empty($forum->intro)) { - print_custom_corners_box(format_text($forum->intro), 'generalbox', 'intro'); + print_box(format_text($forum->intro), 'generalbox', 'intro'); } echo '

'; if (forum_user_can_post_discussion($forum)) { @@ -246,7 +246,7 @@ default: if (!empty($forum->intro)) { - print_custom_corners_box(format_text($forum->intro), 'generalbox', 'intro'); + print_box(format_text($forum->intro), 'generalbox', 'intro'); } echo '
'; if (!empty($showall)) { Index: theme/cornflower/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/cornflower/footer.html,v retrieving revision 1.15 diff -u -r1.15 footer.html --- theme/cornflower/footer.html 24 Aug 2007 12:45:18 -0000 1.15 +++ theme/cornflower/footer.html 23 Nov 2007 16:19:39 -0000 @@ -1,30 +1,31 @@ + - -

-
Index: theme/cornflower/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/cornflower/header.html,v retrieving revision 1.16 diff -u -r1.16 header.html --- theme/cornflower/header.html 24 Aug 2007 12:45:18 -0000 1.16 +++ theme/cornflower/header.html 23 Nov 2007 16:19:39 -0000 @@ -20,16 +20,16 @@ -
+

[ REPLACE ME ]

-
+ -
+

[ REPLACE ME ]

-
+
-
+ Index: theme/standard/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/standard/footer.html,v retrieving revision 1.30 diff -u -r1.30 footer.html --- theme/standard/footer.html 24 Aug 2007 12:45:22 -0000 1.30 +++ theme/standard/footer.html 23 Nov 2007 16:19:40 -0000 @@ -1,39 +1,39 @@ + - - -
Index: theme/standard/header.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/standard/header.html,v retrieving revision 1.39 diff -u -r1.39 header.html --- theme/standard/header.html 24 Aug 2007 12:45:22 -0000 1.39 +++ theme/standard/header.html 23 Nov 2007 16:19:40 -0000 @@ -20,16 +20,16 @@ -
+

-
+ - + @@ -42,4 +42,4 @@
-
+ Index: theme/custom_corners/footer.html =================================================================== RCS file: /cvsroot/moodle/moodle/theme/custom_corners/footer.html,v retrieving revision 1.5.2.3 diff -u -r1.5.2.3 footer.html --- theme/custom_corners/footer.html 12 Nov 2007 11:36:57 -0000 1.5.2.3 +++ theme/custom_corners/footer.html 23 Nov 2007 16:19:39 -0000 @@ -1,44 +1,37 @@ - -
+ - -id, $useridarray)) { - echo $performanceinfo; - } + + if (!empty($performanceinfo) && isloggedin() && in_array($USER->id, $useridarray)) { + echo $performanceinfo; + } + + print_container_end(); + +} // end if inpopup - } // end if inpopup ?> -