moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-mdl-36736' of git://github.com/rajeshtaneja/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-12-17 12:08:57 +08:00
commit 8ca70aff14
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
course/lib.php
View file

@ -1694,17 +1694,20 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
if (!$mod->uservisible) { if (!$mod->uservisible) {
echo '<div class="availabilityinfo">'.$mod->availableinfo.'</div>'; echo '<div class="availabilityinfo">'.$mod->availableinfo.'</div>';
} else if ($canviewhidden && !empty($CFG->enableavailability)) { } else if ($canviewhidden && !empty($CFG->enableavailability)) {
$visibilityclass = ''; // Don't add availability information if user is not editing and activity is hidden.
if (!$mod->visible) { if ($mod->visible || $PAGE->user_is_editing()) {
$visibilityclass = 'accesshide'; $hidinfoclass = '';
} if (!$mod->visible) {
$ci = new condition_info($mod); $hidinfoclass = 'hide';
$fullinfo = $ci->get_full_information(); }
if($fullinfo) { $ci = new condition_info($mod);
echo '<div class="availabilityinfo '.$visibilityclass.'">'.get_string($mod->showavailability $fullinfo = $ci->get_full_information();
? 'userrestriction_visible' if($fullinfo) {
: 'userrestriction_hidden','condition', echo '<div class="availabilityinfo '.$hidinfoclass.'">'.get_string($mod->showavailability
$fullinfo).'</div>'; ? 'userrestriction_visible'
: 'userrestriction_hidden','condition',
$fullinfo).'</div>';
}
} }
} }

4
course/yui/toolboxes/toolboxes.js vendored
View file

@ -37,7 +37,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
CONDITIONALHIDDEN : 'conditionalhidden', CONDITIONALHIDDEN : 'conditionalhidden',
AVAILABILITYINFODIV : 'div.availabilityinfo', AVAILABILITYINFODIV : 'div.availabilityinfo',
SHOWCLASS : 'editing_show', SHOWCLASS : 'editing_show',
ACCESSHIDECLASS : 'accesshide' HIDECLASS : 'hide'
}; };
/** /**
@ -99,7 +99,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
var availabilityinfo = element.one(CSS.AVAILABILITYINFODIV); var availabilityinfo = element.one(CSS.AVAILABILITYINFODIV);
if (availabilityinfo) { if (availabilityinfo) {
availabilityinfo.toggleClass(CSS.ACCESSHIDECLASS); availabilityinfo.toggleClass(CSS.HIDECLASS);
} }
return value; return value;
}, },