From 4d07f1c87ea2d7e2b1b95c0229d132e823910dae Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Thu, 9 Apr 2009 12:26:11 +0000
Subject: [PATCH] MDL-17273 Added a back button to the error message and fixed
 missing handling of "custom" scope

---
 grade/edit/outcome/import.php    | 17 +++++++++++++----
 theme/standard/styles_layout.css |  5 +++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/grade/edit/outcome/import.php b/grade/edit/outcome/import.php
index fb5a6127dcb..5fe029333a8 100644
--- a/grade/edit/outcome/import.php
+++ b/grade/edit/outcome/import.php
@@ -101,7 +101,7 @@ if ($imported_file['userfile']['size'] == 0) {
 }
 
 /// which scope are we importing the outcomes in?
-if (isset($courseid) && ($scope  == 'local')) {
+if (isset($courseid) && ($scope  == 'local' || $scope == 'custom')) {
     // custom scale
     $local_scope = true;
 } elseif (($scope == 'global') && has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) {
@@ -148,7 +148,10 @@ if ($handle = fopen($imported_file['userfile']['tmp_name'], 'r')) {
                 }
             }
             if ($error) {
-                print_box(get_string('importoutcomenofile', 'grades', $line));
+                print_box_start('generalbox importoutcomenofile');
+                echo get_string('importoutcomenofile', 'grades', $line);
+                echo print_single_button($CFG->wwwroot.'/grade/edit/outcome/index.php', array('id'=> $courseid), get_string('back'), 'get', '_self', true);
+                print_box_end();
                 $fatal_error = true;
                 break;
             }
@@ -164,7 +167,10 @@ if ($handle = fopen($imported_file['userfile']['tmp_name'], 'r')) {
         // sanity check #2: every line must have the same number of columns as there are
         // headers.  If not, processing stops.
         if ( count($csv_data) != count($file_headers) ) {
-            print_box(get_string('importoutcomenofile', 'grades', $line));
+            print_box_start('generalbox importoutcomenofile');
+            echo get_string('importoutcomenofile', 'grades', $line);
+            echo print_single_button($CFG->wwwroot.'/grade/edit/outcome/index.php', array('id'=> $courseid), get_string('back'), 'get', '_self', true);
+            print_box_end();
             $fatal_error = true;
             //print_box(var_export($csv_data, true) ."<br />". var_export($header, true));
             break;
@@ -173,7 +179,10 @@ if ($handle = fopen($imported_file['userfile']['tmp_name'], 'r')) {
         // sanity check #3: all required fields must be present on the current line.
         foreach ($headers as $header => $position) {
             if ($csv_data[$imported_headers[$header]] == '') {
-                print_box(get_string('importoutcomenofile', 'grades', $line));
+                print_box_start('generalbox importoutcomenofile');
+                echo get_string('importoutcomenofile', 'grades', $line);
+                echo print_single_button($CFG->wwwroot.'/grade/edit/outcome/index.php', array('id'=> $courseid), get_string('back'), 'get', '_self', true);
+                print_box_end();
                 $fatal_error = true;
                 break;
             }
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 5b0595e6e11..f006e466db8 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2227,6 +2227,11 @@ div.allcoursegrades {
     text-align: right;
     padding: 4px 0px 5px 0px;
 }
+
+.importoutcomenofile .singlebutton {
+    text-align: center;
+    margin-top: 5px;
+}
 /* gradebook edit tree */
 
 .grade-edit-tree .gradetreebox {