mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-46874-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2014-08-25 22:10:09 +02:00
commit f438b03fdc
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grade/report/grader/lib.php
View File

@ -939,7 +939,7 @@ class grade_report_grader extends grade_report {
$hidden = '';
if ($grade->is_hidden()) {
$hidden = ' hidden ';
$hidden = ' dimmed_text ';
}
$gradepass = ' gradefail ';
@ -1284,7 +1284,7 @@ class grade_report_grader extends grade_report {
$hidden = '';
if ($item->is_hidden()) {
$hidden = ' hidden ';
$hidden = ' dimmed_text ';
}
$formattedrange = $item->get_formatted_range($rangesdisplaytype, $rangesdecimalpoints);

10
grade/report/user/lib.php
View File

@ -380,7 +380,7 @@ class grade_report_user extends grade_report {
/// Hidden Items
if ($grade_grade->grade_item->is_hidden()) {
$hidden = ' hidden';
$hidden = ' dimmed_text';
}
$hide = false;
@ -461,7 +461,7 @@ class grade_report_user extends grade_report {
$data['grade']['content'] = get_string('submittedon', 'grades', userdate($grade_grade->get_datesubmitted(), get_string('strftimedatetimeshort')));
} elseif ($grade_grade->is_hidden()) {
$data['grade']['class'] = $class.' hidden';
$data['grade']['class'] = $class.' dimmed_text';
$data['grade']['content'] = '-';
} else {
$data['grade']['class'] = $class;
@ -493,7 +493,7 @@ class grade_report_user extends grade_report {
$data['percentage']['class'] = $class.' gradingerror';
$data['percentage']['content'] = get_string('error');
} else if ($grade_grade->is_hidden()) {
$data['percentage']['class'] = $class.' hidden';
$data['percentage']['class'] = $class.' dimmed_text';
$data['percentage']['content'] = '-';
} else {
$data['percentage']['class'] = $class;
@ -508,7 +508,7 @@ class grade_report_user extends grade_report {
$data['lettergrade']['class'] = $class.' gradingerror';
$data['lettergrade']['content'] = get_string('error');
} else if ($grade_grade->is_hidden()) {
$data['lettergrade']['class'] = $class.' hidden';
$data['lettergrade']['class'] = $class.' dimmed_text';
if (!$this->canviewhidden) {
$data['lettergrade']['content'] = '-';
} else {
@ -527,7 +527,7 @@ class grade_report_user extends grade_report {
$data['rank']['class'] = $class.' gradingerror';
$data['rank']['content'] = get_string('error');
} elseif ($grade_grade->is_hidden()) {
$data['rank']['class'] = $class.' hidden';
$data['rank']['class'] = $class.' dimmed_text';
$data['rank']['content'] = '-';
} else if (is_null($gradeval)) {
// no grade, no rank

3
grade/report/user/styles.css
View File

@ -5,8 +5,6 @@
#graded_users_selector {float: right;text-align: right;}
/* this must be last if we want to override other category and course item colors */
.path-grade-report-user .user-grade .hidden,
.path-grade-report-user .user-grade .hidden a {color:#aaaaaa;}
.user-grade {border: 1px solid black;margin: auto;padding: 0.25em;font-size: 0.8em;}
.user-grade td {margin: 1px;padding: 0.25em;min-width: 2em;vertical-align: top;}
.user-grade thead {border-bottom: 3px double black;}
@ -53,7 +51,6 @@
.user-grade td.item,
.user-grade th.item {border-left: 1px solid gray;border-right: 1px solid gray}
.user-grade td.excluded {background-color: #666;}
.user-grade td.hidden {color: #aaa;}
.user-grade td.feedbacktext {max-width:600px;padding:2px 2px;}
.pagelayout-report .user-grade .feedbacktext .no-overflow {overflow:auto;padding:0.25em;}