From 84e47a8a3ba92ad5a2d53e84bc3dff64e74de0f8 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 20 Nov 2012 13:40:25 +0800 Subject: [PATCH] MDL-36707 Course: set conditionalhidden class properly, so it doesn't overlap with dimmed class --- course/lib.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/course/lib.php b/course/lib.php index 7c050940f22..4143375bc7f 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1484,15 +1484,16 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, $modcontext = context_module::instance($mod->id); $canviewhidden = has_capability('moodle/course:viewhiddenactivities', $modcontext); $accessiblebutdim = false; + $conditionalhidden = false; if ($canviewhidden) { $accessiblebutdim = !$mod->visible; if (!empty($CFG->enableavailability)) { - $accessiblebutdim = $accessiblebutdim || - $mod->availablefrom > time() || + $conditionalhidden = $mod->availablefrom > time() || ($mod->availableuntil && $mod->availableuntil < time()) || count($mod->conditionsgrade) > 0 || count($mod->conditionscompletion) > 0; } + $accessiblebutdim = $conditionalhidden || $accessiblebutdim; } $liclasses = array(); @@ -1548,8 +1549,12 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, $linkclasses = ''; $textclasses = ''; if ($accessiblebutdim) { - $linkclasses .= ' dimmed conditionalhidden'; - $textclasses .= ' dimmed_text conditionalhidden'; + $linkclasses .= ' dimmed'; + $textclasses .= ' dimmed_text'; + if ($conditionalhidden) { + $linkclasses .= ' conditionalhidden'; + $textclasses .= ' conditionalhidden'; + } $accesstext = ''. get_string('hiddenfromstudents').': '; } else { -- 2.43.0