mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 08:26:37 +02:00
MDL-12221 custom themes revisited - implemented container concept; merged from MOODLE_19_STABLE
This commit is contained in:
skodak
parent
220f149cfc
commit
9f7f1a74a0
48 changed files with 653 additions and 732 deletions
|
|
@ -1,10 +1,6 @@
|
|||
<?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
|
||||
|
|
@ -32,14 +28,14 @@
|
|||
|
||||
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'));
|
||||
|
|
@ -52,15 +48,15 @@
|
|||
} else {
|
||||
notify('Could not find or create a social forum here');
|
||||
}
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_end();
|
||||
print_container_end();
|
||||
echo '</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>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +1,38 @@
|
|||
<?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);
|
||||
|
||||
if ($topic != -1) {
|
||||
$displaysection = course_set_display($course->id, $topic);
|
||||
} else {
|
||||
if (isset($USER->display[$course->id])) { // for admins, mostly
|
||||
if (isset($USER->display[$course->id])) {
|
||||
$displaysection = $USER->display[$course->id];
|
||||
} else {
|
||||
$displaysection = course_set_display($course->id, 0);
|
||||
|
|
@ -45,81 +42,97 @@
|
|||
$context = get_context_instance(CONTEXT_COURSE, $course->id);
|
||||
|
||||
if (($marker >=0) && has_capability('moodle/course:setcurrentsection', $context) && confirm_sesskey()) {
|
||||
$course->marker = $marker;
|
||||
if (! set_field("course", "marker", $marker, "id", $course->id)) {
|
||||
error("Could not mark that topic for this course");
|
||||
}
|
||||
$course->marker = $marker;
|
||||
if (! set_field("course", "marker", $marker, "id", $course->id)) {
|
||||
error("Could not mark that topic for this course");
|
||||
}
|
||||
}
|
||||
|
||||
$streditsummary = get_string('editsummary');
|
||||
$stradd = get_string('add');
|
||||
$stractivities = get_string('activities');
|
||||
$streditsummary = get_string('editsummary');
|
||||
$stradd = get_string('add');
|
||||
$stractivities = get_string('activities');
|
||||
$strshowalltopics = get_string('showalltopics');
|
||||
$strtopic = get_string('topic');
|
||||
$strgroups = get_string('groups');
|
||||
$strgroupmy = get_string('groupmy');
|
||||
$editing = $PAGE->user_is_editing();
|
||||
$strgroups = get_string('groups');
|
||||
$strgroupmy = get_string('groupmy');
|
||||
$editing = $PAGE->user_is_editing();
|
||||
|
||||
if ($editing) {
|
||||
$strstudents = moodle_strtolower($course->students);
|
||||
$strtopichide = get_string('topichide', '', $strstudents);
|
||||
$strtopicshow = get_string('topicshow', '', $strstudents);
|
||||
$strmarkthistopic = get_string('markthistopic');
|
||||
$strmarkedthistopic = get_string('markedthistopic');
|
||||
$strmoveup = get_string('moveup');
|
||||
$strmarkthistopic = get_string('markthistopic');
|
||||
$strmarkedthistopic = get_string('markedthistopic');
|
||||
$strmoveup = get_string('moveup');
|
||||
$strmovedown = get_string('movedown');
|
||||
}
|
||||
|
||||
/* Internet Explorer min-width fix. (See theme/standard/styles_layout.css: min-width for Firefox.)
|
||||
Window width: 800px, Firefox 763px, IE 752px. (Window width: 640px, Firefox 602px, IE 588px.)
|
||||
*/
|
||||
?>
|
||||
|
||||
/// Layout the whole page as three big columns.
|
||||
echo '<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);
|
||||
|
|
@ -127,20 +140,18 @@
|
|||
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";
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -169,14 +180,14 @@
|
|||
|
||||
$showsection = (has_capability('moodle/course:viewhiddensections', $context) or $thissection->visible or !$course->hiddensections);
|
||||
|
||||
if (!empty($displaysection) and $displaysection != $section) {
|
||||
if (!empty($displaysection) and $displaysection != $section) { // Check this topic is visible
|
||||
if ($showsection) {
|
||||
$strsummary = strip_tags(format_string($thissection->summary,true));
|
||||
if (strlen($strsummary) < 57) {
|
||||
$strsummary = ' - '.$strsummary;
|
||||
} else {
|
||||
$strsummary = ' - '.substr($strsummary, 0, 60).'...';
|
||||
}
|
||||
$strsummary = strip_tags(format_string($thissection->summary,true));
|
||||
if (strlen($strsummary) < 57) {
|
||||
$strsummary = ' - '.$strsummary;
|
||||
} else {
|
||||
$strsummary = ' - '.substr($strsummary, 0, 60).'...';
|
||||
}
|
||||
$sectionmenu['topic='.$section] = s($section.$strsummary);
|
||||
}
|
||||
$section++;
|
||||
|
|
@ -197,20 +208,63 @@
|
|||
$sectionstyle = '';
|
||||
}
|
||||
|
||||
echo '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
|
||||
echo '<td class="left side">'.$currenttext.$section.'</td>';
|
||||
echo '<li id="section-'.$section.'" class="section main'.$sectionstyle.'" >'; //'<div class="left side"> </div>';
|
||||
|
||||
echo '<td class="content">';
|
||||
if (!has_capability('moodle/course:viewhiddensections', $context) and !$thissection->visible) { // Hidden for students
|
||||
echo get_string('notavailable');
|
||||
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" class="icon" alt="'.$strshowalltopics.'" /></a><br />';
|
||||
} else {
|
||||
$strshowonlytopic = get_string("showonlytopic", "", $section);
|
||||
echo '<a href="view.php?id='.$course->id.'&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.'&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" 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" 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" 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" 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;
|
||||
echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
|
||||
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" alt="'.$streditsummary.'" /></a><br /><br />';
|
||||
'<img src="'.$CFG->pixpath.'/t/edit.gif" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
|
||||
}
|
||||
echo '</div>';
|
||||
|
||||
|
|
@ -220,54 +274,14 @@
|
|||
print_section_add_menus($course, $section, $modnames);
|
||||
}
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
echo '<td 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 />';
|
||||
} else {
|
||||
$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 />';
|
||||
}
|
||||
|
||||
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 ($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 />';
|
||||
} 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 />';
|
||||
}
|
||||
|
||||
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 />';
|
||||
}
|
||||
|
||||
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 />';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
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">';
|
||||
|
|
@ -276,23 +290,9 @@
|
|||
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>';
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -27,10 +27,6 @@
|
|||
|
||||
require_once($CFG->libdir.'/ajax/ajaxlib.php');
|
||||
|
||||
if (!empty($THEME->customcorners)) {
|
||||
require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
|
||||
}
|
||||
|
||||
$week = optional_param('week', -1, PARAM_INT);
|
||||
|
||||
if ($week != -1) {
|
||||
|
|
@ -78,22 +74,25 @@
|
|||
/// The left column ...
|
||||
|
||||
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
|
||||
print_container_start();
|
||||
echo '<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();
|
||||
|
||||
|
|
@ -280,9 +279,7 @@
|
|||
echo '</div>';
|
||||
}
|
||||
|
||||
if (!empty($THEME->customcorners)) print_custom_corners_end();
|
||||
|
||||
echo '</div>';
|
||||
print_container_end();
|
||||
|
||||
echo '</div>';
|
||||
echo '<div class="clearer"></div>';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue