MDL-9268

Added language strings for grade item edit form.
Fixed HTML error in grader report.
Added tabs to category edit page.

diff --git a/grade/report/grader/category.php b/grade/report/grader/category.php
index afe944f999a43a365625a6adf1698fc9fe2e61a9..cef9fc9c608e133a893e937dce3672295071a0dd 100644 (file)
--- a/grade/report/grader/category.php
+++ b/grade/report/grader/category.php
@@ -153,6 +153,12 @@ switch ($action) {
 
 print_header_simple($strgrades . ': ' . $strgraderreport, ': ' . $strcategoriesedit, $navigation, '', '', true, '', navmenu($course));
 
+print_heading(get_string('categoriesedit', 'grades'));
+
+// Add tabs
+$currenttab = 'editcategory'; 
+include('tabs.php');
+
 print_box_start('gradetreebox generalbox');
 echo '<ul id="grade_tree">';
 print_grade_tree($gtree->top_element, $moving);

diff --git a/grade/report/grader/edit_item_form.php b/grade/report/grader/edit_item_form.php
index 0a30edb3b4d0cf09bddedf05ab440837d8d4bdc1..518b426cda5a6332f663b8da7b18483b4c41d7e8 100644 (file)
--- a/grade/report/grader/edit_item_form.php
+++ b/grade/report/grader/edit_item_form.php
@@ -27,7 +27,7 @@ class edit_item_form extends moodleform {
         $options = array(GRADE_TYPE_NONE=>get_string('typenone', 'grades'),
                           GRADE_TYPE_VALUE=>get_string('typevalue', 'grades'),
                           GRADE_TYPE_SCALE=>get_string('typescale', 'grades'),
-                          GRADE_TYPE_TEXT=>get_string('typetyxt', 'grades'));
+                          GRADE_TYPE_TEXT=>get_string('typetext', 'grades'));
         $mform->addElement('select', 'gradetype', get_string('gradetype', 'grades'), $options);
         $mform->setDefault('gradetype', GRADE_TYPE_VALUE);
 
@@ -120,4 +120,4 @@ class edit_item_form extends moodleform {
     }
 
 }
-?>
\ No newline at end of file
+?>

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index 4598209a250249752f4a9006514e8f4ac48c74fa..6fca7eaf47168af6f6fa20fdbc25369b0732932f 100644 (file)
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -305,13 +305,15 @@ foreach ($gtree->levels as $key=>$row) {
             $headerhtml .= '<td class="'.$type.$catlevel.'" '.$colspan.'>&nbsp;</td>';
 
         } else if ($type == 'category') {
-            $headerhtml .= '<td class="category'.$catlevel.'" '.$colspan.'">'.$element['object']->get_name();
+            $headerhtml .= '<td class="category'.$catlevel.'" '.$colspan.'>'.$element['object']->get_name();
 
             // Print icons
             if ($USER->gradeediting) {
-                $headerhtml .= grade_get_icons($element, $gtree) . '</td>';
+                $headerhtml .= grade_get_icons($element, $gtree); 
             }
 
+            $headerhtml .= '</td>';
+
         } else {
             if ($element['object']->id == $sortitemid) {
                 if ($sortorder == 'ASC') {

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 9ef73aaa9e63216ebe448d1d2941e4e0ad85cc68..eb109f9fbbde72afdbf5fb2ce8fa1fb8c7bf5693 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -6,12 +6,15 @@ $string['addcategory'] = 'Add Category';
 $string['addcategoryerror'] = 'Could not add category.';
 $string['addexceptionerror'] = 'Error occurred while adding exception for userid:gradeitem';
 $string['addfeedback'] = 'Add Feedback';
+$string['additem'] = 'Add Grade Item';
 $string['allgrades'] = 'All grades by category';
 $string['allstudents'] = 'All Students';
+$string['autosort'] = 'Auto-sort';
 $string['average'] = 'Average';
 $string['badgrade'] = 'Supplied grade is invalid';
 $string['baduser'] = 'Supplied user is invalid';
 $string['bonuspoints'] = 'Bonus Points';
+$string['calculation'] = 'Calculation';
 $string['categories'] = 'Categories';
 $string['category'] = 'Category';
 $string['categoriesedit'] = 'Edit Categories';
@@ -63,11 +66,18 @@ $string['gradeitems'] = 'Grade Items';
 $string['gradeletter'] = 'Grade Letter';
 $string['gradeletterhelp'] = 'Grade Letter Help';
 $string['gradeletternote'] = 'To delete a grade letter just empty any of the<br /> three text areas for that letter and click submit.';
+$string['grademax'] = 'Maximum grade';
+$string['grademin'] = 'Minimum grade';
+$string['gradepass'] = 'Grade to Pass';
+$string['itemsedit'] = 'Edit Grade Item';
+$string['multfactor'] = 'Multiplicator';
+$string['plusfactor'] = 'Offset';
 $string['gradepreferences'] = 'Grade Preferences';
 $string['gradepreferenceshelp'] = 'Grade Preferences Help';
 $string['grades'] = 'Grades';
 $string['gradereports'] = 'Grades report';
 $string['graderreport'] = 'Grader report';
+$string['gradetype'] = 'Grade Type';
 $string['gradeweighthelp'] = 'Grade Weight Help';
 $string['hideadvanced'] = 'Hide Advanced Features';
 $string['hidecategory'] = 'Hidden';
@@ -83,11 +93,15 @@ $string['importsuccess'] = 'Grade import success';
 $string['importxml'] = 'Import XML';
 $string['incorrectcourseid'] = 'Course ID was incorrect';
 $string['item'] = 'Item';
+$string['iteminfo'] = 'Item Info';
+$string['itemname'] = 'Item Name';
 $string['items'] = 'Items';
 $string['lettergrade'] = 'Letter Grade';
 $string['lettergradenonnumber'] = 'Low and/or High grade were non-numeric for';
 $string['letters'] = 'Letters';
 $string['lock'] = 'Lock';
+$string['locked'] = 'Locked';
+$string['locktime'] = 'Locked until';
 $string['lowest'] = 'Lowest';
 $string['lowgradeletter'] = 'Low';
 $string['mapfrom'] = 'Map from';
@@ -113,6 +127,7 @@ $string['nonweightedpct'] = 'non-weighted %%';
 $string['noselectedcategories'] = 'no categories were selected.';
 $string['noselecteditems'] = 'no items were selected.';
 $string['notteachererror'] = 'You must be a teacher to use this feature.';
+$string['outcome'] = 'Outcome';
 $string['pctoftotalgrade'] = '%% of total grade';
 $string['percent'] = 'Percent';
 $string['percentascending'] = 'Sort by percent ascending';
@@ -151,16 +166,23 @@ $string['stats'] = 'Statistics';
 $string['statslink'] = 'Stats';
 $string['student'] = 'Student';
 $string['subcategory'] = 'Normal Category';
+$string['synclegacygrades'] = 'Synchronise legacy grades';
 $string['topcategory'] = 'Super Category';
 $string['total'] = 'Total';
 $string['totalweight100'] = 'The total weight is equal to 100';
 $string['totalweightnot100'] = 'The total weight is not equal to 100';
 $string['turnfeedbackoff'] = 'Turn feedback off';
 $string['turnfeedbackon'] = 'Turn feedback on';
+$string['typenone'] = 'None';
+$string['typescale'] = 'Scale';
+$string['typetext'] = 'Text';
+$string['typevalue'] = 'Value';
 $string['uncategorised'] = 'Uncategorised';
 $string['unlock'] = 'Unlock';
 $string['uploadgrades'] = 'Upload grades';
 $string['useadvanced'] = 'Use Advanced Features';
+$string['usenooutcome'] = 'Use no outcome';
+$string['usenoscale'] = 'Use no scale';
 $string['usepercent'] = 'Use Percent';
 $string['userreport'] = 'User grade report';
 $string['useweighted'] = 'Use Weighted';

diff --git a/lib/grade/grade_object.php b/lib/grade/grade_object.php
index 9b5b4282708133533471b96261382ee267ba9dbb..4f0beb6299e251a93c835a7b35124c83628aabd2 100644 (file)
--- a/lib/grade/grade_object.php
+++ b/lib/grade/grade_object.php
@@ -82,7 +82,7 @@ class grade_object {
      * @return object grade_object instance or false if none found.
      */
     function fetch($params) {
-        error('Abstract method fetch() not overrided in '.get_class($this));
+        error('Abstract method fetch() not overridden in '.get_class($this));
     }
 
     /**
@@ -93,7 +93,7 @@ class grade_object {
      * @return array array of grade_object insatnces or false if none found.
      */
     function fetch_all($params) {
-        error('Abstract method fetch_all() not overrided in '.get_class($this));
+        error('Abstract method fetch_all() not overridden in '.get_class($this));
     }
 
     /**