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

diff --git a/course/lib.php b/course/lib.php
index e05f950ad5de10b222ec44df6e6594c17b01c73d..c17675c558ef2cd5aeded3131e032910f3476bb9 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -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') {

diff --git a/lang/en_utf8/condition.php b/lang/en_utf8/condition.php
index 7aa8121b692613c8ff13506986c93b382c9bcd86..b2d1e2d95e3e8c586ea2f7cafe35baa9e843c0fe 100644 (file)
--- a/lang/en_utf8/condition.php
+++ b/lang/en_utf8/condition.php
@@ -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.';

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 5c5f6edeb3b8df5fd34fab9442005b1608305784..e59a867510a586cdb0a18847224bd707f66817f2 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -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';