moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-12221 custom themes revisited - implemented container concept; merged from MOODLE_19_STABLE

Browse source
This commit is contained in:
skodak 2007-11-23 16:49:51 +00:00
parent 220f149cfc
commit 9f7f1a74a0
48 changed files with 653 additions and 732 deletions
Download patch file Download diff file Expand all files Collapse all files

16
admin/settings.php
View file

@ -5,10 +5,6 @@ require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/blocklib.php'); require_once($CFG->libdir.'/blocklib.php');
require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.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()) { if ($site = get_site()) {
require_login(); require_login();
} }
@ -132,14 +128,14 @@ if (!empty($SITE->fullname)) {
switch ($column) { switch ($column) {
case 'left': case 'left':
echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">'; echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
break; break;
case 'middle': case 'middle':
echo '<td id="middle-column">'; echo '<td id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
echo '<a name="startofcontent"></a>'; echo '<a name="startofcontent"></a>';
if ($statusmsg != '') { if ($statusmsg != '') {
@ -162,15 +158,15 @@ if (!empty($SITE->fullname)) {
echo '</div>'; echo '</div>';
echo '</form>'; echo '</form>';
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
break; break;
case 'right': case 'right':
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">'; echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
break; break;

16
admin/stickyblocks.php
View file

@ -5,10 +5,6 @@
require_once($CFG->dirroot.'/lib/pagelib.php'); require_once($CFG->dirroot.'/lib/pagelib.php');
require_once($CFG->dirroot.'/lib/blocklib.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 - $pt = optional_param('pt', null, PARAM_SAFEDIR); //alhanumeric and -
$pagetypes = array(PAGE_MY_MOODLE => array('id' => PAGE_MY_MOODLE, $pagetypes = array(PAGE_MY_MOODLE => array('id' => PAGE_MY_MOODLE,
@ -58,12 +54,12 @@
echo '<tr valign="top">'; echo '<tr valign="top">';
echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="left-column">'; echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $blocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $blocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
echo '<td valign="top" id="middle-column">'; echo '<td valign="top" id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
} else { } else {
require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->libdir.'/adminlib.php');
@ -80,12 +76,12 @@
if (!empty($pt)) { if (!empty($pt)) {
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="right-column">'; echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $blocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $blocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
echo '</tr></table>'; echo '</tr></table>';
print_footer(); print_footer();

6
blog/footer.php
View file

@ -1,7 +1,7 @@
</td> </td>
</tr> </tr>
</table> </table>
<?php if (!empty($THEME->customcorners)) print_custom_corners_end(); ?> <?php print_container_end(); ?>
</td> </td>
<?php <?php
print '<!-- End page content -->'."\n"; print '<!-- End page content -->'."\n";
@ -10,10 +10,10 @@ print '<!-- End page content -->'."\n";
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
echo '<td style="vertical-align: top; width: '. $preferred_width_right .'px;" id="right-column">'; echo '<td style="vertical-align: top; width: '. $preferred_width_right .'px;" id="right-column">';
echo '<!-- Begin right side blocks -->'."\n"; echo '<!-- Begin right side blocks -->'."\n";
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
print_spacer(1, 120, true); print_spacer(1, 120, true);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '<!-- End right side blocks -->'."\n"; echo '<!-- End right side blocks -->'."\n";
echo '</td>'; echo '</td>';
} }

10
blog/header.php
View file

@ -8,10 +8,6 @@ require_once($CFG->dirroot .'/blog/blogpage.php');
require_once($CFG->libdir .'/blocklib.php'); require_once($CFG->libdir .'/blocklib.php');
require_once($CFG->dirroot .'/course/lib.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); $blockaction = optional_param('blockaction','', PARAM_ALPHA);
$instanceid = optional_param('instanceid', 0, PARAM_INT); $instanceid = optional_param('instanceid', 0, PARAM_INT);
$blockid = optional_param('blockid', 0, PARAM_INT); $blockid = optional_param('blockid', 0, PARAM_INT);
@ -263,9 +259,9 @@ print '<tr valign="top">' . "\n";
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
print '<td style="vertical-align: top; width: '. $preferred_width_left .'px;" id="left-column">' . "\n"; print '<td style="vertical-align: top; width: '. $preferred_width_left .'px;" id="left-column">' . "\n";
print '<!-- Begin left side blocks -->' . "\n"; print '<!-- Begin left side blocks -->' . "\n";
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
print '<!-- End left side blocks -->' . "\n"; print '<!-- End left side blocks -->' . "\n";
print '</td>' . "\n"; print '</td>' . "\n";
} }
@ -273,7 +269,7 @@ if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
/// Start main column /// Start main column
print '<!-- Begin page content -->' . "\n"; print '<!-- Begin page content -->' . "\n";
print '<td>'; print '<td>';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
?> ?>
<table width="100%"> <table width="100%">
<tr> <tr>

16
course/format/social/format.php
View file

@ -2,10 +2,6 @@
// format.php - course format featuring social forum // format.php - course format featuring social forum
// included from view.php // included from view.php
if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
}
// Bounds for block widths // Bounds for block widths
// more flexible for theme designers taken from theme config.php // more flexible for theme designers taken from theme config.php
$lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width; $lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
@ -32,14 +28,14 @@
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
echo '<td style="width:'.$preferred_width_left.'px" id="left-column">'; echo '<td style="width:'.$preferred_width_left.'px" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
echo '<td id="middle-column">'; echo '<td id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
echo skip_main_destination(); echo skip_main_destination();
if ($forum = forum_get_course_forum($course->id, 'social')) { if ($forum = forum_get_course_forum($course->id, 'social')) {
print_heading_block(get_string('socialheadline')); print_heading_block(get_string('socialheadline'));
@ -52,15 +48,15 @@
} else { } else {
notify('Could not find or create a social forum here'); notify('Could not find or create a social forum here');
} }
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
// The right column // The right column
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
echo '<td style="width:'.$preferred_width_right.'px" id="right-column">'; echo '<td style="width:'.$preferred_width_right.'px" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }

242
course/format/topics/format.php
View file

@ -1,41 +1,38 @@
<?php // $Id$ <?php // $Id$
// Display the whole course as "topics" made of of modules // Display the whole course as "topics" made of of modules
// In fact, this is very similar to the "weeks" format, in that
// each "topic" is actually a week. The main difference is that
// the dates aren't printed - it's just an aesthetic thing for
// courses that aren't so rigidly defined by time.
// Included from "view.php" // Included from "view.php"
/**
* Evaluation topics format for course display - NO layout tables, for accessibility, etc.
*
* A duplicate course format to enable the Moodle development team to evaluate
* CSS for the multi-column layout in place of layout tables.
* Less risk for the Moodle 1.6 beta release.
* 1. Straight copy of topics/format.php
* 2. Replace <table> and <td> 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 &copy; 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'); 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); $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);
if ($topic != -1) { if ($topic != -1) {
$displaysection = course_set_display($course->id, $topic); $displaysection = course_set_display($course->id, $topic);
} else { } else {
if (isset($USER->display[$course->id])) { // for admins, mostly if (isset($USER->display[$course->id])) {
$displaysection = $USER->display[$course->id]; $displaysection = $USER->display[$course->id];
} else { } else {
$displaysection = course_set_display($course->id, 0); $displaysection = course_set_display($course->id, 0);
@ -70,56 +67,72 @@
$strmovedown = get_string('movedown'); $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. <!--[if IE]>
echo '<table id="layout-table" cellspacing="0" summary="'.get_string('layouttable').'"><tr>'; <style type="text/css">
.topics-format { width: expression(document.body.clientWidth < 800 ? "752px" : "auto"); }
</style>
<![endif]-->
<?php
/// Layout the whole page as three big columns (was, id="layout-table")
echo '<div class="topics-format">';
/// The left column ... /// 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) { if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
echo '<td style="width:'.$preferred_width_left.'px" id="left-column">'; echo '<div id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</div>';
}
/// The right column, BEFORE the middle-column.
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
echo '<div id="right-column">';
print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
print_container_end();
echo '</div>';
} }
break;
case 'middle':
/// Start main column /// Start main column
echo '<td id="middle-column">'; echo '<div id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
echo skip_main_destination(); echo skip_main_destination();
print_heading_block(get_string('topicoutline'), 'outline'); print_heading_block(get_string('topicoutline'), 'outline');
echo '<table class="topics" width="100%" summary="'.get_string('layouttable').'">'; // Note, an ordered list would confuse - "1" could be the clipboard or summary.
echo "<ul class='topics'>\n";
/// If currently moving a file then show the current clipboard /// If currently moving a file then show the current clipboard
if (ismoving($course->id)) { if (ismoving($course->id)) {
$stractivityclipboard = strip_tags(get_string('activityclipboard', '', addslashes($USER->activitycopyname))); $stractivityclipboard = strip_tags(get_string('activityclipboard', '', addslashes($USER->activitycopyname)));
$strcancel= get_string('cancel'); $strcancel= get_string('cancel');
echo '<tr class="clipboard">'; echo '<li class="clipboard">';
echo '<td colspan="3">';
echo $stractivityclipboard.'&nbsp;&nbsp;(<a href="mod.php?cancelcopy=true&amp;sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)'; echo $stractivityclipboard.'&nbsp;&nbsp;(<a href="mod.php?cancelcopy=true&amp;sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)';
echo '</td>'; echo "</li>\n";
echo '</tr>';
} }
/// Print Section 0 /// Print Section 0 with general activities
$section = 0; $section = 0;
$thissection = $sections[$section]; $thissection = $sections[$section];
if ($thissection->summary or $thissection->sequence or isediting($course->id)) { if ($thissection->summary or $thissection->sequence or isediting($course->id)) {
echo '<tr id="section-0" class="section main">';
echo '<td class="left side">&nbsp;</td>';
echo '<td class="content">';
// Note, no need for a 'left side' cell or DIV.
// Note, 'right side' is BEFORE content.
echo '<li id="section-0" class="section main" >';
echo '<div class="left side">&nbsp;</div>';
echo '<div class="right side" >&nbsp;</div>';
echo '<div class="content">';
echo '<div class="summary">'; echo '<div class="summary">';
$summaryformatoptions->noclean = true; $summaryformatoptions->noclean = true;
echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
@ -127,7 +140,7 @@
if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
echo '<a title="'.$streditsummary.'" '. echo '<a title="'.$streditsummary.'" '.
' href="editsection.php?id='.$thissection->id.'"><img src="'.$CFG->pixpath.'/t/edit.gif" '. ' href="editsection.php?id='.$thissection->id.'"><img src="'.$CFG->pixpath.'/t/edit.gif" '.
' alt="'.$streditsummary.'" /></a><br /><br />'; ' class="icon edit" alt="'.$streditsummary.'" /></a>';
} }
echo '</div>'; echo '</div>';
@ -137,10 +150,8 @@
print_section_add_menus($course, $section, $modnames); print_section_add_menus($course, $section, $modnames);
} }
echo '</td>'; echo '</div>';
echo '<td class="right side">&nbsp;</td>'; echo "</li>\n";
echo '</tr>';
echo '<tr class="section separator"><td colspan="3" class="spacer"></td></tr>';
} }
@ -169,7 +180,7 @@
$showsection = (has_capability('moodle/course:viewhiddensections', $context) or $thissection->visible or !$course->hiddensections); $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) { if ($showsection) {
$strsummary = strip_tags(format_string($thissection->summary,true)); $strsummary = strip_tags(format_string($thissection->summary,true));
if (strlen($strsummary) < 57) { if (strlen($strsummary) < 57) {
@ -197,20 +208,63 @@
$sectionstyle = ''; $sectionstyle = '';
} }
echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">'; echo '<li id="section-'.$section.'" class="section main'.$sectionstyle.'" >'; //'<div class="left side">&nbsp;</div>';
echo '<td class="left side">'.$currenttext.$section.'</td>';
echo '<td class="content">'; echo '<div class="left side">'.$currenttext.$section.'</div>';
// Note, 'right side' is BEFORE content.
echo '<div class="right side">';
if ($displaysection == $section) { // Show the zoom boxes
echo '<a href="view.php?id='.$course->id.'&amp;topic=0#section-'.$section.'" title="'.$strshowalltopics.'">'.
'<img src="'.$CFG->pixpath.'/i/all.gif" class="icon" alt="'.$strshowalltopics.'" /></a><br />';
} else {
$strshowonlytopic = get_string("showonlytopic", "", $section);
echo '<a href="view.php?id='.$course->id.'&amp;topic='.$section.'" title="'.$strshowonlytopic.'">'.
'<img src="'.$CFG->pixpath.'/i/one.gif" class="icon" alt="'.$strshowonlytopic.'" /></a><br />';
}
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 '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.'<img src="'.$CFG->pixpath.'/i/marked.gif" alt="'.$strmarkedthistopic.'" /></a><br />';
} else {
echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkthistopic.'">'.'<img src="'.$CFG->pixpath.'/i/marker.gif" alt="'.$strmarkthistopic.'" /></a><br />';
}
if ($thissection->visible) { // Show the hide/show eye
echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
'<img src="'.$CFG->pixpath.'/i/hide.gif" class="icon hide" alt="'.$strtopichide.'" /></a><br />';
} else {
echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopicshow.'">'.
'<img src="'.$CFG->pixpath.'/i/show.gif" class="icon hide" alt="'.$strtopicshow.'" /></a><br />';
}
if ($section > 1) { // Add a arrow to move section up
echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
'<img src="'.$CFG->pixpath.'/t/up.gif" class="icon up" alt="'.$strmoveup.'" /></a><br />';
}
if ($section < $course->numsections) { // Add a arrow to move section down
echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
'<img src="'.$CFG->pixpath.'/t/down.gif" class="icon down" alt="'.$strmovedown.'" /></a><br />';
}
}
echo '</div>';
echo '<div class="content">';
if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students
echo get_string('notavailable'); echo get_string('notavailable').'</div>';
} else { } else {
echo '<div class="summary">'; echo '<div class="summary">';
$summaryformatoptions->noclean = true; $summaryformatoptions->noclean = true;
if ($thissection->summary) {
echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
} else {
echo '&nbsp;';
}
if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'. echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
'<img src="'.$CFG->pixpath.'/t/edit.gif" alt="'.$streditsummary.'" /></a><br /><br />'; '<img src="'.$CFG->pixpath.'/t/edit.gif" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
} }
echo '</div>'; echo '</div>';
@ -220,54 +274,14 @@
print_section_add_menus($course, $section, $modnames); print_section_add_menus($course, $section, $modnames);
} }
} }
echo '</td>';
echo '<td class="right side">'; echo '</div>';
if ($displaysection == $section) { // Show the zoom boxes echo "</li>\n";
echo '<a href="view.php?id='.$course->id.'&amp;topic=0#section-'.$section.'" title="'.$strshowalltopics.'">'.
'<img src="'.$CFG->pixpath.'/i/all.gif" alt="'.$strshowalltopics.'" /></a><br />';
} else {
$strshowonlytopic = get_string('showonlytopic', '', $section);
echo '<a href="view.php?id='.$course->id.'&amp;topic='.$section.'" title="'.$strshowonlytopic.'">'.
'<img src="'.$CFG->pixpath.'/i/one.gif" alt="'.$strshowonlytopic.'" /></a><br />';
}
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 '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.
'<img src="'.$CFG->pixpath.'/i/marked.gif" alt="'.$strmarkedthistopic.'" /></a><br />';
} else {
echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkthistopic.'">'.
'<img src="'.$CFG->pixpath.'/i/marker.gif" alt="'.$strmarkthistopic.'" /></a><br />';
}
if ($thissection->visible) { // Show the hide/show eye
echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
'<img src="'.$CFG->pixpath.'/i/hide.gif" alt="'.$strtopichide.'" /></a><br />';
} else {
echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopicshow.'">'.
'<img src="'.$CFG->pixpath.'/i/show.gif" alt="'.$strtopicshow.'" /></a><br />';
}
if ($section > 1) { // Add a arrow to move section up
echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
'<img src="'.$CFG->pixpath.'/t/up.gif" alt="'.$strmoveup.'" /></a><br />';
}
if ($section < $course->numsections) { // Add a arrow to move section down
echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
'<img src="'.$CFG->pixpath.'/t/down.gif" alt="'.$strmovedown.'" /></a><br />';
}
}
echo '</td></tr>';
echo '<tr class="section separator"><td colspan="3" class="spacer"></td></tr>';
} }
$section++; $section++;
} }
echo '</table>'; echo "</ul>\n";
if (!empty($sectionmenu)) { if (!empty($sectionmenu)) {
echo '<div align="center" class="jumpmenu">'; echo '<div align="center" class="jumpmenu">';
@ -276,23 +290,9 @@
echo '</div>'; echo '</div>';
} }
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>';
break; echo '</div>';
case 'right': echo '<div class="clearer"></div>';
// The right column
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
echo '<td style="width:'.$preferred_width_right.'px" id="right-column">';
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 '</td>';
}
break;
}
}
echo '</tr></table>';
?> ?>

15
course/format/weeks/format.php
View file

@ -27,10 +27,6 @@
require_once($CFG->libdir.'/ajax/ajaxlib.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); $week = optional_param('week', -1, PARAM_INT);
if ($week != -1) { if ($week != -1) {
@ -78,22 +74,25 @@
/// The left column ... /// The left column ...
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
print_container_start();
echo '<div id="left-column">'; echo '<div id="left-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
echo '</div>'; echo '</div>';
print_container_end();
} }
/// The right column, BEFORE the middle-column. /// The right column, BEFORE the middle-column.
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
print_container_start();
echo '<div id="right-column">'; echo '<div id="right-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
echo '</div>'; echo '</div>';
print_container_end();
} }
/// Start main column /// Start main column
echo '<div id="middle-column">'; echo '<div id="middle-column">';
print_container_start();
if (!empty($THEME->customcorners)) print_custom_corners_start();
echo skip_main_destination(); echo skip_main_destination();
@ -280,9 +279,7 @@
echo '</div>'; echo '</div>';
} }
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</div>';
echo '</div>'; echo '</div>';
echo '<div class="clearer"></div>'; echo '<div class="clearer"></div>';

16
index.php
View file

@ -34,10 +34,6 @@
require_once($CFG->dirroot .'/course/lib.php'); require_once($CFG->dirroot .'/course/lib.php');
require_once($CFG->dirroot .'/lib/blocklib.php'); require_once($CFG->dirroot .'/lib/blocklib.php');
if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
}
if (empty($SITE)) { if (empty($SITE)) {
redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php'); redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php');
} }
@ -127,16 +123,16 @@
case 'left': case 'left':
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">'; echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
break; break;
case 'middle': case 'middle':
echo '<td id="middle-column">'. skip_main_destination(); echo '<td id="middle-column">'. skip_main_destination();
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
/// Print Section /// Print Section
if ($SITE->numsections > 0) { if ($SITE->numsections > 0) {
@ -253,7 +249,7 @@
echo '<br />'; echo '<br />';
} }
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
break; break;
@ -261,13 +257,13 @@
// The right column // The right column
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing || $PAGE->user_allowed_editing()) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing || $PAGE->user_allowed_editing()) {
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">'; echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
if ($PAGE->user_allowed_editing()) { if ($PAGE->user_allowed_editing()) {
echo '<div style="text-align:center">'.update_course_icon($SITE->id).'</div>'; echo '<div style="text-align:center">'.update_course_icon($SITE->id).'</div>';
echo '<br />'; echo '<br />';
} }
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
break; break;

35
lib/adminlib.php
View file

@ -2950,10 +2950,6 @@ function admin_externalpage_print_header() {
global $CFG, $PAGE, $SITE, $THEME; global $CFG, $PAGE, $SITE, $THEME;
if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
}
define('ADMIN_EXT_HEADER_PRINTED', 'true'); define('ADMIN_EXT_HEADER_PRINTED', 'true');
if (!empty($SITE->fullname)) { if (!empty($SITE->fullname)) {
@ -2962,6 +2958,10 @@ function admin_externalpage_print_header() {
$preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH, $preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH,
blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
BLOCK_L_MAX_WIDTH); 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(); $PAGE->print_header();
echo '<table id="layout-table" summary=""><tr>'; echo '<table id="layout-table" summary=""><tr>';
@ -2974,23 +2974,23 @@ function admin_externalpage_print_header() {
switch ($column) { switch ($column) {
case 'left': case 'left':
echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">'; echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
break; break;
case 'middle': case 'middle':
echo '<td id="middle-column">'; echo '<td id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(true); print_container_start(true);
break; break;
case 'right': case 'right':
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">'; echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
break; break;
@ -3005,14 +3005,13 @@ function admin_externalpage_print_footer() {
global $CFG, $PAGE, $SITE, $THEME; global $CFG, $PAGE, $SITE, $THEME;
if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
}
define('ADMIN_EXT_FOOTER_PRINTED', 'true'); define('ADMIN_EXT_FOOTER_PRINTED', 'true');
if (!empty($SITE->fullname)) { if (!empty($SITE->fullname)) {
$pageblocks = blocks_setup($PAGE); $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, $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH,
blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
BLOCK_R_MAX_WIDTH); BLOCK_R_MAX_WIDTH);
@ -3029,24 +3028,24 @@ function admin_externalpage_print_footer() {
switch ($column) { switch ($column) {
case 'left': case 'left':
echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">'; echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
break; break;
case 'middle': case 'middle':
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
break; break;
case 'right': case 'right':
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">'; echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
break; break;

91
lib/custom_corners_lib.php
View file

@ -1,91 +0,0 @@
<?php
/**
* @author Urs Hunkler
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
*
* Custom corners and borders
* Support library
*
* 2007-05-07 File created.
*/
/**
* Starting part of the surrounding divs for custom corners
*
* @param boolean $clearfix, add CLASS "clearfix" to the inner div against collapsing
* @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_start($clearfix=false, $return=false, $idbase=null) {
global $THEME;
/// Analise if we want ids for the custom corner elements
$idbt = '';
$idi1 = '';
$idi2 = '';
$idi3 = '';
if ($idbase) {
$idbt = 'id="' . $idbase . '-bt" ';
$idi1 = 'id="' . $idbase . '-i1" ';
$idi2 = 'id="' . $idbase . '-i2" ';
$idi3 = 'id="' . $idbase . '-i3" ';
}
/// Output begins
$output = '<div class="wrap">'."\n";
$output .= '<div '.$idbt.'class="bt"><div>&nbsp;</div></div>';
$output .= "\n";
$output .= '<div '.$idi1.'class="i1"><div '.$idi2.'class="i2">';
$output .= (!empty($clearfix)) ? '<div '.$idi3.'class="i3 clearfix">' : '<div '.$idi3.'class="i3">';
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 = '</div></div></div>';
$output .= "\n";
$output .= '<div '.$idbb.'class="bb"><div>&nbsp;</div></div>'."\n";
$output .= '</div>';
if ($return) {
return $output;
} else {
echo $output;
}
}
?>

194
lib/weblib.php
View file

@ -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 /// Include the actual footer file
ob_start(); 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 * @param boolean $return, return as string or just print it
*/ */
function print_box_start($classes='generalbox', $ids='', $return=false) { function print_box_start($classes='generalbox', $ids='', $return=false) {
$output = ''; global $THEME;
if ($ids) { if (!empty($THEME->customcorners)) {
$ids = ' id="'.$ids.'"'; $classes .= ' ccbox box';
}
$output .= '<div'.$ids.' class="box '.$classes.'">';
if ($return) {
return $output;
} else { } else {
echo $output; $classes .= ' box';
}
} }
return print_container_start(false, $classes, $ids, $return);
}
/** /**
* Simple function to end a box (see above) * 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 * @param boolean $return, return as string or just print it
*/ */
function print_box_end($return=false) { function print_box_end($return=false) {
$output = '</div>'; return print_container_end($return);
if ($return) {
return $output;
} else {
echo $output;
} }
}
/** /**
* 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 $classes, space-separated class names.
* @param string $ids, space-separated id names. * @param string $ids, space-separated id names.
* @param boolean $return, return as string or just print it * @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 .= stripslashes_safe($message);
$output .= print_custom_corners_box_end(true); $output .= print_container_end(true);
if ($return) { if ($return) {
return $output; return $output;
@ -3878,24 +3859,41 @@ function print_custom_corners_box($message, $classes='generalbox', $ids='', $ret
} }
} }
/** /**
* Function adds custom_corners to boxes * Starts a container using divs
* Calls print_box_start
* *
* @param string $classes, space-separated class names. * @param string $classes, space-separated class names.
* @param string $ids, space-separated id names. * @param string $ids, space-separated id names.
* @param boolean $return, return as string or just print it * @param boolean $return, return as string or just print it
*/ */
function print_custom_corners_box_start($classes='generalbox', $ids='', $return=false) { function print_container_start($clearfix=false, $classes='', $idbase='', $return=false) {
global $CFG, $THEME; 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)) { if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); $output = _print_custom_corners_start($clearfix, $classes, $idbase);
} else {
$output .= print_custom_corners_start(true, true); if ($idbase) {
$id = ' id="'.$idbase.'"';
} else {
$id = '';
}
if ($clearfix) {
$clearfix = ' clearfix';
} else {
$clearfix = '';
}
if ($classes or $clearfix) {
$class = ' class="'.$classes.$clearfix.'"';
} else {
$class = '';
}
$output = '<div'.$id.$class.'>';
} }
if ($return) { if ($return) {
@ -3905,25 +3903,46 @@ function print_custom_corners_box_start($classes='generalbox', $ids='', $return=
} }
} }
/** /**
* Function adds custom_corners to boxes * Simple function to end a container (see above)
* Calls print_box_end
*
* @param boolean $return, return as string or just print it * @param boolean $return, return as string or just print it
*/ */
function print_custom_corners_box_end($return=false) { function print_container_end($return=false) {
global $CFG, $THEME; 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 = '</div>';
}
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 = ''; $output = '';
if (!empty($THEME->open_containers)) {
if (!empty($THEME->customcorners)) { while(count($THEME->open_containers) > 1) { // the last one is the 'content' container
require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); $output .= print_container_end($return);
}
$output .= print_custom_corners_end(true);
} }
$output .= print_box_end(true);;
if ($return) { if ($return) {
return $output; 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 = '<div '.$id.'class="wrap '.$classes.'">'."\n";
$output .= '<div '.$idbt.'class="bt"><div>&nbsp;</div></div>';
$output .= "\n";
$output .= '<div '.$idi1.'class="i1"><div '.$idi2.'class="i2">';
$output .= (!empty($clearfix)) ? '<div '.$idi3.'class="i3 clearfix">' : '<div '.$idi3.'class="i3">';
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 = '</div></div></div>';
$output .= "\n";
$output .= '<div '.$idbb.'class="bb"><div>&nbsp;</div></div>'."\n";
$output .= '</div>';
return $output;
}
/** /**
* Print a self contained form with a single submit button. * Print a self contained form with a single submit button.
@ -5537,6 +5611,8 @@ function error ($message, $link='') {
//header not yet printed //header not yet printed
@header('HTTP/1.0 404 Not Found'); @header('HTTP/1.0 404 Not Found');
print_header(get_string('error')); print_header(get_string('error'));
} else {
print_container_end_all();
} }
echo '<br />'; echo '<br />';
@ -5791,6 +5867,8 @@ function editorshortcutshelpbutton() {
function notice ($message, $link='', $course=NULL) { function notice ($message, $link='', $course=NULL) {
global $CFG, $SITE; global $CFG, $SITE;
print_container_end_all();
$message = clean_text($message); $message = clean_text($message);
print_box($message, 'generalbox', 'notice'); 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 :-( // this type of redirect might not be working in some browsers - such as lynx :-(
print_header('', '', '', '', $errorprinted ? '' : ('<meta http-equiv="refresh" content="'. $delay .'; url='. $encodedurl .'" />')); print_header('', '', '', '', $errorprinted ? '' : ('<meta http-equiv="refresh" content="'. $delay .'; url='. $encodedurl .'" />'));
$delay += 3; // double redirect prevention, it was sometimes breaking upgrades before 1.7 $delay += 3; // double redirect prevention, it was sometimes breaking upgrades before 1.7
} else {
print_container_end_all();
} }
echo '<div style="text-align:center">'; echo '<div style="text-align:center">';
echo '<div>'. $message .'</div>'; echo '<div>'. $message .'</div>';
@ -6232,10 +6312,6 @@ function print_side_block_start($heading='', $attributes = array()) {
global $CFG, $THEME; 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 there are no special attributes, give a default CSS class
if (empty($attributes) || !is_array($attributes)) { if (empty($attributes) || !is_array($attributes)) {
$attributes = array('class' => 'sideblock'); $attributes = array('class' => 'sideblock');
@ -6293,7 +6369,6 @@ function print_side_block_start($heading='', $attributes = array()) {
if (!empty($THEME->customcorners)) { if (!empty($THEME->customcorners)) {
echo '<div class="i1"><div class="i2">'; echo '<div class="i1"><div class="i2">';
echo '<div class="i3">'; echo '<div class="i3">';
$THEME->customcornersopen += 1;
} }
echo '<div class="content">'; echo '<div class="content">';
@ -6309,8 +6384,7 @@ function print_side_block_end($attributes = array()) {
echo '</div>'; echo '</div>';
if (!empty($THEME->customcorners)) { if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); echo '</div></div></div><div class="bb"><div>&nbsp;</div></div></div>';
print_custom_corners_end();
} }
echo '</div>'; echo '</div>';

8
message/user.php
View file

@ -87,10 +87,8 @@
echo '</td></tr></table>'; echo '</td></tr></table>';
if (!empty($THEME->customcorners)) { // this is hack!
print_custom_corners_end(false, 'content'); print_container_end(); // container "content" started in header
} echo '</div></body></html>'; // close page div started in header
echo '</div></div></body></html>'; // Close possible theme tables off
?> ?>

14
mod/chat/view.php
View file

@ -7,10 +7,6 @@
require_once($CFG->libdir.'/blocklib.php'); require_once($CFG->libdir.'/blocklib.php');
require_once('pagelib.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); $id = optional_param('id', 0, PARAM_INT);
$c = optional_param('c', 0, PARAM_INT); $c = optional_param('c', 0, PARAM_INT);
$edit = optional_param('edit', -1, PARAM_BOOL); $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())) { if(!empty($CFG->showblocksonmodpages) && (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">'; echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
break; break;
@ -89,7 +85,7 @@
case 'middle': case 'middle':
echo '<td id="middle-column">'; echo '<td id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
/// Check to see if groups are being used here /// Check to see if groups are being used here
$groupmode = groups_get_activity_groupmode($cm); $groupmode = groups_get_activity_groupmode($cm);
@ -193,9 +189,7 @@
print_simple_box_end(); print_simple_box_end();
} }
if (!empty($THEME->customcorners)) { print_container_end();
print_custom_corners_end();
}
echo '</td>'; echo '</td>';
break; break;

17
mod/data/view.php
View file

@ -29,11 +29,6 @@
require_once('pagelib.php'); require_once('pagelib.php');
if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
}
/// One of these is necessary! /// One of these is necessary!
$id = optional_param('id', 0, PARAM_INT); // course module id $id = optional_param('id', 0, PARAM_INT); // course module id
$d = optional_param('d', 0, PARAM_INT); // database id $d = optional_param('d', 0, PARAM_INT); // database id
@ -244,13 +239,13 @@
echo '<table id="layout-table"><tr>'; echo '<table id="layout-table"><tr>';
if ((blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) { if ((blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">'; echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
echo '<td id="middle-column">'; echo '<td id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
} }
/// Check to see if groups are being used here /// Check to see if groups are being used here
@ -554,13 +549,13 @@
/// If we have blocks, then print the left side here /// If we have blocks, then print the left side here
if (!empty($CFG->showblocksonmodpages)) { if (!empty($CFG->showblocksonmodpages)) {
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; // Middle column echo '</td>'; // Middle column
if ((blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing())) { if ((blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing())) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="right-column">'; echo '<td style="width: '.$blocks_preferred_width.'px;" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
echo '</tr></table>'; echo '</tr></table>';

4
mod/forum/view.php
View file

@ -220,7 +220,7 @@
case 'eachuser': case 'eachuser':
if (!empty($forum->intro)) { if (!empty($forum->intro)) {
print_custom_corners_box(format_text($forum->intro), 'generalbox', 'intro'); print_box(format_text($forum->intro), 'generalbox', 'intro');
} }
echo '<p align="center">'; echo '<p align="center">';
if (forum_user_can_post_discussion($forum)) { if (forum_user_can_post_discussion($forum)) {
@ -246,7 +246,7 @@
default: default:
if (!empty($forum->intro)) { if (!empty($forum->intro)) {
print_custom_corners_box(format_text($forum->intro), 'generalbox', 'intro'); print_box(format_text($forum->intro), 'generalbox', 'intro');
} }
echo '<br />'; echo '<br />';
if (!empty($showall)) { if (!empty($showall)) {

12
mod/quiz/view.php
View file

@ -8,10 +8,6 @@
require_once($CFG->dirroot.'/mod/quiz/locallib.php'); require_once($CFG->dirroot.'/mod/quiz/locallib.php');
require_once($CFG->dirroot.'/mod/quiz/pagelib.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 $id = optional_param('id', 0, PARAM_INT); // Course Module ID, or
$q = optional_param('q', 0, PARAM_INT); // quiz ID $q = optional_param('q', 0, PARAM_INT); // quiz ID
$edit = optional_param('edit', -1, PARAM_BOOL); $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())) { if(!empty($CFG->showblocksonmodpages) && (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">'; echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
echo '<td id="middle-column">'; echo '<td id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
// Print the main part of the page // Print the main part of the page
@ -457,7 +453,7 @@
function finish_page($course) { function finish_page($course) {
global $THEME; global $THEME;
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td></tr></table>'; echo '</td></tr></table>';
print_footer($course); print_footer($course);
exit; exit;

16
mod/resource/lib.php
View file

@ -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 * 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())) { if((blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">'; echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
echo '<td id="middle-column">'; echo '<td id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
echo '<div id="resource">'; echo '<div id="resource">';
} }
@ -195,14 +191,14 @@ class resource_base {
$blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210); $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210);
echo '</div>'; echo '</div>';
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
if((blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing())) { if((blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing())) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="right-column">'; echo '<td style="width: '.$blocks_preferred_width.'px;" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }

7
mod/resource/type/ims/resource.class.php
View file

@ -482,10 +482,9 @@ class resource_ims extends resource_base {
/// Now, let's print the footer. It's harcoded here to save some space /// 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 /// because it's impossible to use print_footer() to print NOTHING
/// Added programatic support to customcorners themes. /// Added programatic support to customcorners themes.
if (!empty($THEME->customcorners)) { // this is hack!
print_custom_corners_end(false, 'content'); print_container_end(); // container "content" started in header
} echo '</div></body></html>'; // close page div started in header
echo '</div></div></body></html>'; /// Close everything.
/// log it. /// log it.
add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id); add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);

3
mod/scorm/player.php
View file

@ -287,8 +287,7 @@
</div> <!-- SCORM box --> </div> <!-- SCORM box -->
</div> <!-- SCORM content --> </div> <!-- SCORM content -->
<?php if (!empty($THEME->customcorners)) { <?php if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); print_container_end();
print_custom_corners_end();
} ?> } ?>
<div class="clearer">&nbsp;</div> <div class="clearer">&nbsp;</div>
<?php print_footer(); ?> <?php print_footer(); ?>

16
my/index.php
View file

@ -7,10 +7,6 @@
require_once($CFG->dirroot.'/course/lib.php'); require_once($CFG->dirroot.'/course/lib.php');
require_once('pagelib.php'); require_once('pagelib.php');
if (!empty($THEME->customcorners)) {
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
}
require_login(); require_login();
$mymoodlestr = get_string('mymoodle','my'); $mymoodlestr = get_string('mymoodle','my');
@ -54,9 +50,9 @@
if(blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) { if(blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) {
echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">'; echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
@ -64,7 +60,7 @@
case 'middle': case 'middle':
echo '<td valign="top" id="middle-column">'; echo '<td valign="top" id="middle-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(TRUE); print_container_start(TRUE);
/// The main overview in the middle of the page /// The main overview in the middle of the page
@ -96,7 +92,7 @@
echo '<br />...'; echo '<br />...';
} }
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
break; break;
@ -106,9 +102,9 @@
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing()) { if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing()) {
echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="right-column">'; echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="right-column">';
if (!empty($THEME->customcorners)) print_custom_corners_start(); print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
if (!empty($THEME->customcorners)) print_custom_corners_end(); print_container_end();
echo '</td>'; echo '</td>';
} }
break; break;

29
theme/cornflower/footer.html
View file

@ -1,30 +1,31 @@
</div> <!-- end div containerContent -->
<!-- START OF FOOTER -->
<div id="footer">
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
?>
<?php if ($navigation and false) { ?>
if ($navigation and false) { ?>
<div class="navbar clearfix"> <div class="navbar clearfix">
<div class="breadcrumb"><?php print_navigation($navigation); ?></div> <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
<div class="menu"><?php echo $menu; ?></div> <div class="menu"><?php echo $menu; ?></div>
</div> </div>
<?php } ?> <?php }
<?php echo $loggedinas ?> echo $loggedinas;
<?php echo $homelink ?> echo $homelink;
<?php if (!empty($performanceinfo)) { if (!empty($performanceinfo)) {
echo $performanceinfo; echo $performanceinfo;
} ?> }
print_container_end();
?>
</div>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/cornflower/header.html
View file

@ -20,16 +20,16 @@
<?php //Accessibility: warning: ALT text will need editing when logo changes. 'headermain' is now H1. <?php //Accessibility: warning: ALT text will need editing when logo changes. 'headermain' is now H1.
if ($home) { // home page ?> if ($home) { // home page ?>
<div id="header-home"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1> <h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header-home"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1> <h1 class="headermain"><img alt="[ REPLACE ME ]" src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/logo.jpg" width="457" height="64" /></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<div class="clearer"></div> <div class="clearer"></div>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
@ -43,4 +43,4 @@
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div class="clearer"></div> <div class="clearer"></div>
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

29
theme/custom_corners/footer.html
View file

@ -1,7 +1,7 @@
<?php print_custom_corners_end(false, 'content'); ?> <?php print_container_end(); ?><!-- end container Content -->
</div> <!-- end div containerContent -->
<!-- START OF FOOTER --> <!-- START OF FOOTER -->
<?php <?php
global $CFG, $COURSE; global $CFG, $COURSE;
if (function_exists('is_in_popup')) { if (function_exists('is_in_popup')) {
$inpopup = is_in_popup(); $inpopup = is_in_popup();
@ -10,22 +10,15 @@
} }
if (!$inpopup) { if (!$inpopup) {
?> print_container_start(false, '', 'footer');
<div id="footer">
<?php print_custom_corners_start(); ?>
<?php
if (function_exists('page_doc_link')) {
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
}
?> echo $loggedinas;
<?php echo $loggedinas ?> echo $homelink;
<?php echo $homelink;
?>
<?php print_custom_corners_end(); ?>
</div>
<?php
$useridarray = array(2 // MD $useridarray = array(2 // MD
); );
@ -33,12 +26,12 @@
echo $performanceinfo; echo $performanceinfo;
} }
print_container_end();
} // end if inpopup } // end if inpopup
?> ?>
</div> <!-- end page div --> </div> <!-- end page div -->
<?php
print_custom_corners_end();
?>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
$(document).ready(function() { $(document).ready(function() {

17
theme/custom_corners/header.html
View file

@ -10,8 +10,6 @@
<?php include("$CFG->javascript"); ?> <?php include("$CFG->javascript"); ?>
<?php include('js/jquery.php'); ?> <?php include('js/jquery.php'); ?>
<?php require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); ?>
<?php <?php
global $PAGE; global $PAGE;
@ -78,18 +76,15 @@
<?php if (!$inpopup) { <?php if (!$inpopup) {
if ($home) { // This is what gets printed on the home page only if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<?php print_custom_corners_start(); ?>
<div class="wraphome clearfix"> <div class="wraphome clearfix">
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> </div>
<?php print_custom_corners_end(); ?> <?php print_container_end(); ?>
</div>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<?php print_custom_corners_start(); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
<div class="navbar clearfix"> <div class="navbar clearfix">
@ -99,11 +94,9 @@
<div class="navbutton"><?php echo $button; ?></div> <div class="navbutton"><?php echo $button; ?></div>
<?php } ?> <?php } ?>
</div> </div>
<?php print_custom_corners_end(); ?> <?php print_container_end(); ?>
</div>
<?php } <?php }
} }
?> ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>
<?php print_custom_corners_start(true, false, 'content'); ?>

35
theme/formal_white/footer.html
View file

@ -1,39 +1,40 @@
</div> <!-- end div containerContent -->
<!-- START OF FOOTER -->
<div id="footer">
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
?>
<?php if ($navigation and false) { ?>
if ($navigation and false) { ?>
<div class="navbar clearfix"> <div class="navbar clearfix">
<div class="breadcrumb"><?php print_navigation($navigation); ?></div> <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
<div class="menu"><?php echo $menu; ?></div> <div class="menu"><?php echo $menu; ?></div>
</div> </div>
<?php } ?> <?php }
<hr /> echo '<hr />';
echo $loggedinas;
echo $homelink;
<?php echo $loggedinas ?><br /> if (!empty($performanceinfo)) {
<?php echo $homelink ?>
<?php if (!empty($performanceinfo)) {
echo $performanceinfo; echo $performanceinfo;
} ?> }
<?php if (debugging()) { if (debugging()) { ?>
?>
<div class="validators"><ul> <div class="validators"><ul>
<li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li> <li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li>
</ul></div> </ul></div>
<?php } ?> <?php }
print_container_end();
?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/formal_white/header.html
View file

@ -20,16 +20,16 @@
<?php //Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain <?php //Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
if ($home) { // This is what gets printed on the home page only if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/logo.jpg' /></h1> <h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/logo.jpg' /></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/logo_small.jpg' /></h1> <h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/logo_small.jpg' /></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
if ($navigation) { // This is the navigation bar with breadcrumbs ?> if ($navigation) { // This is the navigation bar with breadcrumbs ?>
@ -42,4 +42,4 @@
<hr /> <hr />
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

32
theme/metal/footer.html
View file

@ -1,29 +1,33 @@
</div> <!-- end div content -->
<div id="footer">
<hr />
<?php echo $loggedinas ?>
<?php echo $homelink ?>
<hr />
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<hr />';
echo $loggedinas;
echo $homelink;
echo '<hr />';
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
?>
<?php if (debugging()) { if (!empty($performanceinfo)) {
echo $performanceinfo; echo $performanceinfo;
?> }
if (debugging()) { ?>
<div class="validators"><ul> <div class="validators"><ul>
<li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li> <li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li>
</ul></div> </ul></div>
<?php } ?> <?php }
print_container_end();
?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/metal/header.html
View file

@ -19,16 +19,16 @@
<?php if ($home) { // This is what gets printed on the home page only <?php if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<div class="clearer">&nbsp;</div> <div class="clearer">&nbsp;</div>
<?php if ($navigation) { // This is the navigation table with breadcrumbs ?> <?php if ($navigation) { // This is the navigation table with breadcrumbs ?>
@ -42,4 +42,4 @@
<?php } ?> <?php } ?>
<div class="clearer">&nbsp;</div> <div class="clearer">&nbsp;</div>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

35
theme/oceanblue/footer.html
View file

@ -1,41 +1,40 @@
</div> <!-- end div containerContent -->
<!-- START OF FOOTER -->
<div id="footer">
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
?>
<?php if ($navigation and false) { ?>
if ($navigation and false) { ?>
<div class="navbar clearfix"> <div class="navbar clearfix">
<div class="breadcrumb"><?php print_navigation($navigation); ?></div> <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
<div class="menu"><?php echo $menu; ?></div> <div class="menu"><?php echo $menu; ?></div>
</div> </div>
<?php } ?> <?php }
<hr /> echo '<hr />';
echo $loggedinas;
echo $homelink;
<?php echo $loggedinas ?> if (!empty($performanceinfo)) {
<?php echo $homelink ?>
<?php if (!empty($performanceinfo)) {
echo $performanceinfo; echo $performanceinfo;
} ?> }
<?php if (debugging()) { if (debugging()) { ?>
?>
<div class="validators"><ul> <div class="validators"><ul>
<li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li> <li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li>
</ul></div> </ul></div>
<?php } ?> <?php }
print_container_end();
?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/oceanblue/header.html
View file

@ -20,16 +20,16 @@
<?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
if ($home) { // This is what gets printed on the home page only if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
if ($navigation) { // This is the navigation bar with breadcrumbs ?> if ($navigation) { // This is the navigation bar with breadcrumbs ?>
@ -42,4 +42,4 @@
<hr /> <hr />
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

20
theme/orangewhite/footer.html
View file

@ -1,18 +1,18 @@
</div> <!-- end div containerContent -->
<!-- START OF FOOTER -->
<div id="footer">
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
echo $loggedinas;
echo $homelink;
print_container_end();
?> ?>
<?php echo $loggedinas ?>
<?php echo $homelink ?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/orangewhite/header.html
View file

@ -19,19 +19,19 @@
<?php if ($home) { // This is what gets printed on the home page only <?php if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<div class="navbar"> <div class="navbar">
</div> </div>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
<!-- <div class="headermenu"><div id="new-menu"><?php echo $navmenulist ?></div></div> --> <!-- <div class="headermenu"><div id="new-menu"><?php echo $navmenulist ?></div></div> -->
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php if ($navigation) { // This is the navigation table with breadcrumbs <?php if ($navigation) { // This is the navigation table with breadcrumbs
?> ?>
@ -41,4 +41,4 @@
</div> </div>
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

20
theme/orangewhitepda/footer.html
View file

@ -1,18 +1,18 @@
</div> <!-- end div containerContent -->
<!-- START OF FOOTER -->
<div id="footer">
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
echo $loggedinas;
echo $homelink;
print_container_end();
?> ?>
<?php echo $loggedinas ?>
<?php echo $homelink ?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/orangewhitepda/header.html
View file

@ -19,19 +19,19 @@
<?php if ($home) { // This is what gets printed on the home page only <?php if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<div class="navbar"> <div class="navbar">
</div> </div>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
<!-- <div class="headermenu"><div id="new-menu"><?php echo $navmenulist ?></div></div> --> <!-- <div class="headermenu"><div id="new-menu"><?php echo $navmenulist ?></div></div> -->
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php if ($navigation) { // This is the navigation table with breadcrumbs <?php if ($navigation) { // This is the navigation table with breadcrumbs
?> ?>
@ -41,4 +41,4 @@
</div> </div>
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

32
theme/standard/footer.html
View file

@ -1,39 +1,39 @@
</div> <!-- end div containerContent -->
<!-- START OF FOOTER -->
<div id="footer">
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
?>
<?php if ($navigation and false) { ?>
if ($navigation and false) { ?>
<div class="navbar clearfix"> <div class="navbar clearfix">
<div class="breadcrumb"><?php print_navigation($navigation); ?></div> <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
<div class="menu"><?php echo $menu; ?></div> <div class="menu"><?php echo $menu; ?></div>
</div> </div>
<?php } ?> <?php }
<?php echo $loggedinas ?> echo $loggedinas;
<?php echo $homelink ?> echo $homelink;
<?php if (!empty($performanceinfo)) { if (!empty($performanceinfo)) {
echo $performanceinfo; echo $performanceinfo;
} ?> }
<?php if (debugging()) { if (debugging()) { ?>
?>
<div class="validators"><ul> <div class="validators"><ul>
<li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li> <li><a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li>
</ul></div> </ul></div>
<?php } ?> <?php }
print_container_end();
?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/standard/header.html
View file

@ -20,16 +20,16 @@
<?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
if ($home) { // This is what gets printed on the home page only if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
if ($navigation) { // This is the navigation bar with breadcrumbs ?> if ($navigation) { // This is the navigation bar with breadcrumbs ?>
@ -42,4 +42,4 @@
<hr /> <hr />
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

22
theme/standardblue/footer.html
View file

@ -1,19 +1,19 @@
</div> <!-- end div content -->
<div id="footer">
<hr />
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<hr />';
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
echo $loggedinas;
echo $homelink;
print_container_end();
?> ?>
<?php echo $loggedinas ?>
<?php echo $homelink ?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/standardblue/header.html
View file

@ -20,16 +20,16 @@
<?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
if ($home) { // This is what gets printed on the home page only if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
if ($navigation) { // This is the navigation bar with breadcrumbs ?> if ($navigation) { // This is the navigation bar with breadcrumbs ?>
@ -42,4 +42,4 @@
<hr /> <hr />
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

22
theme/standardgreen/footer.html
View file

@ -1,19 +1,19 @@
</div> <!-- end div content -->
<div id="footer">
<hr />
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<hr />';
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
echo $loggedinas;
echo $homelink;
print_container_end();
?> ?>
<?php echo $loggedinas ?>
<?php echo $homelink ?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/standardgreen/header.html
View file

@ -20,16 +20,16 @@
<?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
if ($home) { // This is what gets printed on the home page only if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
if ($navigation) { // This is the navigation bar with breadcrumbs ?> if ($navigation) { // This is the navigation bar with breadcrumbs ?>
@ -42,4 +42,4 @@
<hr /> <hr />
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

22
theme/standardlogo/footer.html
View file

@ -1,19 +1,19 @@
</div> <!-- end div content -->
<div id="footer">
<hr />
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<hr />';
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
echo $loggedinas;
echo $homelink;
print_container_end();
?> ?>
<?php echo $loggedinas ?>
<?php echo $homelink ?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/standardlogo/header.html
View file

@ -40,16 +40,16 @@
//Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1. //Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1.
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><img alt="Moodle" src="<?php echo $standardlogo ?>" /></h1> <h1 class="headermain"><img alt="Moodle" src="<?php echo $standardlogo ?>" /></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
if ($navigation) { // This is the navigation table with breadcrumbs ?> if ($navigation) { // This is the navigation table with breadcrumbs ?>
@ -62,4 +62,4 @@
<hr /> <hr />
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

22
theme/standardred/footer.html
View file

@ -1,19 +1,19 @@
</div> <!-- end div content -->
<div id="footer">
<hr />
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo '<hr />';
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
echo $loggedinas;
echo $homelink;
print_container_end();
?> ?>
<?php echo $loggedinas ?>
<?php echo $homelink ?>
</div>
</div> </div>
</body> </body>
</html> </html>

10
theme/standardred/header.html
View file

@ -20,16 +20,16 @@
<?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
if ($home) { // This is what gets printed on the home page only if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
if ($navigation) { // This is the navigation bar with breadcrumbs ?> if ($navigation) { // This is the navigation bar with breadcrumbs ?>
@ -42,4 +42,4 @@
<hr /> <hr />
<?php } ?> <?php } ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>

27
theme/standardwhite/footer.html
View file

@ -1,21 +1,18 @@
</div> <!-- end div content -->
<div id="footer">
<hr />
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo "<hr />";
echo '<p class="helplink">'; echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink')); echo page_doc_link(get_string('moodledocslink'));
echo '</p>'; echo '</p>';
?>
<?php echo $loggedinas ?> echo $loggedinas;
<?php echo $homelink ?> echo $homelink;
if (!empty($performanceinfo) and has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
<?php
if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)) and !empty($performanceinfo)) {
echo $performanceinfo; echo $performanceinfo;
} }
@ -26,10 +23,10 @@
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a></li>
<li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li> <li><a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&amp;warnp2n3e=1&amp;url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a></li>
</ul></div> </ul></div>
<?php } ?> <?php }
print_container_end();
?>
</div>
</div> </div>
</body> </body>
</html> </html>

14
theme/standardwhite/header.html
View file

@ -20,16 +20,16 @@
<?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain <?php //Accessibility: 'headermain' is now H1, see theme/standard/styles_layout.css: .headermain
if ($home) { // This is what gets printed on the home page only if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table. <?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
if ($navigation) { // This is the navigation bar with breadcrumbs ?> if ($navigation) { // This is the navigation bar with breadcrumbs ?>
@ -40,7 +40,7 @@
<?php } else if ($heading) { // If no navigation, but a heading, then print a line <?php } else if ($heading) { // If no navigation, but a heading, then print a line
?> ?>
<hr /> <hr />
<?php } ?> <?php }
<div class="clearer">&nbsp;</div> print_container_end(); ?>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(true, '', 'content'); ?>

23
theme/wood/footer.html
View file

@ -1,23 +1,24 @@
</div> <!-- end div content -->
<div id="footer">
<?php <?php
print_container_end(); // content container
print_container_start(false, '', 'footer');
echo "<div id=\"footer-bar\">"; echo "<div id=\"footer-bar\">";
echo '<span class="helplink">'; echo '<span class="helplink">';
echo '&nbsp;'.page_doc_link(get_string('moodledocslink')); echo '&nbsp;'.page_doc_link(get_string('moodledocslink'));
echo '</span>'; echo '</span>';
echo "</div>"; echo "</div>";
?>
<?php echo $loggedinas ?> echo $loggedinas;
<?php echo $homelink ?> echo $homelink;
<?php if (!empty($performanceinfo)) { if (!empty($performanceinfo)) {
echo $performanceinfo; echo $performanceinfo;
} ?> }
</div>
print_container_end();
?>
</div> </div>
</body> </body>
</html> </html>

10
theme/wood/header.html
View file

@ -19,16 +19,16 @@
<?php if ($home) { // This is what gets printed on the home page only <?php if ($home) { // This is what gets printed on the home page only
?> ?>
<div id="header-home" class="clearfix"> <?php print_container_start(true, '', 'header-home'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading <?php } else if ($heading) { // This is what gets printed on any other page with a heading
?> ?>
<div id="header" class="clearfix"> <?php print_container_start(true, '', 'header'); ?>
<h1 class="headermain"><?php echo $heading ?></h1> <h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div> <div class="headermenu"><?php echo $menu ?></div>
</div> <?php print_container_end(); ?>
<?php } ?> <?php } ?>
<?php if ($navigation) { // This is the navigation table with breadcrumbs ?> <?php if ($navigation) { // This is the navigation table with breadcrumbs ?>
<div class="navbar clearfix"> <div class="navbar clearfix">
@ -41,4 +41,4 @@
<?php } ?> <?php } ?>
<div class="clearer">&nbsp;</div> <div class="clearer">&nbsp;</div>
<!-- END OF HEADER --> <!-- END OF HEADER -->
<div id="content"> <?php print_container_start(false, '', 'content'); ?>