From d6756ebbbca002f1dd40611b4896862bae94486c Mon Sep 17 00:00:00 2001 From: skodak Date: Fri, 23 Nov 2007 16:41:13 +0000 Subject: [PATCH] MDL-12221 custom themes revisited - implemented container concept --- admin/settings.php | 16 +- admin/stickyblocks.php | 16 +- blog/footer.php | 6 +- blog/header.php | 10 +- course/format/social/format.php | 16 +- course/format/topics/format.php | 16 +- course/format/weeks/format.php | 16 +- index.php | 16 +- lib/adminlib.php | 35 ++-- lib/custom_corners_lib.php | 91 ----------- lib/weblib.php | 194 ++++++++++++++++------- message/user.php | 8 +- mod/chat/view.php | 14 +- mod/data/view.php | 19 +-- mod/forum/view.php | 4 +- mod/quiz/view.php | 12 +- mod/resource/lib.php | 16 +- mod/resource/type/ims/resource.class.php | 7 +- mod/scorm/player.php | 3 +- my/index.php | 16 +- theme/cornflower/footer.html | 31 ++-- theme/cornflower/header.html | 10 +- theme/custom_corners/footer.html | 55 +++---- theme/custom_corners/header.html | 35 ++-- theme/formal_white/footer.html | 37 ++--- theme/formal_white/header.html | 10 +- theme/metal/footer.html | 34 ++-- theme/metal/header.html | 10 +- theme/oceanblue/footer.html | 37 +++-- theme/oceanblue/header.html | 10 +- theme/orangewhite/footer.html | 20 +-- theme/orangewhite/header.html | 10 +- theme/orangewhitepda/footer.html | 20 +-- theme/orangewhitepda/header.html | 10 +- theme/standard/footer.html | 34 ++-- theme/standard/header.html | 10 +- theme/standardblue/footer.html | 22 +-- theme/standardblue/header.html | 10 +- theme/standardgreen/footer.html | 22 +-- theme/standardgreen/header.html | 10 +- theme/standardlogo/footer.html | 22 +-- theme/standardlogo/header.html | 10 +- theme/standardred/footer.html | 22 +-- theme/standardred/header.html | 10 +- theme/standardwhite/footer.html | 27 ++-- theme/standardwhite/header.html | 14 +- theme/wood/footer.html | 27 ++-- theme/wood/header.html | 10 +- 48 files changed, 513 insertions(+), 597 deletions(-) delete mode 100755 lib/custom_corners_lib.php diff --git a/admin/settings.php b/admin/settings.php index ad25c9c1c50..8837ddb2087 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -5,10 +5,6 @@ require_once($CFG->libdir.'/adminlib.php'); 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 @@ if (!empty($SITE->fullname)) { 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 @@ if (!empty($SITE->fullname)) { 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; diff --git a/admin/stickyblocks.php b/admin/stickyblocks.php index 45e438e337d..9c6103e8bb6 100644 --- a/admin/stickyblocks.php +++ b/admin/stickyblocks.php @@ -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(); diff --git a/blog/footer.php b/blog/footer.php index 7eca8a2cb51..d01553e1a95 100644 --- a/blog/footer.php +++ b/blog/footer.php @@ -1,7 +1,7 @@ - customcorners)) print_custom_corners_end(); ?> + '."\n"; @@ -10,10 +10,10 @@ print ''."\n"; 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 ''; } diff --git a/blog/header.php b/blog/header.php index cec97b25b06..b30410e49b1 100755 --- a/blog/header.php +++ b/blog/header.php @@ -8,10 +8,6 @@ require_once($CFG->dirroot .'/blog/blogpage.php'); 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 @@ print '' . "\n"; 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 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { /// Start main column print '' . "\n"; print ''; -if (!empty($THEME->customcorners)) print_custom_corners_start(); +print_container_start(); ?> diff --git a/course/format/social/format.php b/course/format/social/format.php index bebc79d5999..a12a6f8b992 100644 --- a/course/format/social/format.php +++ b/course/format/social/format.php @@ -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 ''; } echo ''; // The right column if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { echo ''; } diff --git a/course/format/topics/format.php b/course/format/topics/format.php index 4bba4c20aa6..0a0b59adef4 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -8,10 +8,6 @@ require_once($CFG->libdir.'/ajax/ajaxlib.php'); - - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } $topic = optional_param('topic', -1, PARAM_INT); @@ -82,9 +78,9 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { echo ''; } @@ -92,7 +88,7 @@ case 'middle': /// Start main column echo ''; break; @@ -284,9 +280,9 @@ // The right column if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { echo ''; } diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php index 48b64a64246..e7d267dcb91 100644 --- a/course/format/weeks/format.php +++ b/course/format/weeks/format.php @@ -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 ''; } @@ -78,7 +74,7 @@ /// Start main column echo ''; @@ -276,9 +272,9 @@ if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { echo ''; } diff --git a/index.php b/index.php index 581b596103b..43cc1041fcd 100644 --- a/index.php +++ b/index.php @@ -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 ''; } break; case 'middle': echo ''; break; @@ -261,13 +257,13 @@ // The right column if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing || $PAGE->user_allowed_editing()) { echo ''; } break; diff --git a/lib/adminlib.php b/lib/adminlib.php index 39fc53507f6..360228d37be 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -2950,10 +2950,6 @@ function admin_externalpage_print_header() { global $CFG, $PAGE, $SITE, $THEME; - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - define('ADMIN_EXT_HEADER_PRINTED', 'true'); if (!empty($SITE->fullname)) { @@ -2962,6 +2958,10 @@ function admin_externalpage_print_header() { $preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), BLOCK_L_MAX_WIDTH); + $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, + blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), + BLOCK_R_MAX_WIDTH); + $PAGE->print_header(); 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 ''; - 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 ''; - 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 ''; - 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 ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); echo skip_main_destination(); print_heading_block(get_string('topicoutline'), 'outline'); @@ -276,7 +272,7 @@ echo ''; } - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); 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 ''; - 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 ''; - 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 ''; - 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 ''; - 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 ''. 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 '		'; - 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 '
'; @@ -2974,23 +2974,23 @@ function admin_externalpage_print_header() { switch ($column) { case 'left': echo ''; break; case 'middle': echo ''; } break; @@ -3005,14 +3005,13 @@ function admin_externalpage_print_footer() { global $CFG, $PAGE, $SITE, $THEME; - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - define('ADMIN_EXT_FOOTER_PRINTED', 'true'); if (!empty($SITE->fullname)) { $pageblocks = blocks_setup($PAGE); + $preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH, + blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), + BLOCK_L_MAX_WIDTH); $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), BLOCK_R_MAX_WIDTH); @@ -3029,24 +3028,24 @@ function admin_externalpage_print_footer() { switch ($column) { case 'left': echo ''; break; case 'middle': - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; break; case 'right': if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) { echo ''; } break; diff --git a/lib/custom_corners_lib.php b/lib/custom_corners_lib.php deleted file mode 100755 index ccd4a507722..00000000000 --- a/lib/custom_corners_lib.php +++ /dev/null @@ -1,91 +0,0 @@ -'."\n"; - $output .= '
 
'; - $output .= "\n"; - $output .= '
'; - $output .= (!empty($clearfix)) ? '
' : '
'; - - if (!isset($THEME->customcornersopen)) { - $THEME->customcornersopen = 0; - } - $THEME->customcornersopen += 1; - - if ($return) { - return $output; - } else { - echo $output; - } -} - - -/** - * Ending part of the surrounding divs for custom corners - * - * @param boolean $return, return as string or just print it - * @param mixed $idbase, optionally, define one idbase to be added to all the elements in the corners - */ -function print_custom_corners_end($return=false, $idbase=null) { - global $THEME; - - if ($THEME->customcornersopen <= 0) { - return ''; - } - - $THEME->customcornersopen -= ($THEME->customcornersopen > 0) ? 1 : 0; - -/// Analise if we want ids for the custom corner elements - $idbb = ''; - - if ($idbase) { - $idbb = 'id="' . $idbase . '-bb" '; - } - -/// Output begins - $output = '
'; - $output .= "\n"; - $output .= '
 
'."\n"; - $output .= '
'; - - - if ($return) { - return $output; - } else { - echo $output; - } -} - -?> diff --git a/lib/weblib.php b/lib/weblib.php index 826fda7f44c..849c5a21abe 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -2809,14 +2809,6 @@ function print_footer($course=NULL, $usercourse=NULL, $return=false) { } } -/// Close eventually open custom_corner divs - if ((!empty($THEME->customcorners)) && ($THEME->customcornersopen > 1)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - while ($THEME->customcornersopen > 1) { - print_custom_corners_end(); - } - } - /// Include the actual footer file ob_start(); @@ -3825,21 +3817,16 @@ function print_box($message, $classes='generalbox', $ids='', $return=false) { * @param boolean $return, return as string or just print it */ function print_box_start($classes='generalbox', $ids='', $return=false) { - $output = ''; + global $THEME; - if ($ids) { - $ids = ' id="'.$ids.'"'; - } - - $output .= ''; - - if ($return) { - return $output; + if (!empty($THEME->customcorners)) { + $classes .= ' ccbox box'; } else { - echo $output; + $classes .= ' box'; } -} + return print_container_start(false, $classes, $ids, $return); +} /** * Simple function to end a box (see above) @@ -3848,28 +3835,22 @@ function print_box_start($classes='generalbox', $ids='', $return=false) { * @param boolean $return, return as string or just print it */ function print_box_end($return=false) { - $output = ''; - if ($return) { - return $output; - } else { - echo $output; - } + return print_container_end($return); } - /** - * Function adds custom_corners to boxes + * Print a message in a standard themed container. * - * @param string $message, the content of the box + * @param string $message, the content of the container * @param string $classes, space-separated class names. * @param string $ids, space-separated id names. * @param boolean $return, return as string or just print it */ -function print_custom_corners_box($message, $classes='generalbox', $ids='', $return=false) { +function print_container($message, $clearfix=false, $classes='', $idbase='', $return=false) { - $output = print_custom_corners_box_start($classes, $ids, true); + $output = print_container_start($clearfix, $classes, $idbase, true); $output .= stripslashes_safe($message); - $output .= print_custom_corners_box_end(true); + $output .= print_container_end(true); if ($return) { return $output; @@ -3878,24 +3859,41 @@ function print_custom_corners_box($message, $classes='generalbox', $ids='', $ret } } - /** - * Function adds custom_corners to boxes - * Calls print_box_start + * Starts a container using divs * * @param string $classes, space-separated class names. * @param string $ids, space-separated id names. * @param boolean $return, return as string or just print it */ -function print_custom_corners_box_start($classes='generalbox', $ids='', $return=false) { - global $CFG, $THEME; +function print_container_start($clearfix=false, $classes='', $idbase='', $return=false) { + global $THEME; + + if (!isset($THEME->open_containers)) { + $THEME->open_containers = array(); + } + $THEME->open_containers[] = $idbase; - $output = print_box_start('ccbox '.$classes, $ids, true); if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - - $output .= print_custom_corners_start(true, true); + $output = _print_custom_corners_start($clearfix, $classes, $idbase); + } else { + if ($idbase) { + $id = ' id="'.$idbase.'"'; + } else { + $id = ''; + } + if ($clearfix) { + $clearfix = ' clearfix'; + } else { + $clearfix = ''; + } + if ($classes or $clearfix) { + $class = ' class="'.$classes.$clearfix.'"'; + } else { + $class = ''; + } + $output = ''; } if ($return) { @@ -3905,26 +3903,47 @@ function print_custom_corners_box_start($classes='generalbox', $ids='', $return= } } - /** - * Function adds custom_corners to boxes - * Calls print_box_end - * + * Simple function to end a container (see above) * @param boolean $return, return as string or just print it */ -function print_custom_corners_box_end($return=false) { - global $CFG, $THEME; +function print_container_end($return=false) { + global $THEME; + + if (empty($THEME->open_containers)) { + debugging('Incorrect closing of custom corners - no more open containers'); + $idbase = ''; + } else { + $idbase = array_pop($THEME->open_containers); + } + + if (!empty($THEME->customcorners)) { + $output = _print_custom_corners_end($idbase); + } else { + $output = ''; + } + + if ($return) { + return $output; + } else { + echo $output; + } +} + +/** + * Force closing of all open containers except the main content one. + * @param boolean $return, return as string or just print it + */ +function print_container_end_all($return=false) { + global $THEME; $output = ''; - - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - - $output .= print_custom_corners_end(true); + if (!empty($THEME->open_containers)) { + while(count($THEME->open_containers) > 1) { // the last one is the 'content' container + $output .= print_container_end($return); + } } - $output .= print_box_end(true);; - if ($return) { return $output; } else { @@ -3932,6 +3951,61 @@ function print_custom_corners_box_end($return=false) { } } +/** + * Internal function - do not use directly! + * Starting part of the surrounding divs for custom corners + * + * @param boolean $clearfix, add CLASS "clearfix" to the inner div against collapsing + * @param mixed $idbase, optionally, define one idbase to be added to all the elements in the corners + */ +function _print_custom_corners_start($clearfix=false, $classes='', $idbase='') { +/// Analise if we want ids for the custom corner elements + $id = ''; + $idbt = ''; + $idi1 = ''; + $idi2 = ''; + $idi3 = ''; + + if ($idbase) { + $id = 'id="'.$idbase.'" '; + $idbt = 'id="'.$idbase.'-bt" '; + $idi1 = 'id="'.$idbase.'-i1" '; + $idi2 = 'id="'.$idbase.'-i2" '; + $idi3 = 'id="'.$idbase.'-i3" '; + } + +/// Output begins + $output = '
'."\n"; + $output .= '
 
'; + $output .= "\n"; + $output .= '
'; + $output .= (!empty($clearfix)) ? '
' : '
'; + + return $output; +} + + +/** + * Internal function - do not use directly! + * Ending part of the surrounding divs for custom corners + */ +function _print_custom_corners_end($idbase) { +/// Analise if we want ids for the custom corner elements + $idbb = ''; + + if ($idbase) { + $idbb = 'id="' . $idbase . '-bb" '; + } + +/// Output begins + $output = '
'; + $output .= "\n"; + $output .= '
 
'."\n"; + $output .= '
'; + + return $output; +} + /** * Print a self contained form with a single submit button. @@ -5537,6 +5611,8 @@ function error ($message, $link='') { //header not yet printed @header('HTTP/1.0 404 Not Found'); print_header(get_string('error')); + } else { + print_container_end_all(); } echo '
'; @@ -5791,6 +5867,8 @@ function editorshortcutshelpbutton() { function notice ($message, $link='', $course=NULL) { global $CFG, $SITE; + print_container_end_all(); + $message = clean_text($message); print_box($message, 'generalbox', 'notice'); @@ -5929,6 +6007,8 @@ function redirect($url, $message='', $delay=-1) { // this type of redirect might not be working in some browsers - such as lynx :-( print_header('', '', '', '', $errorprinted ? '' : ('')); $delay += 3; // double redirect prevention, it was sometimes breaking upgrades before 1.7 + } else { + print_container_end_all(); } echo '
'; echo '
'. $message .'
'; @@ -6232,10 +6312,6 @@ function print_side_block_start($heading='', $attributes = array()) { global $CFG, $THEME; - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - // If there are no special attributes, give a default CSS class if (empty($attributes) || !is_array($attributes)) { $attributes = array('class' => 'sideblock'); @@ -6293,7 +6369,6 @@ function print_side_block_start($heading='', $attributes = array()) { if (!empty($THEME->customcorners)) { echo '
'; echo '
'; - $THEME->customcornersopen += 1; } echo '
'; @@ -6309,8 +6384,7 @@ function print_side_block_end($attributes = array()) { echo '
'; if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - print_custom_corners_end(); + echo '
 
'; } echo '
'; diff --git a/message/user.php b/message/user.php index 90a93e8494e..6c54652e4c4 100644 --- a/message/user.php +++ b/message/user.php @@ -87,10 +87,8 @@ 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 ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(true); + print_container_start(true); 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 ''; - 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 ''; - 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 '
'; - if (!empty($THEME->customcorners)) { - print_custom_corners_end(false, 'content'); - } - - echo ''; // Close possible theme tables off + // this is hack! + print_container_end(); // container "content" started in header + echo ''; // close page div started in header ?> diff --git a/mod/chat/view.php b/mod/chat/view.php index ea2e9faaeb0..b8e8d51fab7 100644 --- a/mod/chat/view.php +++ b/mod/chat/view.php @@ -7,10 +7,6 @@ require_once($CFG->libdir.'/blocklib.php'); require_once('pagelib.php'); - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - $id = optional_param('id', 0, PARAM_INT); $c = optional_param('c', 0, PARAM_INT); $edit = optional_param('edit', -1, PARAM_BOOL); @@ -79,9 +75,9 @@ 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 ''; } break; @@ -89,7 +85,7 @@ case 'middle': echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); /// Check to see if groups are being used here $groupmode = groups_get_activity_groupmode($cm); @@ -193,9 +189,7 @@ print_simple_box_end(); } - if (!empty($THEME->customcorners)) { - print_custom_corners_end(); - } + print_container_end(); echo ''; break; diff --git a/mod/data/view.php b/mod/data/view.php index 9e11581832e..5b9d1a0ea14 100755 --- a/mod/data/view.php +++ b/mod/data/view.php @@ -28,12 +28,7 @@ require_once("$CFG->libdir/rsslib.php"); require_once('pagelib.php'); - - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - } - - + /// One of these is necessary! $id = optional_param('id', 0, PARAM_INT); // course module id $d = optional_param('d', 0, PARAM_INT); // database id @@ -244,13 +239,13 @@ echo ''; if ((blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) { echo ''; } echo ''; // Middle column if ((blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing())) { echo ''; } 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 ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); } /// Check to see if groups are being used here @@ -554,13 +549,13 @@ /// If we have blocks, then print the left side here if (!empty($CFG->showblocksonmodpages)) { - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); 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 '
'; diff --git a/mod/forum/view.php b/mod/forum/view.php index 6b6eef985e3..751ecc5dccc 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -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)) { diff --git a/mod/quiz/view.php b/mod/quiz/view.php index 2f4e0984360..a2dfe307036 100644 --- a/mod/quiz/view.php +++ b/mod/quiz/view.php @@ -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; diff --git a/mod/resource/lib.php b/mod/resource/lib.php index 9b0187e32ac..080f3ea5288 100644 --- a/mod/resource/lib.php +++ b/mod/resource/lib.php @@ -66,10 +66,6 @@ foreach ($RESOURCE_WINDOW_OPTIONS as $popupoption) { } } -if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); -} - /** * resource_base is the base class for resource types * @@ -170,14 +166,14 @@ class resource_base { 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 ''; } echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); echo '

'; } @@ -195,14 +191,14 @@ class resource_base { $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210); echo '
'; - if (!empty($THEME->customcorners)) print_custom_corners_end(); + print_container_end(); echo ''; 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 ''; } diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php index 77a30113039..664b5d591c9 100644 --- a/mod/resource/type/ims/resource.class.php +++ b/mod/resource/type/ims/resource.class.php @@ -482,10 +482,9 @@ class resource_ims extends resource_base { /// 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); diff --git a/mod/scorm/player.php b/mod/scorm/player.php index 66a8be8caaf..d6ca13d317f 100755 --- a/mod/scorm/player.php +++ b/mod/scorm/player.php @@ -287,8 +287,7 @@ customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - print_custom_corners_end(); + print_container_end(); } ?>
 
diff --git a/my/index.php b/my/index.php index 151e230b9b7..9547558ccf3 100644 --- a/my/index.php +++ b/my/index.php @@ -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; diff --git a/theme/cornflower/footer.html b/theme/cornflower/footer.html index 2c83e78cfac..a7fea6e95c5 100644 --- a/theme/cornflower/footer.html +++ b/theme/cornflower/footer.html @@ -1,30 +1,31 @@ - - - - - diff --git a/theme/cornflower/header.html b/theme/cornflower/header.html index ed62f59f8a4..d67804131a6 100644 --- a/theme/cornflower/header.html +++ b/theme/cornflower/header.html @@ -20,16 +20,16 @@ -
+

[ REPLACE ME ]

-
+ -
+

[ REPLACE ME ]

-
+
-
+ diff --git a/theme/custom_corners/footer.html b/theme/custom_corners/footer.html index d7ad6c16435..5fc82ffaa42 100644 --- a/theme/custom_corners/footer.html +++ b/theme/custom_corners/footer.html @@ -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 ?> -