From 06959cfca200d15a03769ec5bcd7a80d5a0498ec Mon Sep 17 00:00:00 2001 From: moodler Date: Mon, 14 Feb 2005 15:36:46 +0000 Subject: [PATCH] New shorted class names, better nested --- course/format/topics/format.php | 44 +++++++++++++++------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/course/format/topics/format.php b/course/format/topics/format.php index 18932e145eb..22e4624d6c1 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -63,7 +63,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 ''; @@ -73,16 +73,15 @@ echo ''; print_heading_block(get_string('topicoutline'), '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 ''; @@ -94,9 +93,9 @@ $thissection = $sections[$section]; if ($thissection->summary or $thissection->sequence or isediting($course->id)) { - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; - echo ''; + echo ''; echo ''; - echo ''; + echo ''; } @@ -164,27 +163,24 @@ $currenttopic = ($course->marker == $section); if (!$thissection->visible) { - $colorsides = 'topicsoutlinesidehidden'; - $colormain = 'topicsoutlinecontenthidden'; + $sectionstyle = ' hidden'; } else if ($currenttopic) { - $colorsides = 'topicsoutlinesidehighlight'; - $colormain = 'topicsoutlinecontenthighlight'; + $sectionstyle = ' current'; } else { - $colorsides = 'topicsoutlineside'; - $colormain = 'topicsoutlinecontent'; + $sectionstyle = ''; } - echo ''; - echo ''; + echo ''; if (!isteacher($course->id) and !$thissection->visible) { // Hidden for students - echo ''; } else { - echo ''; } - echo ''; - echo ''; + echo ''; } $section++; @@ -251,7 +247,7 @@ echo '
'; + echo '
'; echo $stractivityclipboard.'  ('.$strcancel.')'; echo '
 '; + echo '
 '; $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); @@ -114,9 +113,9 @@ } echo '  
 
'; + echo '
'; echo ''.$section.''; echo ''; + echo ''; echo get_string('notavailable'); echo ''; + echo ''; $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); @@ -202,7 +198,7 @@ echo ''; + echo ''; if ($displaysection == $section) { // Show the zoom boxes echo ''. @@ -243,7 +239,7 @@ } echo '
 
'; if (!empty($sectionmenu)) { - echo '
'; + echo '
'; echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&', $sectionmenu, 'sectionmenu', '', get_string('jumpto'), '', '', true); echo '
'; @@ -261,7 +257,7 @@ 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) {