diff --git a/course/format/social/format.php b/course/format/social/format.php index ca658c76197..9ba376ef52c 100644 --- a/course/format/social/format.php +++ b/course/format/social/format.php @@ -1,6 +1,6 @@ -dirroot/mod/forum/lib.php"); require_once("$CFG->dirroot/mod/resource/lib.php"); @@ -22,16 +22,16 @@ $strgroupmy = get_string("groupmy"); $editing = isediting($course->id); - echo ''; + echo '
id="layout-table"'; echo ''; if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) { - echo ''; } - echo "
'; + echo ''; blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]); echo '"; + echo ''; if ($social = forum_get_course_forum($course->id, "social")) { if (forum_is_subscribed($USER->id, $social->id)) { $subtext = get_string("unsubscribe", "forum"); @@ -55,7 +55,7 @@ // The right column if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) { - echo ''; + echo ''; blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]); if ($editing && !empty($missingblocks)) { blocks_print_adminblock($PAGE, $missingblocks); diff --git a/course/format/topics/format.php b/course/format/topics/format.php index a54cca31e8f..903517ccccf 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -57,20 +57,20 @@ /// Layout the whole page as three big columns. - echo ""; + echo "
"; echo "\n"; /// The left column ... if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) { - echo ''; } /// Start main column - echo '
'; + echo ''; blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]); echo ''; + echo ''; print_heading_block(get_string("topicoutline"), "100%", "outlineheadingblock"); print_spacer(8, 1, true); @@ -271,7 +271,7 @@ // The right column if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) { - echo ''; + echo ''; blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]); if ($editing && !empty($missingblocks)) { blocks_print_adminblock($PAGE, $missingblocks); diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php index 3b54b5b7223..f8e07aa8c57 100644 --- a/course/format/weeks/format.php +++ b/course/format/weeks/format.php @@ -48,20 +48,20 @@ /// Layout the whole page as three big columns. - echo ""; + echo "
"; echo "\n"; /// The left column ... if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) { - echo ''; } /// Start main column - echo '"; - + echo ""; - + } else { - + echo "

$weekday - $endweekday

"; - + $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); - + if (isediting($course->id)) { echo " id\">". "pixpath/t/edit.gif\" height=\"11\" width=\"11\" border=\"0\" />

"; } - + print_section($course, $thissection, $mods, $modnamesused); - + if (isediting($course->id)) { print_section_add_menus($course, $section, $modnames); } - + echo ""; } echo ""; echo ""; @@ -257,7 +257,7 @@ // The right column if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) { - echo '
'; + echo ''; blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]); echo ''; + echo ''; print_heading_block(get_string("weeklyoutline"), "100%", "outlineheadingblock"); print_spacer(8, 1, true); @@ -172,33 +172,33 @@ echo ""; echo "

$section

"; echo "		"; - + if (!isteacher($course->id) and !$thissection->visible) { // Hidden for students echo "

$weekday - $endweekday "; echo "(".get_string("notavailable").")"; echo "

"; echo "		"; @@ -212,7 +212,7 @@ echo "id&week=$section\" title=\"$strshowonlyweek\">". "pixpath/i/one.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />
"; } - + if (isediting($course->id)) { if ($thissection->visible) { // Show the hide/show eye echo "id&hide=$section&sesskey=$USER->sesskey\" title=\"$strweekhide\">". @@ -221,19 +221,19 @@ echo "id&show=$section&sesskey=$USER->sesskey\" title=\"$strweekshow\">". "pixpath/i/show.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />
"; } - + if ($section > 1) { // Add a arrow to move section up echo "id&section=$section&move=-1&sesskey=$USER->sesskey\" title=\"$strmoveup\">". "pixpath/t/up.gif\" vspace=\"3\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" />
"; } - + if ($section < $course->numsections) { // Add a arrow to move section down echo "id&section=$section&move=1&sesskey=$USER->sesskey\" title=\"$strmovedown\">". "pixpath/t/down.gif\" vspace=\"3\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" />
"; } - + } - + echo ""; echo "
'; + echo ''; blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]); if ($editing && !empty($missingblocks)) { blocks_print_adminblock($PAGE, $missingblocks);