From 6cba878db85723e76d096cc79681c0867df92781 Mon Sep 17 00:00:00 2001 From: moodler Date: Mon, 14 Feb 2005 16:02:32 +0000 Subject: [PATCH] Bring weekly into line with topics --- course/format/weeks/format.php | 159 +++++++++++++++------------------ 1 file changed, 72 insertions(+), 87 deletions(-) diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php index 0f672e3f3dd..fcc753f92bb 100644 --- a/course/format/weeks/format.php +++ b/course/format/weeks/format.php @@ -28,7 +28,7 @@ } if ($course->newsitems) { - $news = forum_get_course_forum($course->id, "news"); + $news = forum_get_course_forum($course->id, 'news'); } $streditsummary = get_string('editsummary'); @@ -42,10 +42,10 @@ if ($editing) { $strstudents = moodle_strtolower($course->students); - $strweekhide = get_string("weekhide", "", $strstudents); - $strweekshow = get_string("weekshow", "", $strstudents); - $strmoveup = get_string("moveup"); - $strmovedown = get_string("movedown"); + $strweekhide = get_string('weekhide', '', $strstudents); + $strweekshow = get_string('weekshow', '', $strstudents); + $strmoveup = get_string('moveup'); + $strmovedown = get_string('movedown'); } @@ -54,7 +54,7 @@ /// The left column ... - if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) { + if (blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) { echo ''; blocks_print_group($PAGE, $pageblocks[BLOCK_POS_LEFT]); echo ''; @@ -64,23 +64,19 @@ echo ''; print_heading_block(get_string('weeklyoutline'), 'outline'); - print_spacer(8, 1, true); - echo ""; + echo '
'; /// If currently moving a file then show the current clipboard if (ismoving($course->id)) { - $stractivityclipboard = strip_tags(get_string("activityclipboard", "", addslashes($USER->activitycopyname))); - $strcancel= get_string("cancel"); - echo ""; - echo ""; - echo ""; - echo ""; - } + $stractivityclipboard = strip_tags(get_string('activityclipboard', '', addslashes($USER->activitycopyname))); + $strcancel= get_string('cancel'); + echo ''; + echo ''; + echo ''; + } /// Print Section 0 with general activities @@ -88,17 +84,17 @@ $thissection = $sections[$section]; if ($thissection->summary or $thissection->sequence or isediting($course->id)) { - echo ""; - echo ""; - echo "'; + echo ''; + echo '"; - echo ""; - echo ""; + echo ''; + echo ''; + echo ''; + echo ''; + } -/// Now all the weekly sections +/// Now all the normal modules by week +/// Everything below uses "section" terminology - each "section" is a week. + $timenow = time(); $weekdate = $course->startdate; // this should be 0:00 Monday of that week $weekdate += 7200; // Add two hours to avoid possible DST problems @@ -123,7 +122,7 @@ $weekofseconds = 604800; $course->enddate = $course->startdate + ($weekofseconds * $course->numsections); - $strftimedateshort = " ".get_string("strftimedateshort"); + $strftimedateshort = ' '.get_string('strftimedateshort'); while ($weekdate < $course->enddate) { @@ -138,10 +137,10 @@ unset($thissection); $thissection->course = $course->id; // Create a new week structure $thissection->section = $section; - $thissection->summary = ""; + $thissection->summary = ''; $thissection->visible = 1; - if (!$thissection->id = insert_record("course_sections", $thissection)) { - notify("Error inserting new week!"); + if (!$thissection->id = insert_record('course_sections', $thissection)) { + notify('Error inserting new week!'); } } @@ -149,7 +148,7 @@ if (!empty($displaysection) and $displaysection != $section) { // Check this week is visible if ($showsection) { - $sectionmenu["week=$section"] = s("$strweek $section | $weekday - $endweekday"); + $sectionmenu['week='.$section] = s("$strweek $section | $weekday - $endweekday"); } $section++; $weekdate = $nextweekdate; @@ -161,39 +160,31 @@ $currentweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate)); if (!$thissection->visible) { - $colorsides = "class=\"weeklyoutlinesidehidden\""; - $colormain = "class=\"weeklyoutlinecontenthidden\""; + $sectionstyle = ' hidden'; } else if ($currentweek) { - $colorsides = "class=\"weeklyoutlinesidehighlight\""; - $colormain = "class=\"weeklyoutlinecontenthighlight\""; + $sectionstyle = ' current'; } else { - $colorsides = "class=\"weeklyoutlineside\""; - $colormain = "class=\"weeklyoutlinecontent\""; + $sectionstyle = ''; } - echo ""; - echo ""; - - echo "'; + echo ''; + echo '"; + echo '
'.$weekday.' - '.$endweekday.' ('.get_string('notavailable').')
'; } else { - - echo "
$weekday - $endweekday
"; + 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\" />

"; + echo ' '. + '

'; } print_section($course, $thissection, $mods, $modnamesused); @@ -201,65 +192,59 @@ if (isediting($course->id)) { print_section_add_menus($course, $section, $modnames); } - - echo ""; } - echo "'; + + echo '"; - echo ""; - echo ""; + echo ''; + echo ''; } $section++; $weekdate = $nextweekdate; } - echo "
"; - echo "
"; - echo "$stractivityclipboard  (sesskey\">$strcancel)"; - echo "
"; - echo "
\"\"
'; + echo $stractivityclipboard.'  ('.$strcancel.')'; + echo '
 "; + echo '
 '; $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); if (isediting($course->id)) { - echo " id\">pixpath/t/edit.gif\" ". - " border=\"0\" alt=\"$streditsummary\" />

"; + echo ''.$streditsummary.'

'; } print_section($course, $thissection, $mods, $modnamesused); @@ -107,14 +103,17 @@ print_section_add_menus($course, $section, $modnames); } - echo "		"; - echo " 
\"\"
 
"; - echo ""; - echo ""; + echo '
'; + echo ''.$section.''; + echo ''; if (!isteacher($course->id) and !$thissection->visible) { // Hidden for students - echo "
$weekday - $endweekday "; - echo "(".get_string("notavailable").")"; - echo "
"; - echo "		"; - echo ""; + echo ''; if ($displaysection == $section) { - echo "id&week=all\" title=\"$strshowallweeks\">". - "pixpath/i/all.gif\" height=\"25\" width=\"16\" border=\"0\" alt=\"\" />
"; + echo ''. + '
'; } else { $strshowonlyweek = get_string("showonlyweek", "", $section); - echo "id&week=$section\" title=\"$strshowonlyweek\">". - "pixpath/i/one.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />
"; + echo ''. + '
'; } if (isediting($course->id)) { if ($thissection->visible) { // Show the hide/show eye - echo "id&hide=$section&sesskey=$USER->sesskey\" title=\"$strweekhide\">". - "pixpath/i/hide.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />
"; + echo ''. + '
'; } else { - echo "id&show=$section&sesskey=$USER->sesskey\" title=\"$strweekshow\">". - "pixpath/i/show.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />
"; + echo ''. + '
'; } - 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=\"\" />
"; + echo ''. + '
'; } 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 "
\"\"
"; + echo ''; if (!empty($sectionmenu)) { - echo "
"; - echo popup_form("$CFG->wwwroot/course/view.php?id=$course->id&", $sectionmenu, - "sectionmenu", "", get_string("jumpto"), "", "", true); - echo "
"; + echo '
'; + echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&', $sectionmenu, + 'sectionmenu', '', get_string('jumpto'), '', '', true); + echo '
'; } - - echo ""; + echo ''; // The right column - if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) { + if (blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) { echo ''; blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]); if ($editing) { @@ -268,6 +253,6 @@ echo ''; } - echo "\n"; - echo "\n"; + echo ''; + ?>