L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-17695 Added accessible text to dimmed activities. (Also bugfix for MDL-15499)

Browse Source
This commit is contained in:
sam_marshall
2008-12-19 10:51:33 +00:00
parent ee1efe0b0f
commit 85f55ba239
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/lib.php
+32 -10
View File
@@ -1389,8 +1389,20 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
}
if (isset($modinfo->cms[$modnumber])) {
// We can continue (because it will not be displayed at all)
// if:
// 1) The activity is not visible to users
// and
// 2a) The 'showavailability' option is not set (if that is set,
// we need to display the activity so we can show
// availability info)
// or
// 2b) The 'availableinfo' is empty, i.e. the activity was
// hidden in a way that leaves no info, such as using the
// eye icon.
if (!$modinfo->cms[$modnumber]->uservisible &&
empty($modinfo->cms[$modnumber]->showavailability)) {
(empty($modinfo->cms[$modnumber]->showavailability) ||
empty($modinfo->cms[$modnumber]->availableinfo))) {
// visibility shortcut
continue;
}
@@ -1426,7 +1438,8 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
if ($mod->modname == "label") {
if (!$mod->visible || !$mod->uservisible) {
echo "<div class=\"dimmed_text\">";
echo '<div class="dimmed_text"><span class="accesshide">'.
get_string('hiddenfromstudents').'</span></div>';
}
echo format_text($extra, FORMAT_HTML, $labelformatoptions);
if (!$mod->visible) {
@@ -1475,11 +1488,19 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
// about visibility, without the actual link
if($mod->uservisible) {
// Display normal module link
$linkcss = $mod->visible ? "" : " class=\"dimmed\" ";
echo '<a '.$linkcss.' '.$extra. // Title unnecessary!
' href="'.$CFG->wwwroot.'/mod/'.$mod->modname.'/view.php?id='.$mod->id.'">'.
'<img src="'.$icon.'" class="activityicon" alt="" /> <span>'.
$instancename.$altname.'</span></a>';
if($mod->visible) {
$linkcss='';
$accesstext='';
} else {
$linkcss = ' class="dimmed" ';
$accesstext='<span class="accesshide">'.
get_string('hiddenfromstudents').': </span>';
}
echo '<a '.$linkcss.' '.$extra.
' href="'.$CFG->wwwroot.'/mod/'.$mod->modname.'/view.php?id='.$mod->id.'">'.
'<img src="'.$icon.'" class="activityicon" alt="" /> '.
$accesstext.'<span>'.$instancename.$altname.'</span></a>';
if (!empty($CFG->enablegroupings) && !empty($mod->groupingid) && has_capability('moodle/course:managegroups', get_context_instance(CONTEXT_COURSE, $course->id))) {
if (!isset($groupings)) {
@@ -1489,9 +1510,10 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
}
} else {
// Display greyed-out text of link
echo '<span class="dimmed_text" '.$extra.' >'.
'<img src="'.$icon.'" class="activityicon" alt="" /> <span>'.
$instancename.$altname.'</span></span>';
echo '<span class="dimmed_text" '.$extra.' ><span class="accesshide">'.
get_string('notavailableyet','condition').': </span>'.
'<img src="'.$icon.'" class="activityicon" alt="" /> <span>'.
$instancename.$altname.'</span></span>';
}
}
if ($usetracking && $mod->modname == 'forum') {
lang/en_utf8/condition.php
+1
View File
@@ -17,6 +17,7 @@ $string['completioncondition']='Activity completion condition';
$string['help_conditiondates']='available dates';
$string['help_showavailability']='display of unavailable activities';
$string['none']='(none)';
$string['notavailableyet']='Not available yet';
$string['requires_completion_0']='Not available unless the activity <strong>$a</strong> is incomplete.';
$string['requires_completion_1']='Not available until the activity <strong>$a</strong> is marked complete.';
$string['requires_completion_2']='Not available until the activity <strong>$a</strong> is complete and passed.';
lang/en_utf8/moodle.php
+1
View File
@@ -801,6 +801,7 @@ $string['helpwiththis'] = 'Help with this';
$string['helpwiki'] = 'How to write Wiki-like text';
$string['helpwriting'] = 'Write carefully';
$string['hiddenassign'] = 'Hidden assignment';
$string['hiddenfromstudents'] = 'Hidden from students';
$string['hiddensections'] = 'Hidden sections';
$string['hiddensectionscollapsed'] = 'Hidden sections are shown in collapsed form';
$string['hiddensectionsinvisible'] = 'Hidden sections are completely invisible';