require_once($CFG->libdir.'/blocklib.php');
require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.php');
-if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
-}
-
if ($site = get_site()) {
require_login();
}
switch ($column) {
case 'left':
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
break;
case 'middle':
echo '<td id="middle-column">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
echo '<a name="startofcontent"></a>';
if ($statusmsg != '') {
echo '</div>';
echo '</form>';
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
break;
case 'right':
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
break;
require_once($CFG->dirroot.'/lib/pagelib.php');
require_once($CFG->dirroot.'/lib/blocklib.php');
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
$pt = optional_param('pt', null, PARAM_SAFEDIR); //alhanumeric and -
$pagetypes = array(PAGE_MY_MOODLE => array('id' => PAGE_MY_MOODLE,
echo '<tr valign="top">';
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
echo '<td valign="top" id="middle-column">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
} else {
require_once($CFG->libdir.'/adminlib.php');
if (!empty($pt)) {
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
echo '</tr></table>';
print_footer();
</td>
</tr>
</table>
- <?php if (!empty($THEME->customcorners)) print_custom_corners_end(); ?>
+ <?php print_container_end(); ?>
</td>
<?php
print '<!-- End page content -->'."\n";
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
echo '<td style="vertical-align: top; width: '. $preferred_width_right .'px;" id="right-column">';
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);
print_spacer(1, 120, true);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '<!-- End right side blocks -->'."\n";
echo '</td>';
}
require_once($CFG->libdir .'/blocklib.php');
require_once($CFG->dirroot .'/course/lib.php');
-if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
-}
-
$blockaction = optional_param('blockaction','', PARAM_ALPHA);
$instanceid = optional_param('instanceid', 0, PARAM_INT);
$blockid = optional_param('blockid', 0, PARAM_INT);
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 '<!-- Begin left side blocks -->' . "\n";
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
print '<!-- End left side blocks -->' . "\n";
print '</td>' . "\n";
}
/// Start main column
print '<!-- Begin page content -->' . "\n";
print '<td>';
-if (!empty($THEME->customcorners)) print_custom_corners_start();
+print_container_start();
?>
<table width="100%">
<tr>
<?php // $Id$
// format.php - course format featuring social forum
// included from view.php
-
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
// Bounds for block widths
// more flexible for theme designers taken from theme config.php
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
echo '<td id="middle-column">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
echo skip_main_destination();
if ($forum = forum_get_course_forum($course->id, 'social')) {
print_heading_block(get_string('socialheadline'));
} else {
notify('Could not find or create a social forum here');
}
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
// 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();
+ print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
<?php // $Id$
// 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"
-
+/**
+ * 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 © 2006 The Open University
+ * @author N.D.Freear@open.ac.uk, and others.
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package
+ */
+//TODO (nfreear): Accessibility: evaluation, lang/en_utf8/moodle.php: $string['formattopicscss']
require_once($CFG->libdir.'/ajax/ajaxlib.php');
-
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
- $topic = optional_param('topic', -1, PARAM_INT);
-
- // Bounds for block widths
- // more flexible for theme designers taken from theme config.php
- $lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
- $lmax = (empty($THEME->block_l_max_width)) ? 210 : $THEME->block_l_max_width;
- $rmin = (empty($THEME->block_r_min_width)) ? 100 : $THEME->block_r_min_width;
- $rmax = (empty($THEME->block_r_max_width)) ? 210 : $THEME->block_r_max_width;
- define('BLOCK_L_MIN_WIDTH', $lmin);
- define('BLOCK_L_MAX_WIDTH', $lmax);
- define('BLOCK_R_MIN_WIDTH', $rmin);
- define('BLOCK_R_MAX_WIDTH', $rmax);
-
- $preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
- BLOCK_L_MAX_WIDTH);
- $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
- BLOCK_R_MAX_WIDTH);
+ $topic = optional_param('topic', -1, PARAM_INT);
if ($topic != -1) {
$displaysection = course_set_display($course->id, $topic);
} else {
- if (isset($USER->display[$course->id])) { // for admins, mostly
+ if (isset($USER->display[$course->id])) {
$displaysection = $USER->display[$course->id];
} else {
$displaysection = course_set_display($course->id, 0);
$context = get_context_instance(CONTEXT_COURSE, $course->id);
if (($marker >=0) && has_capability('moodle/course:setcurrentsection', $context) && confirm_sesskey()) {
- $course->marker = $marker;
- if (! set_field("course", "marker", $marker, "id", $course->id)) {
- error("Could not mark that topic for this course");
- }
+ $course->marker = $marker;
+ if (! set_field("course", "marker", $marker, "id", $course->id)) {
+ error("Could not mark that topic for this course");
+ }
}
- $streditsummary = get_string('editsummary');
- $stradd = get_string('add');
- $stractivities = get_string('activities');
+ $streditsummary = get_string('editsummary');
+ $stradd = get_string('add');
+ $stractivities = get_string('activities');
$strshowalltopics = get_string('showalltopics');
$strtopic = get_string('topic');
- $strgroups = get_string('groups');
- $strgroupmy = get_string('groupmy');
- $editing = $PAGE->user_is_editing();
+ $strgroups = get_string('groups');
+ $strgroupmy = get_string('groupmy');
+ $editing = $PAGE->user_is_editing();
if ($editing) {
$strstudents = moodle_strtolower($course->students);
$strtopichide = get_string('topichide', '', $strstudents);
$strtopicshow = get_string('topicshow', '', $strstudents);
- $strmarkthistopic = get_string('markthistopic');
- $strmarkedthistopic = get_string('markedthistopic');
- $strmoveup = get_string('moveup');
+ $strmarkthistopic = get_string('markthistopic');
+ $strmarkedthistopic = get_string('markedthistopic');
+ $strmoveup = get_string('moveup');
$strmovedown = get_string('movedown');
}
+/* Internet Explorer min-width fix. (See theme/standard/styles_layout.css: min-width for Firefox.)
+ Window width: 800px, Firefox 763px, IE 752px. (Window width: 640px, Firefox 602px, IE 588px.)
+*/
+?>
-/// Layout the whole page as three big columns.
- echo '<table id="layout-table" cellspacing="0" summary="'.get_string('layouttable').'"><tr>';
+<!--[if IE]>
+ <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 ...
- $lt = (empty($THEME->layouttable)) ? array('left', 'middle', 'right') : $THEME->layouttable;
- foreach ($lt as $column) {
- switch ($column) {
- case 'left':
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
- echo '<td style="width:'.$preferred_width_left.'px" id="left-column">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ echo '<div id="left-column">';
+ print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
- echo '</td>';
+ print_container_end();
+ 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
- echo '<td id="middle-column">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ echo '<div id="middle-column">';
+ print_container_start();
+
echo skip_main_destination();
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 (ismoving($course->id)) {
$stractivityclipboard = strip_tags(get_string('activityclipboard', '', addslashes($USER->activitycopyname)));
$strcancel= get_string('cancel');
- echo '<tr class="clipboard">';
- echo '<td colspan="3">';
+ echo '<li class="clipboard">';
echo $stractivityclipboard.' (<a href="mod.php?cancelcopy=true&sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)';
- echo '</td>';
- echo '</tr>';
+ echo "</li>\n";
}
-/// Print Section 0
+/// Print Section 0 with general activities
$section = 0;
$thissection = $sections[$section];
if ($thissection->summary or $thissection->sequence or isediting($course->id)) {
- echo '<tr id="section-0" class="section main">';
- echo '<td class="left side"> </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"> </div>';
+ echo '<div class="right side" > </div>';
+ echo '<div class="content">';
echo '<div class="summary">';
$summaryformatoptions->noclean = true;
echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
echo '<a title="'.$streditsummary.'" '.
' 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>';
-
+
print_section($course, $thissection, $mods, $modnamesused);
if (isediting($course->id)) {
print_section_add_menus($course, $section, $modnames);
}
- echo '</td>';
- echo '<td class="right side"> </td>';
- echo '</tr>';
- echo '<tr class="section separator"><td colspan="3" class="spacer"></td></tr>';
+ echo '</div>';
+ echo "</li>\n";
}
$showsection = (has_capability('moodle/course:viewhiddensections', $context) or $thissection->visible or !$course->hiddensections);
- if (!empty($displaysection) and $displaysection != $section) {
+ if (!empty($displaysection) and $displaysection != $section) { // Check this topic is visible
if ($showsection) {
- $strsummary = strip_tags(format_string($thissection->summary,true));
- if (strlen($strsummary) < 57) {
- $strsummary = ' - '.$strsummary;
- } else {
- $strsummary = ' - '.substr($strsummary, 0, 60).'...';
- }
+ $strsummary = strip_tags(format_string($thissection->summary,true));
+ if (strlen($strsummary) < 57) {
+ $strsummary = ' - '.$strsummary;
+ } else {
+ $strsummary = ' - '.substr($strsummary, 0, 60).'...';
+ }
$sectionmenu['topic='.$section] = s($section.$strsummary);
}
$section++;
$sectionstyle = '';
}
- echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
- echo '<td class="left side">'.$currenttext.$section.'</td>';
-
- echo '<td class="content">';
- if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students
- echo get_string('notavailable');
- } else {
- echo '<div class="summary">';
- $summaryformatoptions->noclean = true;
- echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
-
- if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
- echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
- '<img src="'.$CFG->pixpath.'/t/edit.gif" alt="'.$streditsummary.'" /></a><br /><br />';
- }
- echo '</div>';
-
- print_section($course, $thissection, $mods, $modnamesused);
-
- if (isediting($course->id)) {
- print_section_add_menus($course, $section, $modnames);
- }
- }
- echo '</td>';
+ echo '<li id="section-'.$section.'" class="section main'.$sectionstyle.'" >'; //'<div class="left side"> </div>';
- echo '<td class="right side">';
- if ($displaysection == $section) { // Show the zoom boxes
+ 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.'&topic=0#section-'.$section.'" title="'.$strshowalltopics.'">'.
- '<img src="'.$CFG->pixpath.'/i/all.gif" alt="'.$strshowalltopics.'" /></a><br />';
+ '<img src="'.$CFG->pixpath.'/i/all.gif" class="icon" alt="'.$strshowalltopics.'" /></a><br />';
} else {
- $strshowonlytopic = get_string('showonlytopic', '', $section);
+ $strshowonlytopic = get_string("showonlytopic", "", $section);
echo '<a href="view.php?id='.$course->id.'&topic='.$section.'" title="'.$strshowonlytopic.'">'.
- '<img src="'.$CFG->pixpath.'/i/one.gif" alt="'.$strshowonlytopic.'" /></a><br />';
+ '<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.'&marker=0&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.'&marker='.$section.'&sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkthistopic.'">'.
- '<img src="'.$CFG->pixpath.'/i/marker.gif" alt="'.$strmarkthistopic.'" /></a><br />';
- }
+
+ if ($course->marker == $section) { // Show the "light globe" on/off
+ echo '<a href="view.php?id='.$course->id.'&marker=0&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.'&marker='.$section.'&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.'&hide='.$section.'&sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
- '<img src="'.$CFG->pixpath.'/i/hide.gif" alt="'.$strtopichide.'" /></a><br />';
+ '<img src="'.$CFG->pixpath.'/i/hide.gif" class="icon hide" alt="'.$strtopichide.'" /></a><br />';
} else {
echo '<a href="view.php?id='.$course->id.'&show='.$section.'&sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopicshow.'">'.
- '<img src="'.$CFG->pixpath.'/i/show.gif" alt="'.$strtopicshow.'" /></a><br />';
+ '<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.'&random='.rand(1,10000).'&section='.$section.'&move=-1&sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
- '<img src="'.$CFG->pixpath.'/t/up.gif" alt="'.$strmoveup.'" /></a><br />';
+ '<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.'&random='.rand(1,10000).'&section='.$section.'&move=1&sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
- '<img src="'.$CFG->pixpath.'/t/down.gif" alt="'.$strmovedown.'" /></a><br />';
+ '<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
+ echo get_string('notavailable').'</div>';
+ } else {
+ echo '<div class="summary">';
+ $summaryformatoptions->noclean = true;
+ if ($thissection->summary) {
+ echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
+ } else {
+ echo ' ';
+ }
+
+ if (isediting($course->id) && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
+ echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
+ '<img src="'.$CFG->pixpath.'/t/edit.gif" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
}
+ echo '</div>';
+
+ print_section($course, $thissection, $mods, $modnamesused);
+ if (isediting($course->id)) {
+ print_section_add_menus($course, $section, $modnames);
+ }
}
- echo '</td></tr>';
- echo '<tr class="section separator"><td colspan="3" class="spacer"></td></tr>';
+ echo '</div>';
+ echo "</li>\n";
}
$section++;
}
- echo '</table>';
+ echo "</ul>\n";
if (!empty($sectionmenu)) {
echo '<div align="center" class="jumpmenu">';
echo '</div>';
}
- if (!empty($THEME->customcorners)) print_custom_corners_end();
- echo '</td>';
+ print_container_end();
- break;
- case 'right':
- // 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>';
- }
+ echo '</div>';
+ echo '<div class="clearer"></div>';
- break;
- }
- }
- echo '</tr></table>';
-
?>
require_once($CFG->libdir.'/ajax/ajaxlib.php');
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
$week = optional_param('week', -1, PARAM_INT);
if ($week != -1) {
/// The left column ...
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
+ print_container_start();
echo '<div id="left-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
echo '</div>';
+ print_container_end();
}
/// The right column, BEFORE the middle-column.
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
+ print_container_start();
echo '<div id="right-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
echo '</div>';
+ print_container_end();
}
/// Start main column
echo '<div id="middle-column">';
-
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
echo skip_main_destination();
echo '</div>';
}
- if (!empty($THEME->customcorners)) print_custom_corners_end();
-
- echo '</div>';
+ print_container_end();
echo '</div>';
echo '<div class="clearer"></div>';
require_once($CFG->dirroot .'/course/lib.php');
require_once($CFG->dirroot .'/lib/blocklib.php');
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
if (empty($SITE)) {
redirect($CFG->wwwroot .'/'. $CFG->admin .'/index.php');
}
case 'left':
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
break;
case 'middle':
echo '<td id="middle-column">'. skip_main_destination();
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
/// Print Section
if ($SITE->numsections > 0) {
echo '<br />';
}
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
break;
// The right column
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing || $PAGE->user_allowed_editing()) {
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()) {
echo '<div style="text-align:center">'.update_course_icon($SITE->id).'</div>';
echo '<br />';
}
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
break;
global $CFG, $PAGE, $SITE, $THEME;
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
define('ADMIN_EXT_HEADER_PRINTED', 'true');
if (!empty($SITE->fullname)) {
$preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH,
blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
BLOCK_L_MAX_WIDTH);
+ $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH,
+ blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
+ BLOCK_R_MAX_WIDTH);
+
$PAGE->print_header();
echo '<table id="layout-table" summary=""><tr>';
switch ($column) {
case 'left':
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
break;
case 'middle':
echo '<td id="middle-column">';
- if (!empty($THEME->customcorners)) print_custom_corners_start(true);
+ print_container_start(true);
break;
case 'right':
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
echo '<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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
break;
global $CFG, $PAGE, $SITE, $THEME;
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
define('ADMIN_EXT_FOOTER_PRINTED', 'true');
if (!empty($SITE->fullname)) {
$pageblocks = blocks_setup($PAGE);
+ $preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH,
+ blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
+ BLOCK_L_MAX_WIDTH);
$preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH,
blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
BLOCK_R_MAX_WIDTH);
switch ($column) {
case 'left':
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
break;
case 'middle':
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
break;
case 'right':
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
break;
+++ /dev/null
-<?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> </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> </div></div>'."\n";
- $output .= '</div>';
-
-
- if ($return) {
- return $output;
- } else {
- echo $output;
- }
-}
-
-?>
}
}
-/// Close eventually open custom_corner divs
- if ((!empty($THEME->customcorners)) && ($THEME->customcornersopen > 1)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- while ($THEME->customcornersopen > 1) {
- print_custom_corners_end();
- }
- }
-
/// Include the actual footer file
ob_start();
* @param boolean $return, return as string or just print it
*/
function print_box_start($classes='generalbox', $ids='', $return=false) {
- $output = '';
-
- if ($ids) {
- $ids = ' id="'.$ids.'"';
- }
-
- $output .= '<div'.$ids.' class="box '.$classes.'">';
+ global $THEME;
- if ($return) {
- return $output;
+ if (!empty($THEME->customcorners)) {
+ $classes .= ' ccbox box';
} else {
- echo $output;
+ $classes .= ' box';
}
-}
+ return print_container_start(false, $classes, $ids, $return);
+}
/**
* Simple function to end a box (see above)
* @param boolean $return, return as string or just print it
*/
function print_box_end($return=false) {
- $output = '</div>';
- if ($return) {
- return $output;
- } else {
- echo $output;
- }
+ return print_container_end($return);
}
-
/**
- * Function adds custom_corners to boxes
+ * Print a message in a standard themed container.
*
- * @param string $message, the content of the box
+ * @param string $message, the content of the container
* @param string $classes, space-separated class names.
* @param string $ids, space-separated id names.
* @param boolean $return, return as string or just print it
*/
-function print_custom_corners_box($message, $classes='generalbox', $ids='', $return=false) {
+function print_container($message, $clearfix=false, $classes='', $idbase='', $return=false) {
- $output = print_custom_corners_box_start($classes, $ids, true);
+ $output = print_container_start($clearfix, $classes, $idbase, true);
$output .= stripslashes_safe($message);
- $output .= print_custom_corners_box_end(true);
+ $output .= print_container_end(true);
if ($return) {
return $output;
}
}
-
/**
- * Function adds custom_corners to boxes
- * Calls print_box_start
+ * Starts a container using divs
*
* @param string $classes, space-separated class names.
* @param string $ids, space-separated id names.
* @param boolean $return, return as string or just print it
*/
-function print_custom_corners_box_start($classes='generalbox', $ids='', $return=false) {
- global $CFG, $THEME;
+function print_container_start($clearfix=false, $classes='', $idbase='', $return=false) {
+ global $THEME;
- $output = print_box_start('ccbox '.$classes, $ids, true);
+ if (!isset($THEME->open_containers)) {
+ $THEME->open_containers = array();
+ }
+ $THEME->open_containers[] = $idbase;
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- $output .= print_custom_corners_start(true, true);
+ if (!empty($THEME->customcorners)) {
+ $output = _print_custom_corners_start($clearfix, $classes, $idbase);
+ } else {
+ if ($idbase) {
+ $id = ' id="'.$idbase.'"';
+ } else {
+ $id = '';
+ }
+ if ($clearfix) {
+ $clearfix = ' clearfix';
+ } else {
+ $clearfix = '';
+ }
+ if ($classes or $clearfix) {
+ $class = ' class="'.$classes.$clearfix.'"';
+ } else {
+ $class = '';
+ }
+ $output = '<div'.$id.$class.'>';
}
if ($return) {
}
}
-
/**
- * Function adds custom_corners to boxes
- * Calls print_box_end
- *
+ * Simple function to end a container (see above)
* @param boolean $return, return as string or just print it
*/
-function print_custom_corners_box_end($return=false) {
- global $CFG, $THEME;
+function print_container_end($return=false) {
+ global $THEME;
- $output = '';
+ if (empty($THEME->open_containers)) {
+ debugging('Incorrect closing of custom corners - no more open containers');
+ $idbase = '';
+ } else {
+ $idbase = array_pop($THEME->open_containers);
+ }
if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
+ $output = _print_custom_corners_end($idbase);
+ } else {
+ $output = '</div>';
+ }
- $output .= print_custom_corners_end(true);
+ if ($return) {
+ return $output;
+ } else {
+ echo $output;
}
+}
- $output .= print_box_end(true);;
+/**
+ * Force closing of all open containers except the main content one.
+ * @param boolean $return, return as string or just print it
+ */
+function print_container_end_all($return=false) {
+ global $THEME;
+
+ $output = '';
+ if (!empty($THEME->open_containers)) {
+ while(count($THEME->open_containers) > 1) { // the last one is the 'content' container
+ $output .= print_container_end($return);
+ }
+ }
if ($return) {
return $output;
}
}
+/**
+ * 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> </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> </div></div>'."\n";
+ $output .= '</div>';
+
+ return $output;
+}
+
/**
* Print a self contained form with a single submit button.
//header not yet printed
@header('HTTP/1.0 404 Not Found');
print_header(get_string('error'));
+ } else {
+ print_container_end_all();
}
echo '<br />';
function notice ($message, $link='', $course=NULL) {
global $CFG, $SITE;
+ print_container_end_all();
+
$message = clean_text($message);
print_box($message, 'generalbox', 'notice');
// 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 .'" />'));
$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>'. $message .'</div>';
global $CFG, $THEME;
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
// If there are no special attributes, give a default CSS class
if (empty($attributes) || !is_array($attributes)) {
$attributes = array('class' => 'sideblock');
if (!empty($THEME->customcorners)) {
echo '<div class="i1"><div class="i2">';
echo '<div class="i3">';
- $THEME->customcornersopen += 1;
}
echo '<div class="content">';
echo '</div>';
if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- print_custom_corners_end();
+ echo '</div></div></div><div class="bb"><div> </div></div></div>';
}
echo '</div>';
echo '</td></tr></table>';
- if (!empty($THEME->customcorners)) {
- print_custom_corners_end(false, 'content');
- }
-
- echo '</div></div></body></html>'; // Close possible theme tables off
+ // this is hack!
+ print_container_end(); // container "content" started in header
+ echo '</div></body></html>'; // close page div started in header
?>
require_once($CFG->libdir.'/blocklib.php');
require_once('pagelib.php');
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
$id = optional_param('id', 0, PARAM_INT);
$c = optional_param('c', 0, PARAM_INT);
$edit = optional_param('edit', -1, PARAM_BOOL);
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">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
break;
case 'middle':
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
$groupmode = groups_get_activity_groupmode($cm);
print_simple_box_end();
}
- if (!empty($THEME->customcorners)) {
- print_custom_corners_end();
- }
+ print_container_end();
echo '</td>';
break;
require_once("$CFG->libdir/rsslib.php");
require_once('pagelib.php');
-
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
-
+
/// One of these is necessary!
$id = optional_param('id', 0, PARAM_INT); // course module id
$d = optional_param('d', 0, PARAM_INT); // database id
echo '<table id="layout-table"><tr>';
if ((blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) {
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
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
/// If we have blocks, then print the left side here
if (!empty($CFG->showblocksonmodpages)) {
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>'; // Middle column
if ((blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing())) {
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
echo '</tr></table>';
case 'eachuser':
if (!empty($forum->intro)) {
- print_custom_corners_box(format_text($forum->intro), 'generalbox', 'intro');
+ print_box(format_text($forum->intro), 'generalbox', 'intro');
}
echo '<p align="center">';
if (forum_user_can_post_discussion($forum)) {
default:
if (!empty($forum->intro)) {
- print_custom_corners_box(format_text($forum->intro), 'generalbox', 'intro');
+ print_box(format_text($forum->intro), 'generalbox', 'intro');
}
echo '<br />';
if (!empty($showall)) {
require_once($CFG->dirroot.'/mod/quiz/locallib.php');
require_once($CFG->dirroot.'/mod/quiz/pagelib.php');
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
$id = optional_param('id', 0, PARAM_INT); // Course Module ID, or
$q = optional_param('q', 0, PARAM_INT); // quiz ID
$edit = optional_param('edit', -1, PARAM_BOOL);
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">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
echo '<td id="middle-column">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
// Print the main part of the page
function finish_page($course) {
global $THEME;
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td></tr></table>';
print_footer($course);
exit;
}
}
-if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
-}
-
/**
* resource_base is the base class for resource types
*
if((blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) {
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
echo '<td id="middle-column">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
echo '<div id="resource">';
}
$blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 210);
echo '</div>';
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
if((blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing())) {
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);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
/// Now, let's print the footer. It's harcoded here to save some space
/// because it's impossible to use print_footer() to print NOTHING
/// Added programatic support to customcorners themes.
- if (!empty($THEME->customcorners)) {
- print_custom_corners_end(false, 'content');
- }
- echo '</div></div></body></html>'; /// Close everything.
+ // this is hack!
+ print_container_end(); // container "content" started in header
+ echo '</div></body></html>'; // close page div started in header
/// log it.
add_to_log($course->id, "resource", "view", "view.php?id={$cm->id}", $resource->id, $cm->id);
</div> <!-- SCORM box -->
</div> <!-- SCORM content -->
<?php if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- print_custom_corners_end();
+ print_container_end();
} ?>
<div class="clearer"> </div>
<?php print_footer(); ?>
require_once($CFG->dirroot.'/course/lib.php');
require_once('pagelib.php');
- if (!empty($THEME->customcorners)) {
- require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
- }
-
require_login();
$mymoodlestr = get_string('mymoodle','my');
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">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
case 'middle':
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
echo '<br />...';
}
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
break;
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">';
- if (!empty($THEME->customcorners)) print_custom_corners_start();
+ print_container_start();
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
- if (!empty($THEME->customcorners)) print_custom_corners_end();
+ print_container_end();
echo '</td>';
}
break;
+<?php
-</div> <!-- end div containerContent -->
-<!-- START OF FOOTER -->
-<div id="footer">
+ print_container_end(); // content container
+
+ print_container_start(false, '', 'footer');
-<?php
echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink'));
echo '</p>';
-?>
-<?php if ($navigation and false) { ?>
+
+ if ($navigation and false) { ?>
<div class="navbar clearfix">
<div class="breadcrumb"><?php print_navigation($navigation); ?></div>
<div class="menu"><?php echo $menu; ?></div>
</div>
-<?php } ?>
+<?php }
-<?php echo $loggedinas ?>
-<?php echo $homelink ?>
+ echo $loggedinas;
+ echo $homelink;
-<?php if (!empty($performanceinfo)) {
- echo $performanceinfo;
-} ?>
+ if (!empty($performanceinfo)) {
+ echo $performanceinfo;
+ }
+
+ print_container_end();
+?>
-</div>
-</div>
</div>
</body>
</html>
<?php //Accessibility: warning: ALT text will need editing when logo changes. 'headermain' is now H1.
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>
<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
?>
- <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>
<div class="headermenu"><?php echo $menu ?></div>
- </div>
+ <?php print_container_end(); ?>
<div class="clearer"></div>
<?php } ?>
<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
<?php } ?>
<!-- END OF HEADER -->
<div class="clearer"></div>
- <div id="content">
+ <?php print_container_start(false, '', 'content'); ?>
-<?php print_custom_corners_end(false, 'content'); ?>
-</div> <!-- end div containerContent -->
+<?php print_container_end(); ?><!-- end container Content -->
<!-- START OF FOOTER -->
<?php
- global $CFG, $COURSE;
- if (function_exists('is_in_popup')) {
- $inpopup = is_in_popup();
- } else {
- $inpopup = false;
- }
+
+global $CFG, $COURSE;
+if (function_exists('is_in_popup')) {
+ $inpopup = is_in_popup();
+} else {
+ $inpopup = false;
+}
+
+if (!$inpopup) {
+ print_container_start(false, '', 'footer');
- if (!$inpopup) {
-?>
-<div id="footer">
- <?php print_custom_corners_start(); ?>
-<?php
- if (function_exists('page_doc_link')) {
echo '<p class="helplink">';
echo page_doc_link(get_string('moodledocslink'));
echo '</p>';
- }
-?>
-<?php echo $loggedinas ?>
-<?php echo $homelink;
-?>
- <?php print_custom_corners_end(); ?>
-</div>
-<?php
- $useridarray = array(2 // MD
+
+ echo $loggedinas;
+ echo $homelink;
+
+ $useridarray = array(2 // MD
);
-
- if (!empty($performanceinfo) && isloggedin() && in_array($USER->id, $useridarray)) {
- echo $performanceinfo;
- }
+
+ if (!empty($performanceinfo) && isloggedin() && in_array($USER->id, $useridarray)) {
+ echo $performanceinfo;
+ }
+
+ print_container_end();
+
+} // end if inpopup
- } // end if inpopup
?>
</div> <!-- end page div -->
-<?php
- print_custom_corners_end();
-?>
<script type="text/javascript">
/* <
projects / moodle.git / commitdiff