From 9f7f1a74a0630dead6f9e5671c11088c6b52c66c Mon Sep 17 00:00:00 2001 From: skodak Date: Fri, 23 Nov 2007 16:49:51 +0000 Subject: [PATCH] MDL-12221 custom themes revisited - implemented container concept; merged from MOODLE_19_STABLE --- 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 | 278 +++++++++++------------ course/format/weeks/format.php | 15 +- index.php | 16 +- lib/adminlib.php | 35 ++- lib/custom_corners_lib.php | 91 -------- lib/weblib.php | 188 ++++++++++----- 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 | 29 +-- theme/cornflower/header.html | 10 +- theme/custom_corners/footer.html | 55 ++--- theme/custom_corners/header.html | 35 ++- theme/formal_white/footer.html | 35 +-- theme/formal_white/header.html | 10 +- theme/metal/footer.html | 30 +-- theme/metal/header.html | 10 +- theme/oceanblue/footer.html | 35 ++- theme/oceanblue/header.html | 10 +- theme/orangewhite/footer.html | 16 +- theme/orangewhite/header.html | 10 +- theme/orangewhitepda/footer.html | 16 +- theme/orangewhitepda/header.html | 10 +- theme/standard/footer.html | 32 +-- theme/standard/header.html | 10 +- theme/standardblue/footer.html | 16 +- theme/standardblue/header.html | 10 +- theme/standardgreen/footer.html | 16 +- theme/standardgreen/header.html | 10 +- theme/standardlogo/footer.html | 16 +- theme/standardlogo/header.html | 10 +- theme/standardred/footer.html | 16 +- theme/standardred/header.html | 10 +- theme/standardwhite/footer.html | 23 +- theme/standardwhite/header.html | 14 +- theme/wood/footer.html | 21 +- theme/wood/header.html | 10 +- 48 files changed, 616 insertions(+), 695 deletions(-) delete mode 100755 lib/custom_corners_lib.php diff --git a/admin/settings.php b/admin/settings.php index ad25c9c1c5..8837ddb208 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 45e438e337..9c6103e8bb 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 7eca8a2cb5..d01553e1a9 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 cec97b25b0..b30410e49b 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 bebc79d599..a12a6f8b99 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 4bba4c20aa..bd8bfeb77b 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -1,41 +1,38 @@ and '; } 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 39fc53507f..360228d37b 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 ' with DIVs; inline styles. + * 3. Reorder columns so that in linear view content is first then blocks; + * styles to maintain original graphical (side by side) view. + * + * Target: 3-column graphical view using relative widths for pixel screen sizes + * 800x600, 1024x768... on IE6, Firefox. Below 800 columns will shift downwards. + * + * http://www.maxdesign.com.au/presentation/em/ Ideal length for content. + * http://www.svendtofte.com/code/max_width_in_ie/ Max width in IE. + * + * @copyright © 2006 The Open University + * @author N.D.Freear@open.ac.uk, and others. + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License + * @package + */ +//TODO (nfreear): Accessibility: evaluation, lang/en_utf8/moodle.php: $string['formattopicscss'] 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); - - // Bounds for block widths - // more flexible for theme designers taken from theme config.php - $lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width; - $lmax = (empty($THEME->block_l_max_width)) ? 210 : $THEME->block_l_max_width; - $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]), - BLOCK_L_MAX_WIDTH); - $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), - BLOCK_R_MAX_WIDTH); + $topic = optional_param('topic', -1, PARAM_INT); if ($topic != -1) { $displaysection = course_set_display($course->id, $topic); } else { - if (isset($USER->display[$course->id])) { // for admins, mostly + if (isset($USER->display[$course->id])) { $displaysection = $USER->display[$course->id]; } else { $displaysection = course_set_display($course->id, 0); @@ -45,81 +42,97 @@ $context = get_context_instance(CONTEXT_COURSE, $course->id); if (($marker >=0) && has_capability('moodle/course:setcurrentsection', $context) && confirm_sesskey()) { - $course->marker = $marker; - if (! set_field("course", "marker", $marker, "id", $course->id)) { - error("Could not mark that topic for this course"); - } + $course->marker = $marker; + if (! set_field("course", "marker", $marker, "id", $course->id)) { + error("Could not mark that topic for this course"); + } } - $streditsummary = get_string('editsummary'); - $stradd = get_string('add'); - $stractivities = get_string('activities'); + $streditsummary = get_string('editsummary'); + $stradd = get_string('add'); + $stractivities = get_string('activities'); $strshowalltopics = get_string('showalltopics'); $strtopic = get_string('topic'); - $strgroups = get_string('groups'); - $strgroupmy = get_string('groupmy'); - $editing = $PAGE->user_is_editing(); + $strgroups = get_string('groups'); + $strgroupmy = get_string('groupmy'); + $editing = $PAGE->user_is_editing(); if ($editing) { $strstudents = moodle_strtolower($course->students); $strtopichide = get_string('topichide', '', $strstudents); $strtopicshow = get_string('topicshow', '', $strstudents); - $strmarkthistopic = get_string('markthistopic'); - $strmarkedthistopic = get_string('markedthistopic'); - $strmoveup = get_string('moveup'); + $strmarkthistopic = get_string('markthistopic'); + $strmarkedthistopic = get_string('markedthistopic'); + $strmoveup = get_string('moveup'); $strmovedown = get_string('movedown'); } +/* Internet Explorer min-width fix. (See theme/standard/styles_layout.css: min-width for Firefox.) + Window width: 800px, Firefox 763px, IE 752px. (Window width: 640px, Firefox 602px, IE 588px.) +*/ +?> -/// Layout the whole page as three big columns. - echo ''; + +'; /// The left column ... - $lt = (empty($THEME->layouttable)) ? array('left', 'middle', 'right') : $THEME->layouttable; - foreach ($lt as $column) { - switch ($column) { - case 'left': if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { - echo ''; + print_container_end(); + echo ''; + } + +/// The right column, BEFORE the middle-column. + if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { + echo '
'; + print_container_start(); + blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); + print_container_end(); + echo '
'; } - break; - case 'middle': /// Start main column - echo ''; + print_container_end(); - break; - case 'right': - // The right column - if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { - echo ''; - } + echo ''; + echo '
'; - break; - } - } - echo '
'; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + echo '
'; + print_container_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); - echo '
'; - if (!empty($THEME->customcorners)) print_custom_corners_start(); + echo '
'; + print_container_start(); + echo skip_main_destination(); print_heading_block(get_string('topicoutline'), 'outline'); - echo ''; + // Note, an ordered list would confuse - "1" could be the clipboard or summary. + echo "
    \n"; /// If currently moving a file then show the current clipboard if (ismoving($course->id)) { $stractivityclipboard = strip_tags(get_string('activityclipboard', '', addslashes($USER->activitycopyname))); $strcancel= get_string('cancel'); - echo '
'; - echo ''; - echo ''; + echo "\n"; } -/// Print Section 0 +/// Print Section 0 with general activities $section = 0; $thissection = $sections[$section]; if ($thissection->summary or $thissection->sequence or isediting($course->id)) { - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo "\n"; } @@ -169,14 +180,14 @@ $showsection = (has_capability('moodle/course:viewhiddensections', $context) or $thissection->visible or !$course->hiddensections); - if (!empty($displaysection) and $displaysection != $section) { + if (!empty($displaysection) and $displaysection != $section) { // Check this topic is visible if ($showsection) { - $strsummary = strip_tags(format_string($thissection->summary,true)); - if (strlen($strsummary) < 57) { - $strsummary = ' - '.$strsummary; - } else { - $strsummary = ' - '.substr($strsummary, 0, 60).'...'; - } + $strsummary = strip_tags(format_string($thissection->summary,true)); + if (strlen($strsummary) < 57) { + $strsummary = ' - '.$strsummary; + } else { + $strsummary = ' - '.substr($strsummary, 0, 60).'...'; + } $sectionmenu['topic='.$section] = s($section.$strsummary); } $section++; @@ -197,77 +208,80 @@ $sectionstyle = ''; } - echo ''; - echo ''; - - echo ''; + echo '
  • '; //'
     
    '; - echo '
    • '; - echo ''; + echo ''; + echo "\n"; } $section++; } - echo '
    '; + echo '
  • '; echo $stractivityclipboard.'  ('.$strcancel.')'; - echo '
    •  '; - + + // Note, no need for a 'left side' cell or DIV. + // Note, 'right side' is BEFORE content. + echo '
  • '; + echo '
     
    '; + echo '
     
    '; + echo '
    '; echo '
    '; $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); @@ -127,20 +140,18 @@ if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { echo ''.$streditsummary.'

    '; + ' class="icon edit" alt="'.$streditsummary.'" />'; } echo '
    '; - + print_section($course, $thissection, $mods, $modnamesused); if (isediting($course->id)) { print_section_add_menus($course, $section, $modnames); } - echo '
    		•  
    '.$currenttext.$section.''; - if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students - echo get_string('notavailable'); - } else { - echo '
    '; - $summaryformatoptions->noclean = true; - echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); - - if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { - echo ' '. - ''.$streditsummary.'

    '; - } - echo '
    '; - - print_section($course, $thissection, $mods, $modnamesused); - - if (isediting($course->id)) { - print_section_add_menus($course, $section, $modnames); - } - } - echo '    		'; - if ($displaysection == $section) { // Show the zoom boxes + echo '
    '.$currenttext.$section.'
    '; + // Note, 'right side' is BEFORE content. + echo '
    '; + + if ($displaysection == $section) { // Show the zoom boxes echo ''. - ''.$strshowalltopics.'
    '; + ''.$strshowalltopics.'
    '; } else { - $strshowonlytopic = get_string('showonlytopic', '', $section); + $strshowonlytopic = get_string("showonlytopic", "", $section); echo ''. - ''.$strshowonlytopic.'
    '; + ''.$strshowonlytopic.'
    '; } if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { - if ($course->marker == $section) { // Show the "light globe" on/off - echo ''. - ''.$strmarkedthistopic.'
    '; - } else { - echo ''. - ''.$strmarkthistopic.'
    '; - } + + if ($course->marker == $section) { // Show the "light globe" on/off + echo ''.''.$strmarkedthistopic.'
    '; + } else { + echo ''.''.$strmarkthistopic.'
    '; + } if ($thissection->visible) { // Show the hide/show eye echo ''. - ''.$strtopichide.'
    '; + ''.$strtopichide.'
    '; } else { echo ''. - ''.$strtopicshow.'
    '; + ''.$strtopicshow.'
    '; } - if ($section > 1) { // Add a arrow to move section up echo ''. - ''.$strmoveup.'
    '; + ''.$strmoveup.'
    '; } if ($section < $course->numsections) { // Add a arrow to move section down echo ''. - ''.$strmovedown.'
    '; + ''.$strmovedown.'
    '; + } + } + echo '
    '; + + echo '
    '; + if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students + echo get_string('notavailable').'
    '; + } else { + echo '
    '; + $summaryformatoptions->noclean = true; + if ($thissection->summary) { + echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); + } else { + echo ' '; + } + + if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { + echo ' '. + ''.$streditsummary.'

    '; } + echo '
    '; + + print_section($course, $thissection, $mods, $modnamesused); + if (isediting($course->id)) { + print_section_add_menus($course, $section, $modnames); + } } - echo '
    '; + echo "\n"; if (!empty($sectionmenu)) { echo '
    '; @@ -276,23 +290,9 @@ echo '
    '; } - if (!empty($THEME->customcorners)) print_custom_corners_end(); - echo '
    		'; - if (!empty($THEME->customcorners)) print_custom_corners_start(); - blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); - echo '
    '; - ?> diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php index fcf074ab02..1d6225040b 100644 --- a/course/format/weeks/format.php +++ b/course/format/weeks/format.php @@ -27,10 +27,6 @@ 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); if ($week != -1) { @@ -78,22 +74,25 @@ /// The left column ... if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { + print_container_start(); echo '
    '; blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); echo '
    '; + print_container_end(); } /// The right column, BEFORE the middle-column. if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { + print_container_start(); echo '
    '; blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); echo '
    '; + print_container_end(); } /// Start main column echo '
    '; - - if (!empty($THEME->customcorners)) print_custom_corners_start(); + print_container_start(); echo skip_main_destination(); @@ -280,9 +279,7 @@ echo '
    '; } - if (!empty($THEME->customcorners)) print_custom_corners_end(); - - echo ''; + print_container_end(); echo ''; echo '
    '; diff --git a/index.php b/index.php index 581b596103..43cc1041fc 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 '    		'; - 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 ccd4a50772..0000000000 --- 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 826fda7f44..849c5a21ab 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 = ''; - - if ($ids) { - $ids = ' id="'.$ids.'"'; - } - - $output .= ''; + global $THEME; - 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; - $output = print_box_start('ccbox '.$classes, $ids, true); + if (!isset($THEME->open_containers)) { + $THEME->open_containers = array(); + } + $THEME->open_containers[] = $idbase; - if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); - $output .= print_custom_corners_start(true, true); + if (!empty($THEME->customcorners)) { + $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,25 +3903,46 @@ 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; - $output = ''; + 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)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); + $output = _print_custom_corners_end($idbase); + } else { + $output = ''; + } - $output .= print_custom_corners_end(true); + if ($return) { + return $output; + } else { + echo $output; } +} - $output .= print_box_end(true);; +/** + * 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->open_containers)) { + while(count($THEME->open_containers) > 1) { // the last one is the 'content' container + $output .= print_container_end($return); + } + } if ($return) { return $output; @@ -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 90a93e8494..6c54652e4c 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 ea2e9faaeb..b8e8d51fab 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 9e11581832..5b9d1a0ea1 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 6b6eef985e..751ecc5dcc 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 2f4e098436..a2dfe30703 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 9b0187e32a..080f3ea528 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 77a3011303..664b5d591c 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 66a8be8caa..d6ca13d317 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 151e230b9b..9547558ccf 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 2c83e78cfa..a7fea6e95c 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 ed62f59f8a..d67804131a 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 d7ad6c1643..5fc82ffaa4 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 ?> -