Merge branch 'MDL-37537' of git://github.com/srynot4sale/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:26:05 +0000 (10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:26:05 +0000 (10:26 +0800)
1  2 
blocks/completionstatus/details.php

@@@ -202,20 -190,22 +202,20 @@@ if (empty($completions)) 
              $last_type = $row['details']['type'];
              echo $last_type;
  
 -            // Reset agg type
 +            // Reset agg type.
              $agg_type = true;
          } else {
 -            // Display aggregation type
 +            // Display aggregation type.
              if ($agg_type) {
                  $agg = $info->get_aggregation_method($row['type']);
 -
 -                echo '(<i>';
 -
 +                echo '('. html_writer::start_tag('i');
                  if ($agg == COMPLETION_AGGREGATION_ALL) {
-                     echo strtolower(get_string('aggregateall', 'completion'));
+                     echo strtolower(get_string('all', 'completion'));
                  } else {
-                     echo strtolower(get_string('aggregateany', 'completion'));
+                     echo strtolower(get_string('any', 'completion'));
                  }
  
 -                echo '</i> '.strtolower(get_string('required')).')';
 +                echo html_writer::end_tag('i') .strtolower(get_string('required')).')';
                  $agg_type = false;
              }
          }