Partial fix of reopened MDL-7436 Accessibility: "Indicate type of resource in the...

diff --git a/course/lib.php b/course/lib.php
index 9ea5061781ba2c0838c090c592d9776e3bcd8990..3ad961bc1042735a6a126842e83292c94b93cb7c 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1397,19 +1397,13 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                     }
 
                 } else { // Normal activity
-                
-                    if (!empty($USER->screenreader)) {
-                        $typestring = '('.get_string('modulename',$mod->modname).') ';
-                    } else {
-                        $typestring = '';
-                    }
-                
+
                     $linkcss = $mod->visible ? "" : " class=\"dimmed\" ";
-                    echo '<img src="'.$icon.'"'.
-                         ' class="activityicon" alt="'.$mod->modfullname.'" />'.
-                         ' <a title="'.$mod->modfullname.'" '.$linkcss.' '.$extra.
+                    echo '<a title="'.$mod->modfullname.'" '.$linkcss.' '.$extra.
                          ' href="'.$CFG->wwwroot.'/mod/'.$mod->modname.'/view.php?id='.$mod->id.'">'.
-                         $typestring.$instancename.'</a>';
+                         '<img src="'.$icon.'"'.
+                         ' class="activityicon" alt="'.$mod->modfullname.'" /> '.
+                         $instancename.'</a>';
                 }
                 if ($usetracking && $mod->modname == 'forum') {
                     $groupmode = groups_get_course_groupmode($course, $mod);
@@ -1752,6 +1746,7 @@ function print_category_info($category, $depth, $files = false) {
 }
 
 
+
 function print_courses($category) {
 /// Category is 0 (for all courses) or an object
 
@@ -2889,4 +2884,4 @@ function update_course($data) {
     return false;
 }
 
-?>
+?>
\ No newline at end of file