mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-17273 Added a back button to the error message and fixed missing handling of "custom" scope. Merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
nicolasconnault 2009-04-09 12:29:54 +00:00
parent 522a8ac88c
commit 0000badd05
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grade/edit/outcome/import.php
View File

@ -142,7 +142,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;
}
@ -158,7 +161,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;
@ -167,7 +173,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;
}

5
theme/standard/styles_layout.css
View File

@ -2577,6 +2577,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 {