From d121490949c171586e5952e5a2d1b7648151f5f0 Mon Sep 17 00:00:00 2001 From: skodak Date: Sun, 28 Oct 2007 12:51:16 +0000 Subject: [PATCH] MDL-11718 report styles moved to report/xx/styles.php - for better consistency with other plugins; other cleanup in user report css; fixed css in user profile --- course/user.php | 2 + grade/report/grader/styles.php | 156 +++++++++++++++++++++++++++++++ grade/report/user/lib.php | 52 ++++++----- grade/report/user/styles.php | 15 +++ theme/standard/styles_color.css | 23 +---- theme/standard/styles_fonts.css | 23 ----- theme/standard/styles_layout.css | 139 --------------------------- 7 files changed, 203 insertions(+), 207 deletions(-) create mode 100644 grade/report/grader/styles.php create mode 100644 grade/report/user/styles.php diff --git a/course/user.php b/course/user.php index b45d9403b3..2a78196209 100644 --- a/course/user.php +++ b/course/user.php @@ -87,11 +87,13 @@ $report = new grade_report_user($course->id, $gpr, $context, $user->id); // print the page + echo '
'; // css fix to share styles with real report page print_heading(get_string('modulename', 'gradereport_user'). ' - '.fullname($report->user)); if ($report->fill_table()) { echo $report->print_table(true); } + echo '
'; } break; diff --git a/grade/report/grader/styles.php b/grade/report/grader/styles.php new file mode 100644 index 0000000000..8e9c17ba0e --- /dev/null +++ b/grade/report/grader/styles.php @@ -0,0 +1,156 @@ + +.grade-report-grader .catlevel1 { + background-color: #ffffff; +} +.grade-report-grader .catlevel2 { + background-color: #eeeeee; +} +.grade-report-grader .catlevel3 { + background-color: #dddddd; +} + +.grade-report-grader td.overridden { + background-color: #dddddd; +} + +.grade-report-grader .gradestable tr.avg td.cell { + background-color: #efefff; +} + +.grade-report-grader .gradestable tr.groupavg td.cell { + background-color: #efffef; +} + +.grade-report-grader .gradestable tr.groupavg td.cell { + font-weight: bold; + color: #006400; +} + +.grade-report-grader .gradestable tr.avg td.cell { + font-weight: bold; + color: #00008B; +} + +.grade-report-grader .gradestable td.cat, +.grade-report-grader .gradestable td.course { + font-weight: bold; +} + + +.grade-report-grader table { + border-width:1px; + border-style:solid; + margin-top: 20px; +} + +.grade-report-grader #overDiv table { + margin: 0; +} + +.grade-report-grader #overDiv table td.feedback { + border: 0px; +} +.grade-report-grader #overDiv .feedback { + background-color: #AABBFF; + color: #000000; + font-family: Verdana; + font-size: 70%; + font-weight: normal; +} + +.grade-report-grader #overDiv .caption { + background-color: #5566CC; + color: #CCCCFF; + font-family: Arial; + font-size: 70%; + font-weight: bold; +} + +.grade-report-grader div.submit { + margin-top: 20px; + text-align: center; +} + +.grade-report-grader table td { + border-width:1px; + border-style:solid; +} + +.grade-report-grader tr.heading { + border-width:0px 0px 0px 0px; + border-style:solid; +} + +.grade-report-grader .heading td { + border-width:0px 0px 0px 0px; + border-style:solid; +} + +.grade-report-grader th.category { + border-width:1px 1px 0px 1px; + border-style:solid; +} + +.grade-report-grader th.user { + border-width:0px 0px 1px 0px; + border-style:solid; +} + +.grade-report-grader th.categoryitem, +.grade-report-grader th.courseitem, +.grade-report-grader td.topleft { + border-width:0px 1px 0px 1px; + border-style:solid; +} + +.grade-report-grader td.fillerfirst { + border-width:0px 0px 0px 1px; + border-style:solid; +} + +.grade-report-grader td.fillerlast { + border-width:0px 1px 0px 0px; + border-style:solid; +} + +.grade-report-grader th.item { + border-width:1px 1px 1px 1px; + border-style:solid; +} + +.grade-report-grader div.gradertoggle { + display: inline; + margin-left: 20px; +} + +.grade-report-grader table.gradestable { + margin-left:auto; + margin-right:auto; +} + +.grade-report-grader .gradestable th.user { + text-align:left; +} + +.grade-report-grader .gradestable td { + text-align:right; +} + +.grade-report-grader th.range { + border-width:1px 1px 1px 1px; + border-style:solid; +} + +.grade-report-grader .userpic { + display: inline; + margin-right: 10px; +} + +.grade-report-grader .quickfeedback { + border: #000000 1px dashed; +} + +.grade-report-grader #siteconfiglink { + text-align: right; +} + diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php index 833b42fe00..b2120922cc 100644 --- a/grade/report/user/lib.php +++ b/grade/report/user/lib.php @@ -80,7 +80,7 @@ class grade_report_user extends grade_report { $switch = grade_get_setting($this->courseid, 'aggregationposition', $CFG->grade_aggregationposition); - // Grab the grade_tree for this course + // Grab the grade_seq for this course $this->gseq = new grade_seq($this->courseid, $switch); // get the user (for full name) @@ -90,9 +90,7 @@ class grade_report_user extends grade_report { $this->baseurl = $CFG->wwwroot.'/grade/report?id='.$courseid.'&userid='.$userid; $this->pbarurl = $this->baseurl; - // always setup groups - no user preference here - $this->setup_groups(); - + // no groups on this report - rank is from all course users $this->setup_table(); } @@ -102,9 +100,9 @@ class grade_report_user extends grade_report { function setup_table() { global $CFG; /* - * Table has 5-6 columns - *| pic | itemname/description | grade (grade_final) | percentage | rank (optional) | feedback | - */ + * Table has 5-6 columns + *| itemname/description | final grade | percentage final grade | rank (optional) | feedback | + */ // setting up table headers if ($this->showrank) { @@ -179,6 +177,13 @@ class grade_report_user extends grade_report { continue; } + $class = 'gradeitem'; + if ($grade_item->is_course_item()) { + $class = 'courseitem'; + } else if ($grade_item->is_category_item()) { + $class = 'categoryitem'; + } + if (in_array($itemid, $unknown)) { $gradeval = null; } else if (array_key_exists($itemid, $altered)) { @@ -191,14 +196,14 @@ class grade_report_user extends grade_report { /// prints grade item name if ($grade_item->is_course_item() or $grade_item->is_category_item()) { - $data[] = '
'.$grade_item->get_name().'
'; + $data[] = ''.$grade_item->get_name().''; } else { - $data[] = '
'.$this->get_module_link($grade_item->get_name(), $grade_item->itemmodule, $grade_item->iteminstance).'
'; + $data[] = ''.$this->get_module_link($grade_item->get_name(), $grade_item->itemmodule, $grade_item->iteminstance).''; } /// prints category $cat = $grade_item->get_parent_category(); - $data[] = $cat->get_name(); + $data[] = ''.$cat->get_name().''; /// prints the grade if ($grade_grade->is_excluded()) { @@ -208,34 +213,34 @@ class grade_report_user extends grade_report { } if ($grade_item->needsupdate) { - $data[] = ''.get_string('error').''; + $data[] = ''.get_string('error').''; } else if (!empty($CFG->grade_hiddenasdate) and !is_null($grade_grade->finalgrade) and !$canviewhidden and $grade_grade->is_hidden() and !$grade_item->is_category_item() and !$grade_item->is_course_item()) { // the problem here is that we do not have the time when grade value was modified, 'timemodified' is general modification date for grade_grades records - $data[] = $excluded . '
'.get_string('gradedon', 'grades', userdate($grade_grade->timemodified, get_string('strftimedatetimeshort'))).'
'; + $data[] = ''.$excluded.get_string('gradedon', 'grades', userdate($grade_grade->timemodified, get_string('strftimedatetimeshort'))).''; } else { - $data[] = $excluded . grade_format_gradevalue($gradeval, $grade_item, true); + $data[] = ''.$excluded.grade_format_gradevalue($gradeval, $grade_item, true); } /// prints percentage if ($grade_item->needsupdate) { - $data[] = ''.get_string('error').''; + $data[] = ''.get_string('error').''; } else { - $data[] = grade_format_gradevalue($gradeval, $grade_item, true, GRADE_DISPLAY_TYPE_PERCENTAGE); + $data[] = ''.grade_format_gradevalue($gradeval, $grade_item, true, GRADE_DISPLAY_TYPE_PERCENTAGE).''; } /// prints rank if ($this->showrank) { // TODO: this is broken if hidden grades present!! if ($grade_item->needsupdate) { - $data[] = ''.get_string('error').''; + $data[] = ''.get_string('error').''; } else if (is_null($gradeval)) { // no grade, no rank - $data[] = '-'; + $data[] = '-';; } else { /// find the number of users with a higher grade @@ -245,19 +250,16 @@ class grade_report_user extends grade_report { AND itemid = {$grade_item->id}"; $rank = count_records_sql($sql) + 1; - $data[] = "$rank/$numusers"; + $data[] = ''."$rank/$numusers".''; } } - /// prints notes - if (empty($grade_grade->feedback)) { - $data[] = ' '; - - } else if (!$canviewhidden and $grade_grade->is_hidden()) { - $data[] = ' '; + /// prints feedback + if (empty($grade_grade->feedback) or (!$canviewhidden and $grade_grade->is_hidden())) { + $data[] = '
 
'; } else { - $data[] = format_text($grade_grade->feedback, $grade_grade->feedbackformat); + $data[] = '
'.format_text($grade_grade->feedback, $grade_grade->feedbackformat).'
'; } $this->table->add_data($data); diff --git a/grade/report/user/styles.php b/grade/report/user/styles.php new file mode 100644 index 0000000000..ef0d94065e --- /dev/null +++ b/grade/report/user/styles.php @@ -0,0 +1,15 @@ + +.grade-report-user .gradeddate { + font-size: 0.7em; +} + +.grade-report-user .courseitem, +.grade-report-user .categoryitem { + font-weight: bold; +} + +.grade-report-user table#user-grade td.cell { + padding-left: 5px; + padding-right: 5px; +} + diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css index 03e42872f1..65bdfc7b30 100644 --- a/theme/standard/styles_color.css +++ b/theme/standard/styles_color.css @@ -680,29 +680,12 @@ body#grade-index .grades .r1 { background-color: #f0f0f0; } -/* new grades css*/ +/* grade edit */ -.grade-report-grader .catlevel1 { - background-color: #ffffff; -} -.grade-report-grader .catlevel2 { - background-color: #eeeeee; -} -.grade-report-grader .catlevel3 { - background-color: #dddddd; -} - -.grade-report-grader td.overridden { - background-color: #dddddd; +.grade-edit-tree .moving { + background-color: #E8EEF7; } -.grade-report-grader .gradestable tr.avg td.cell { - background-color: #efefff; -} - -.grade-report-grader .gradestable tr.groupavg td.cell { - background-color: #efffef; -} /*** *** Login ***/ diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css index 07da3c2e3a..14b03d202e 100644 --- a/theme/standard/styles_fonts.css +++ b/theme/standard/styles_fonts.css @@ -495,29 +495,6 @@ body#grade-index .grades .header { font-size: 0.7em; } -.grade-report-grader .gradestable tr.groupavg td.cell { - font-weight: bold; - color: #006400; -} - -.grade-report-grader .gradestable tr.avg td.cell { - font-weight: bold; - color: #00008B; -} - -.grade-report-grader .gradestable td.cat, -.grade-report-grader .gradestable td.course { - font-weight: bold; -} - -.grade-report-user .gradeddate { - font-size: 0.7em; -} - -.grade-report-user .catname { - font-weight: bold; -} - /*** *** Login ***/ diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index 51ba3a0807..0d63f2fa61 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -2120,137 +2120,6 @@ body#doc-contents ul { *** Grades ***/ - -.grade-report-grader table { - border-width:1px; - border-style:solid; - margin-top: 20px; -} - -.grade-report-grader #overDiv table { - margin: 0; -} - -.grade-report-grader #overDiv table td.feedback { - border: 0px; -} -.grade-report-grader #overDiv .feedback { - background-color: #AABBFF; - color: #000000; - font-family: Verdana; - font-size: 70%; - font-weight: normal; -} - -.grade-report-grader #overDiv .caption { - background-color: #5566CC; - color: #CCCCFF; - font-family: Arial; - font-size: 70%; - font-weight: bold; -} - -.grade-report-grader div.submit { - margin-top: 20px; - text-align: center; -} - -.grade-report-grader table td { - border-width:1px; - border-style:solid; -} - -.grade-report-grader tr.heading { - border-width:0px 0px 0px 0px; - border-style:solid; -} - -.grade-report-grader .heading td { - border-width:0px 0px 0px 0px; - border-style:solid; -} - -.grade-report-grader th.category { - border-width:1px 1px 0px 1px; - border-style:solid; -} - -.grade-report-grader th.user { - border-width:0px 0px 1px 0px; - border-style:solid; -} - -.grade-report-grader th.categoryitem, -.grade-report-grader th.courseitem, -.grade-report-grader td.topleft { - border-width:0px 1px 0px 1px; - border-style:solid; -} - -.grade-report-grader td.fillerfirst { - border-width:0px 0px 0px 1px; - border-style:solid; -} - -.grade-report-grader td.fillerlast { - border-width:0px 1px 0px 0px; - border-style:solid; -} - -.grade-report-grader th.item { - border-width:1px 1px 1px 1px; - border-style:solid; -} - -.grade-report-grader div.gradertoggle { - display: inline; - margin-left: 20px; -} - -.grade-report-grader table.gradestable { - margin-left:auto; - margin-right:auto; -} - -.grade-report-grader .gradestable th.user { - text-align:left; -} - -.grade-report-grader .gradestable td { - text-align:right; -} - -.grade-report-grader th.range { - border-width:1px 1px 1px 1px; - border-style:solid; -} - -.grade-report-grader .userpic { - display: inline; - margin-right: 10px; -} - -.grade-report-grader .quickfeedback { - border: #000000 1px dashed; -} - -.grade-report-user table#user-grade td.cell { - padding-right: 10px; -} - -.popupfeedback { - background-color: #FFFFFF; - border: #000000 1px dashed; -} - -.gradebook_feedback { - display: block; - color: yellow; -} - -.gradebook_feedback_caption { - font-size: 2em; -} /* scales edit */ .grade-edit-scale .buttons { @@ -2317,10 +2186,6 @@ body#doc-contents ul { margin-bottom: 6px; } -.grade-edit-tree .moving { - background-color: #E8EEF7; -} - .grade-edit-tree .iconsmall { margin-left: 4px; } @@ -2329,10 +2194,6 @@ body#doc-contents ul { text-align: center; } -.grade-report-grader #siteconfiglink { - text-align: right; -} - .gradeexportlink { padding: 2em; text-align: center; -- 2.39.5