From 89eacee7a225a0ca4d3617eea263375f41593596 Mon Sep 17 00:00:00 2001
From: John Beedell <john.beedell@open.ac.uk>
Date: Thu, 13 Oct 2016 10:07:36 +0100
Subject: [PATCH] MDL-56395 Gradebook: Make long item titles more accessible

---
 grade/lib.php                  | 8 +++++---
 grade/report/grader/lib.php    | 2 +-
 grade/report/grader/styles.css | 8 ++++++++
 lang/en/grades.php             | 2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/grade/lib.php b/grade/lib.php
index 29838740421..9dacc0b7123 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -1542,7 +1542,8 @@ class grade_structure {
             $header .= $this->get_element_icon($element, $spacerifnone);
         }
 
-        $header .= $element['object']->get_name($fulltotal);
+        $title = $element['object']->get_name($fulltotal);
+        $header .= $title;
 
         if ($element['type'] != 'item' and $element['type'] != 'categoryitem' and
             $element['type'] != 'courseitem') {
@@ -1552,11 +1553,12 @@ class grade_structure {
         if ($withlink && $url = $this->get_activity_link($element)) {
             $a = new stdClass();
             $a->name = get_string('modulename', $element['object']->itemmodule);
+            $a->title = $title;
             $title = get_string('linktoactivity', 'grades', $a);
 
-            $header = html_writer::link($url, $header, array('title' => $title));
+            $header = html_writer::link($url, $header, array('title' => $title, 'class' => 'gradeitemheader'));
         } else {
-            $header = html_writer::span($header);
+            $header = html_writer::span($header, 'gradeitemheader', array('title' => $title, 'tabindex' => '0'));
         }
 
         if ($withdescription) {
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 18e7c16e37b..994a25a7d92 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -877,7 +877,7 @@ class grade_report_grader extends grade_report {
                     }
 
                     $itemcell->colspan = $colspan;
-                    $itemcell->text = shorten_text($headerlink) . $arrow . $singleview;
+                    $itemcell->text = $headerlink . $arrow . $singleview;
                     $itemcell->header = true;
                     $itemcell->scope = 'col';
 
diff --git a/grade/report/grader/styles.css b/grade/report/grader/styles.css
index 8f79305a91d..3e5468601e9 100644
--- a/grade/report/grader/styles.css
+++ b/grade/report/grader/styles.css
@@ -98,6 +98,14 @@
     vertical-align: middle;
 }
 
+.path-grade-report-grader .gradeitemheader {
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 200px;
+    vertical-align: bottom;
+}
+
 /**
  * The additional user fields.
  */
diff --git a/lang/en/grades.php b/lang/en/grades.php
index d1a39252087..41f91c3649f 100644
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -436,7 +436,7 @@ $string['letterreal'] = 'Letter (real)';
 $string['letters'] = 'Letters';
 $string['linkedactivity'] = 'Linked activity';
 $string['linkedactivity_help'] = 'This setting specifies an activity to which this outcome item is linked. This may be used to measure student performance on criteria not assessed by the activity grade.';
-$string['linktoactivity'] = 'Link to {$a->name} activity';
+$string['linktoactivity'] = 'Link to {$a->name} activity {$a->title}';
 $string['lock'] = 'Lock';
 $string['locked'] = 'Locked';
 $string['locked_help'] = 'If ticked, grades can no longer be automatically updated by the related activity.';