MDL-9628 More category collapse updates

diff --git a/grade/report/grader/version.php b/grade/report/grader/version.php
index bc50921317420f9e98dc16e2eaf11cbbb7372d6e..36f52ca7ab556ecc995e64ed1ed85a696cd9c06d 100644 (file)
--- a/grade/report/grader/version.php
+++ b/grade/report/grader/version.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-$plugin->version  = 2007080900;
-$plugin->requires = 2007080103;
+$plugin->version  = 2007081001;
+$plugin->requires = 2007081001;
 
 ?>

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index f2e782750120ef0c2facbf0d9ad93896dbccafe7..f9ce85d5d6ff51831ecb4c4c1b577c519949b621 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -58,7 +58,7 @@ $string['changesitedefaults'] = 'Change site defaults';
 $string['choosecategory'] = 'Select Category';
 $string['compact'] = 'Compact';
 $string['configaggregationposition'] = 'The position of the aggregation column in the grader report table, in reference to the real grades.';
-$string['configaggregationview'] = 'The way aggregations are displayed: either alongside the real grades, or in a compact form in which only one type is shown in the table at once: the real grades OR the aggregated grades.';
+$string['configaggregationview'] = 'Each category can be displayed in three ways: Full mode (aggregated column and grade item columns), the aggregated column only, or the grade items alone.';
 $string['configaveragesdecimalpoints'] = 'The number of decimal points to display for each average (group or whole), below a column of grades. This can be overriden per grading item.';
 $string['configaveragesdisplaytype'] = 'Specifies how to display the averages for each column in the grader report. The default and recommended value is Inherit, which first checks the display type of each column, and if such is not set explicitly, defaults to the more general Grade Display Type. If other display types are selected, they ignore the individual settings for each column, and use exclusively the selected type.';
 $string['configbulkcheckboxes'] = 'Checkboxes near each grade for Bulk grade operations.';

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 5ccf6d6304dfcbe6b2ef00ab46874aeec951b680..747ab19fdb104e5a5cee5560c54b5357d60c0366 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -70,7 +70,7 @@ define('GRADE_REPORT_AGGREGATION_POSITION_LEFT', 0);
 define('GRADE_REPORT_AGGREGATION_POSITION_RIGHT', 1);
 define('GRADE_REPORT_AGGREGATION_VIEW_FULL', 0);
 define('GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY', 1);
-define('GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY', 1);
+define('GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY', 2);
 define('GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL', 0);
 define('GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE', 1);
 define('GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER', 2);

diff --git a/version.php b/version.php
index 577c94a3be68dd5da697fb8e8e209c411a6f7539..cdbae7e09bf8be01d034e1ab2abccbdf61887414 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007081000;  // YYYYMMDD = date
+    $version = 2007081001;  // YYYYMMDD = date
                             //       XY = increments within a single day
 
     $release = '1.9 dev';   // Human-friendly version name