mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
	theme/upgrade.txt
This commit is contained in:
Damyon Wiese 2013-09-10 09:39:06 +08:00
commit b4c6b42eb6
11 changed files with 310 additions and 977 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -783,7 +783,7 @@ class grade_report_grader extends grade_report {
$headerlink = $this->gtree->get_element_header($element, true, $this->get_pref('showactivityicons'), false);
$itemcell = new html_table_cell();
$itemcell->attributes['class'] = $type . ' ' . $catlevel . ' highlightable';
$itemcell->attributes['class'] = $type . ' ' . $catlevel . ' highlightable'. ' i'. $element['object']->id;
if ($element['object']->is_hidden()) {
$itemcell->attributes['class'] .= ' dimmed_text';
@ -891,7 +891,7 @@ class grade_report_grader extends grade_report {
$eid = $this->gtree->get_grade_eid($grade);
$element = array('eid'=>$eid, 'object'=>$grade, 'type'=>'grade');
$itemcell->attributes['class'] .= ' grade';
$itemcell->attributes['class'] .= ' grade i'.$itemid;
if ($item->is_category_item()) {
$itemcell->attributes['class'] .= ' cat';
}
@ -1226,7 +1226,7 @@ class grade_report_grader extends grade_report {
$eid = $this->gtree->get_item_eid($item);
$element = $this->gtree->locate_element($eid);
$itemcell = new html_table_cell();
$itemcell->attributes['class'] = 'controls icons';
$itemcell->attributes['class'] = 'controls icons i'.$itemid;
$itemcell->text = $this->get_icons($element);
$iconsrow->cells[] = $itemcell;
}
@ -1252,8 +1252,7 @@ class grade_report_grader extends grade_report {
foreach ($this->gtree->items as $itemid=>$unused) {
$item =& $this->gtree->items[$itemid];
$itemcell = new html_table_cell();
$itemcell->header = true;
$itemcell->attributes['class'] .= ' header range';
$itemcell->attributes['class'] .= ' range i'. $itemid;
$hidden = '';
if ($item->is_hidden()) {
@ -1371,6 +1370,7 @@ class grade_report_grader extends grade_report {
if ($item->needsupdate) {
$avgcell = new html_table_cell();
$avgcell->attributes['class'] = 'i'. $itemid;
$avgcell->text = $OUTPUT->container(get_string('error'), 'gradingerror');
$avgrow->cells[] = $avgcell;
continue;
@ -1414,6 +1414,7 @@ class grade_report_grader extends grade_report {
if (!isset($sumarray[$item->id]) || $meancount == 0) {
$avgcell = new html_table_cell();
$avgcell->attributes['class'] = 'i'. $itemid;
$avgcell->text = '-';
$avgrow->cells[] = $avgcell;
@ -1428,6 +1429,7 @@ class grade_report_grader extends grade_report {
}
$avgcell = new html_table_cell();
$avgcell->attributes['class'] = 'i'. $itemid;
$avgcell->text = $gradehtml.$numberofgrades;
$avgrow->cells[] = $avgcell;
}

11
grade/report/grader/module.js
View File

@ -183,18 +183,19 @@ M.gradereport_grader.classes.report.prototype.table_highlight_row = function (e,
tr.all('.cell').toggleClass('hmarked');
};
/**
* Highlights a cell in the table
* Highlights a column in the table
*
* @function
* @param {Event} e
* @param {Y.Node} cell
*/
M.gradereport_grader.classes.report.prototype.table_highlight_column = function(e, cell) {
var column = 0;
while (cell = cell.previous('.cell')) {
column += parseFloat(cell.getAttribute('colspan')) || 1;
// Among cell classes find the one that matches pattern / i[\d]+ /
var itemclass = (' '+cell.getAttribute('class')+' ').match(/ (i[\d]+) /);
if (itemclass) {
// Toggle class .vmarked for all cells in the table with the same class
this.table.all('.cell.'+itemclass[1]).toggleClass('vmarked');
}
this.table.all('.c'+column).toggleClass('vmarked');
};
/**
* Builds an object containing information at the relevant cell given either

632
grade/report/grader/styles.css
View File

@ -1,393 +1,347 @@
.path-grade-report-grader .flexible th {
white-space:normal;
white-space: normal;
}
.gradestable {
margin-bottom:0;
margin-bottom: 0;
}
.gradestable th.user img {
width:20px;
height:20px;
width: 20px;
height: 20px;
}
.gradestable th img {
vertical-align: text-bottom;
padding-bottom: 0;
}
.gradestable th .grade_icons { margin-top: .3em; }
.gradestable th img.sorticon { margin-left: .3em; }
.dir-rtl .gradestable th img.sorticon { margin-left: 0; margin-right: .3em; }
.gradestable th .grade_icons {
margin-top: .3em;
}
.gradestable th img.sorticon {
margin-left: .3em;
}
.dir-rtl .gradestable th img.sorticon {
margin-left: 0;
margin-right: .3em;
}
table#user-grades .catlevel2 {
background-color:#f9f9f9;
background-color: #f9f9f9;
}
table#user-grades tr.range td.cell {
font-weight: 700;
}
table#user-grades tr.avg td.cell {
background-color:#efefff;
font-weight:700;
color:#00008B;
background-color: #efefff;
font-weight: 700;
color: #00008B;
}
table#user-grades tr.odd td.cell {
background-color:#efefef;
white-space:nowrap;
background-color: #efefef;
white-space: nowrap;
}
table#user-grades tr td.overridden {
background-color: #F3E4C0;
}
table#user-grades tr.odd td.overridden {
background-color: #EFD9A4;
}
table#user-grades tr td.ajaxoverridden {
background-color: #FFE3A0;
}
table#user-grades tr.odd td.ajaxoverridden {
background-color: #FFDA83;
}
table#user-grades tr td.overridden {background-color:#F3E4C0;}
table#user-grades tr.odd td.overridden {background-color:#EFD9A4;}
table#user-grades tr td.ajaxoverridden {background-color:#FFE3A0;}
table#user-grades tr.odd td.ajaxoverridden {background-color:#FFDA83;}
table#user-grades tr.even td.excluded {
background-color:#EABFFF;
background-color: #EABFFF;
}
table#user-grades tr.odd td.excluded {
background-color:#E5AFFF;
background-color: #E5AFFF;
}
table#user-grades tr.odd th.header {
background-color:#efefef;
background-image:none;
background-color: #efefef;
background-image: none;
}
table#user-grades tr.even th.header {
background-image: none;
}
table#user-grades tr.groupavg td.cell {
background-color:#efffef;
font-weight:700;
color:#006400;
background-color: #efffef;
font-weight: 700;
color: #006400;
}
table#user-grades td.cat,
table#user-grades td.course {
font-weight:700;
font-weight: 700;
}
table#user-grades {
font-size:10px;
width:auto;
background-color:transparent;
border-style:solid;
border-width:1px;
margin:20px 0 0;
font-size: 10px;
width: auto;
background-color: transparent;
border-style: solid;
border-width: 1px;
margin: 20px 0 0;
}
.path-grade-report-grader #overDiv table {
margin:0;
margin: 0;
}
.path-grade-report-grader #overDiv table td.feedback {
border:0;
border: 0;
}
.path-grade-report-grader #overDiv .feedback {
font-size:70%;
background-color:#ABF;
color:#000;
font-family:Verdana;
font-weight:400;
font-size: 70%;
background-color: #ABF;
color: #000;
font-family: Verdana;
font-weight: 400;
}
.path-grade-report-grader #overDiv .caption {
font-size:70%;
background-color:#56C;
color:#CCF;
font-family:Arial;
font-weight:700;
font-size: 70%;
background-color: #56C;
color: #CCF;
font-family: Arial;
font-weight: 700;
}
.path-grade-report-grader #overDiv .intersection {
font-size:70%;
background-color:#ABF;
color:#000;
font-family:Verdana;
font-weight:400;
font-size: 70%;
background-color: #ABF;
color: #000;
font-family: Verdana;
font-weight: 400;
}
.path-grade-report-grader #overDiv .intersectioncaption {
background-color:#56C;
color:#CCF;
font-family:Arial;
font-weight:700;
background-color: #56C;
color: #CCF;
font-family: Arial;
font-weight: 700;
}
.path-grade-report-grader div.submit {
margin-top:20px;
text-align:center;
margin-top: 20px;
text-align: center;
}
table#user-grades td {
text-align:right;
border-style:solid;
border-width:0 1px 1px 0;
text-align: right;
border-style: solid;
border-width: 0 1px 1px 0;
}
table#user-grades th.category {
vertical-align:top;
border-style:solid;
border-width:1px 1px 0;
vertical-align: top;
border-style: solid;
border-width: 1px 1px 0;
}
table#user-grades th.user {
text-align:left;
border-style:solid;
border-width:0 0 1px;
text-align: left;
border-style: solid;
border-width: 1px 0;
}
table#user-grades th.userfield {
border-style:solid;
border-width:0 0 1px 1px;
border-style: solid;
border-width: 1px;
}
table#user-grades th.categoryitem,
table#user-grades td.topleft {
vertical-align: bottom;
border-style:solid;
border-width:0 1px;
vertical-align: bottom;
border-style: solid;
border-width: 0 1px;
}
.path-grade-report-grader td,.path-grade-report-grader th {
border-color:#CECECE;
border-color: #CECECE;
}
.path-grade-report-grader table#participants th {
vertical-align:top;
width:auto;
vertical-align: top;
width: auto;
}
table#user-grades td.fillerfirst {
border-style:solid;
border-width:0 0 0 1px;
border-style: solid;
border-width: 0 0 0 1px;
}
table#user-grades td.fillerlast {
border-style:solid;
border-width:0 1px 0 0;
border-style: solid;
border-width: 0 1px 0 0;
}
table#user-grades th.item ,
table#user-grades th.item,
table#user-grades th.categoryitem,
table#user-grades th.courseitem {
border-bottom-color:#000;
vertical-align:bottom;
border-style:solid;
border-width:1px;
border-bottom-color: #000;
vertical-align: bottom;
border-style: solid;
border-width: 1px;
}
div.gradertoggle {
display:inline;
margin-left:20px;
display: inline;
margin-left: 20px;
}
table#user-grades th.range {
text-align:right;
border-style:solid;
border-width:1px;
text-align: right;
border-style: solid;
border-width: 1px;
}
table#user-grades .userpic {
display:inline;
margin-right:10px;
display: inline;
margin-right: 10px;
}
table#user-grades .quickfeedback {
border:1px dashed #000;
margin-left: 10px;
border: 1px dashed #000;
margin-left: 10px;
}
.dir-rtl table#user-grades .quickfeedback {
margin-left: 0;
margin-right: 10px;
}
.dir-rtl table#user-grades .quickfeedback { margin-left: 0; margin-right: 10px;}
.path-grade-report-grader #siteconfiglink {
text-align:right;
text-align: right;
}
table#user-grades .datesubmitted {
font-size:.7em;
font-size: .7em;
}
table#user-grades td.cell {
padding-left:5px;
padding-right:5px;
vertical-align:middle;
padding-left: 5px;
padding-right: 5px;
vertical-align: middle;
}
.path-grade-report-grader table {
border-collapse:collapse;
background-color:#fff;
border-color:#cecece;
border-collapse: collapse;
background-color: #fff;
border-color: #cecece;
}
.path-grade-report-grader th {
padding:1px 10px;
padding: 1px 10px;
}
.path-grade-report-grader span.inclusion-links {
margin:0 5px 0 10px;
margin: 0 5px 0 10px;
}
table#user-grades .item {
background-color:#e9e9e9;
background-color: #e9e9e9;
}
.path-grade-report-grader table tr.odd th.header {
background-color:#efefef;
background-image:none;
border-width:0 0 1px;
background-color: #efefef;
background-image: none;
border-width: 0 0 1px;
}
.path-grade-report-grader table tr.heading th.header {
border-top:1px solid #cecece;
border-top: 1px solid #cecece;
}
table#user-grades tr.heading th.categoryitem,
table#user-grades tr.heading th.courseitem {
border-width:0 0 0 1px;
border-width: 0 0 0 1px;
}
table#user-grades th.category.header.catlevel1 {
vertical-align:top;
border-style:solid;
border-width:1px 1px 0 0;
vertical-align: top;
border-style: solid;
border-width: 1px 1px 0 0;
}
.path-grade-report-grader div.left_scroller th.user a {
vertical-align:middle;
margin:0;
padding:0;
vertical-align: middle;
margin: 0;
padding: 0;
}
table#user-grades th.categoryitem,
table#user-grades th.courseitem,
.path-grade-report-grader table td.topleft {
vertical-align:bottom;
border-color:#cecece #cecece #000;
border-style:solid;
border-width:0 1px 1px;
vertical-align: bottom;
border-color: #cecece #cecece #000;
border-style: solid;
border-width: 0 1px 1px;
}
.path-grade-report-grader table td.topleft {
border-bottom:0;
border-bottom: 0;
}
table#user-grades td.topleft {
background-color:#fff;
background-color: #fff;
}
.path-grade-report-grader th.user img.userpicture {
border:3px double #cecece;
vertical-align:top;
width:2.7em;
height:2.7em;
margin-right:10px;
border: 3px double #cecece;
vertical-align: top;
width: 2.7em;
height: 2.7em;
margin-right: 10px;
}
.path-grade-report-grader a.quickedit {
line-height:1em;
display:block;
float:right;
clear:none;
font-size:9px;
background-color:transparent;
margin:.1em 0 0;
line-height: 1em;
display: block;
float: right;
clear: none;
font-size: 9px;
background-color: transparent;
margin: .1em 0 0;
}
.path-grade-report-grader a.quickedit2 {
display:block;
float:right;
clear:none;
background-color:transparent;
margin:1.3em 0 0;
display: block;
float: right;
clear: none;
background-color: transparent;
margin: 1.3em 0 0;
}
.path-grade-report-grader table#quick_edit {
border:1px solid #cecece;
margin:0 auto;
border: 1px solid #cecece;
margin: 0 auto;
}
.path-grade-report-grader table#quick_edit td {
vertical-align:middle;
border:1px solid #cecece;
text-align:left;
margin:0;
padding:5px;
vertical-align: middle;
border: 1px solid #cecece;
text-align: left;
margin: 0;
padding: 5px;
}
.path-grade-report-grader table#quick_edit td img {
border:3px double #cecece;
vertical-align:middle;
padding:0;
border: 3px double #cecece;
vertical-align: middle;
padding: 0;
}
.path-grade-report-grader td input.text {
border:1px solid #666;
border: 1px solid #666;
}
.path-grade-report-grader td input.submit {
margin: 10px 10px 0px 10px;
margin: 10px 10px 0px 10px;
}
.path-grade-report-grader table#quick_edit td.fullname {
border-left:0;
padding-left:5px;
border-left: 0;
padding-left: 5px;
}
.path-grade-report-grader table#quick_edit td.picture {
border-right:0;
border-right: 0;
}
.path-grade-report-grader table#quick_edit td.finalgrade input {
width:5em;
width: 5em;
}
.path-grade-report-grader h1 {
text-align:center;
clear:both;
text-align: center;
clear: both;
}
.path-grade-report-grader input.center {
margin:10px auto 0;
margin: 10px auto 0;
}
.path-grade-report-grader .lefttbody {
width:auto;
vertical-align:middle;
width: auto;
vertical-align: middle;
}
table#user-grades th.fixedcolumn {
border:1px solid #cecece;
vertical-align:middle;
border: 1px solid #cecece;
vertical-align: middle;
}
.path-grade-report-grader table#fixed_column th {
border:1px solid #cecece;
vertical-align:middle;
border-right-color:#000;
border: 1px solid #cecece;
vertical-align: middle;
border-right-color: #000;
}
.path-grade-report-grader table#fixed_column th.user{
border-right-color:#cecece;
border-right-color: #cecece;
}
.path-grade-report-grader table#fixed_column {
padding-top:20px;
border-top:1px solid #cecece;
background-color:#fff;
padding-top: 20px;
border-top: 1px solid #cecece;
background-color: #fff;
}
.path-grade-report-grader .left_scroller {
float:left;
clear:none;
padding-top:20px;
float: left;
clear: none;
padding-top: 20px;
}
.path-grade-report-grader.dir-rtl .left_scroller {
float: right;
}
.path-grade-report-grader.dir-rtl .left_scroller {float:right;}
.path-grade-report-grader .right_scroller {
width:auto;
clear:none;
overflow-x:scroll;
width: auto;
clear: none;
overflow-x: scroll;
}
.path-grade-report-grader table tr.avg,
.path-grade-report-grader table tr.groupavg td,
.path-grade-report-grader table tr.avg td,
@ -398,48 +352,39 @@ overflow-x:scroll;
.path-grade-report-grader table tr.range_row,
.path-grade-report-grader table tr.range_row th,
div.right_scroller tr {
height:2em;
height: 2em;
}
table#user-grades tr.groupavg td.cell,
tr.groupavg th.header {
background-color:#efffef;
background-color: #efffef;
}
.path-grade-report-grader form td.excluded {
color:red;
color: red;
}
.path-grade-report-grader .excludedfloater {
font-weight:700;
color:red;
font-size:9px;
float:left;
font-weight: 700;
color: red;
font-size: 9px;
float: left;
}
.path-grade-report-grader span.gradepass {
color:#298721;
color: #298721;
}
.path-grade-report-grader span.gradefail {
color:#890d0d;
color: #890d0d;
}
.path-grade-report-grader .gradeweight {
color:#461d7c;
font-weight:700;
color: #461d7c;
font-weight: 700;
}
.path-grade-report-grader td select {
font-size:100%;
padding:0;
font-size: 100%;
padding: 0;
}
.path-grade-report-grader .right_scroller td select {
font-size:86%;
padding:0;
font-size: 86%;
padding: 0;
}
.path-grade-report-grader tr.avg,
.path-grade-report-grader tr.controls,
.path-grade-report-grader td.controls,
@ -449,24 +394,21 @@ padding:0;
.path-grade-report-grader th.range,
.path-grade-report-grader td.range,
.path-grade-report-grader tr.heading th.range {
height:2em!important;
white-space:nowrap;
height: 2em!important;
white-space: nowrap;
}
.path-grade-report-grader .heading_name_row th {
white-space:nowrap;
width:2000px;
white-space: nowrap;
width: 2000px;
}
/*MDL-21088 - IE 7 ignores nowraps on tds or ths so we put a span within it with a nowrap on it*/
.path-grade-report-grader heading_name_row th span {
white-space:nowrap;
white-space: nowrap;
}
.path-grade-report-grader .grade_icons img.ajax {
float:right;
float: right;
}
.path-grade-report-grader .gradestable th.user,
.path-grade-report-grader .gradestable th.range,
.path-grade-report-grader .flexible th,
@ -475,112 +417,97 @@ float:right;
.path-grade-report-grader .flexible td a,
.path-grade-report-grader .gradestable th.range,
.path-grade-report-grader td {
white-space:nowrap;
white-space: nowrap;
}
table#user-grades .catlevel1,
table#user-grades .r1,
.path-grade-report-grader table tr.even td.cell,
.path-grade-report-grader table tr.even th {
background-color:#fff;
background-color: #fff;
}
table#user-grades .catlevel3,
.path-grade-report-grader table tr.odd td.cell {
background-color:#efefef;
background-color: #efefef;
}
table#fixed_column tr.odd th ,
table#user-grades tr.odd th {
background-color:#efefef;
background-color: #efefef;
}
table#user-grades td.vmarked,
table#user-grades tr.odd td.vmarked,
table#user-grades td.vmarked,
table#user-grades tr.odd td.vmarked,
table#user-grades tr.even td.vmarked {
background-color:#fc3;
table#user-grades tr.avg td.vmarked,
table#user-grades tr.controls td.vmarked,
table#user-grades .catlevel1.vmarked,
table#user-grades .catlevel2.vmarked,
table#user-grades .catlevel3.vmarked,
table#user-grades tr.range td.vmarked,
table#user-grades tr.groupavg td.vmarked {
background-color: #fc3;
}
table#user-grades td.hmarked,
table#user-grades tr.odd td.hmarked,
table#user-grades td.hmarked,
table#user-grades tr.odd td.hmarked,
table#user-grades tr.even td.hmarked {
background-color:#ff9;
table#user-grades tr.even td.hmarked,
table#user-grades tr.odd th.hmarked,
table#user-grades tr.even th.hmarked {
background-color: #ff9;
}
table#user-grades td.hmarked.vmarked,
table#user-grades tr.odd td.hmarked.vmarked,
table#user-grades td.hmarked.vmarked,
table#user-grades tr.even td.hmarked.vmarked,
table#user-grades tr.odd td.hmarked.vmarked {
background-color:#fc9;
table#user-grades tr.even td.hmarked.vmarked {
background-color: #fc9;
}
table#user-grades tr.heading,
table#user-grades .heading td {
border-style:solid;
border-width:0;
border-style: solid;
border-width: 0;
}
table#user-grades td.userfield,
table#user-grades th,
.path-grade-report-grader div.gradeparent,
.path-grade-report-grader .ie6 form,
table#user-grades td.ajax {
text-align:left;
text-align: left;
}
.dir-rtl table#user-grades td.userfield,
.dir-rtl table#user-grades th,
.path-grade-report-grader.dir-rtl div.gradeparent,
.path-grade-report-grader.dir-rtl .ie6 form,
.dir-rtl table#user-grades td.ajax {
text-align:right;
text-align: right;
}
.path-grade-report-grader .gradeparent {
overflow:auto;
overflow: auto;
}
.path-grade-report-grader table tr.avg td.cell,
table#user-grades td.controls,
.path-grade-report-grader table tr.avg,
.path-grade-report-grader table tr.avg td,
.path-grade-report-grader table tr.avg th {
background-color:#f3ead8;
.path-grade-report-grader table tr.avg .cell,
.path-grade-report-grader table tr.range .cell {
background-color: #f3ead8;
}
.path-grade-report-grader div.left_scroller tr,
.path-grade-report-grader div.right_scroller tr,
.path-grade-report-grader div.left_scroller td,
.path-grade-report-grader div.right_scroller td,
.path-grade-report-grader div.left_scroller th,
.path-grade-report-grader div.right_scroller th {
height:4.5em;
font-size:10px;
height: 4.5em;
font-size: 10px;
}
.path-grade-report-grader table th.user,
.path-grade-report-grader table td.userfield {
text-align:left;
vertical-align:middle;
text-align: left;
vertical-align: middle;
}
.path-grade-report-grader .usersuspended a:link,
.path-grade-report-grader .usersuspended a:visited {
.path-grade-report-grader .usersuspended a: link,
.path-grade-report-grader .usersuspended a: visited {
color: #666;
}
.path-grade-report-grader table th.usersuspended img.usersuspendedicon {
vertical-align: text-bottom;
margin-left: .45em;
}
.path-grade-report-grader .grade_icons { margin-bottom: .3em;}
.path-grade-report-grader .grade_icons {
margin-bottom: .3em;
}
.path-grade-report-grader .yui3-overlay {
background-color: #FFEE69;
border-color: #D4C237 #A6982B #A6982B;
@ -590,7 +517,6 @@ background-color:#f3ead8;
padding: 2px 5px;
font-size: 0.7em;
}
.path-grade-report-grader .yui3-overlay .fullname {
color: #5F3E00;
font-weight: bold;
@ -605,39 +531,49 @@ background-color:#f3ead8;
/* table#user-grades td */
/* .grader-report-grader table#user-grades td .yui-panel div.hd { */
.path-grade-report-grader #tooltipPanel {
text-align: left;
text-align: left;
}
.path-grade-report-grader .yui3-overlay a.container-close {
margin-top: -3px;
margin-top: -3px;
}
.path-grade-report-grader #hiddentooltiproot, .tooltipDiv {
display: none;
.path-grade-report-grader #hiddentooltiproot,
.tooltipDiv {
display: none;
}
.path-grade-report-grader.ie .right_scroller {
overflow-y:hidden;
overflow-y: hidden;
}
.path-grade-report-grader.ie table#fixed_column th {
height:4.5em;
height: 4.5em;
}
.path-grade-report-grader.ie table#fixed_column tr.avg th {
height:2.1em;
height: 2.1em;
}
.path-grade-report-grader.ie div.left_scroller td {
height:4.5em;
height: 4.5em;
}
.path-grade-report-grader.ie6 div.right_scroller {
margin-top:4em;
width:auto;
position:absolute;
margin-top: 4em;
width: auto;
position: absolute;
}
.path-grade-report-grader.ie6 .excludedfloater {
font-size: 7px;
}
.path-grade-report-grader.ie6 .excludedfloater {
font-size:7px;
/** MDL-40071 **/
.path-grade-report-grader.dir-rtl table th.user,
.path-grade-report-grader.dir-rtl table td.userfield {
text-align: right;
}
/** MDL-40180 **/
.dir-rtl table#user-grades th.category,
.dir-rtl table#user-grades th#studentheader,
.dir-rtl table#user-grades th.user {
text-align: right;
}
.path-grade-report-grader.dir-rtl th.user img.userpicture {
margin-left: 0.5em;
}

3
theme/bootstrapbase/config.php
View File

@ -42,9 +42,6 @@ $THEME->plugins_exclude_sheets = array(
'block' => array(
'html'
),
'gradereport' => array(
'grader',
),
);
$THEME->rendererfactory = 'theme_overridden_renderer_factory';

1
theme/bootstrapbase/less/moodle.less
View File

@ -8,7 +8,6 @@
@import "moodle/calendar";
@import "moodle/course";
@import "moodle/filemanager";
@import "moodle/grade";
@import "moodle/message";
@import "moodle/question";
@import "moodle/user";

608
theme/bootstrapbase/less/moodle/grade.less
View File

@ -1,608 +0,0 @@
/* grades.less */
.allcoursegrades {
width: 100%;
text-align: right;
padding: 4px 0 5px 0;
}
.path-grade-edit .buttons {
text-align: center;
}
.path-grade-edit-tree .idnumber {
margin-left: 15px;
}
.path-grade-edit-tree .movetarget {
position: relative;
width: 80px;
height: 16px;
}
.path-grade-edit-tree ul#grade_tree {
width: auto;
}
.path-grade-edit-tree ul#grade_tree li {
list-style: none;
}
.path-grade-edit-tree ul#grade_tree li.category {
margin-bottom: 6px;
}
.path-grade-edit-tree .iconsmall {
margin-left: 4px;
}
#grade-report-toggles {
text-align: center;
}
#grade-aggregation-help dt {
margin-top: 15px;
}
#grade-aggregation-help dd.example {
margin-top: 7px;
}
#grade-aggregation-help code {
display: block;
margin-top: 7px;
}
.gradeexportlink {
padding: 2em;
text-align: center;
}
.gradetreebox {
margin-top: 10px;
overflow-x: auto;
overflow-y: hidden;
}
.gradetreebox table {
font-size: 0.8em;
width: 100%;
}
.gradetreebox td.colspan,
.gradetreebox tr.category .cell {
background-color: #DDD;
}
.gradetreebox th.actions {
white-space: nowrap;
width: 105px;
}
.gradetreebox td.name {
white-space: nowrap;
}
.gradetreebox td.name h4 {
display: inline;
}
.gradetreebox td.range {
white-space: nowrap;
}
.gradetreebox span.actionlink {
color: blue;
}
.gradetreebox span.actionlink:hover {
text-decoration: underline;
cursor: pointer;
}
.gradetreebox img.iconsmall {
margin-left: 4px;
}
.gradetreebox img.icon {
margin-right: 5px;
}
.gradetreebox #gradetreesubmit {
margin-bottom: 1em;
text-align: center;
}
.gradetreebox .hidden {
display: none;
}
/** Advanced grading **/
#page-grade-grading-manage #activemethodselector {
text-align: center;
margin-bottom: 1em;
}
#page-grade-grading-manage #activemethodselector select {
margin: 0 1em;
}
#page-grade-grading-manage .actions {
text-align: center;
}
#page-grade-grading-manage .action {
display: inline-block;
width: 150px;
background-color: #eee;
border: 2px solid #ccc;
margin: 0.5em;
padding: 0.5em;
text-align: center;
.border-radius(5px);
}
#page-grade-grading-manage .action:hover {
text-decoration: none;
background-color: #F6F6F6;
}
#page-grade-grading-manage #actionresultmessagebox {
background-color: #D2EBFF;
width: 60%;
margin: 1em auto;
text-align: center;
padding: 0.5em;
border: 2px solid #CCC;
text-align: center;
.border-radius(5px);
position: relative;
}
#page-grade-grading-manage #actionresultmessagebox span {
position: absolute;
right: 0;
top: -1.2em;
color: #666;
font-size: 80%}
#page-grade-grading-manage .definition-name .status {
font-weight: normal;
text-transform: uppercase;
font-size: 60%;
padding: 0.25em;
border: 1px solid #EEE;
.border-radius(5px);
}
#page-grade-grading-manage .definition-name .status.ready {
background-color: #e7f1c3;
border-color: #AAEEAA;
}
#page-grade-grading-manage .definition-name .status.draft {
background-color: #f3f2aa;
border-color: #EEEE22;
}
#page-grade-grading-manage .definition-preview {
width: 50%;
margin: 1em auto;
border: 1px solid #EEE;
padding: 1em;
}
#page-grade-grading-pick .template-name {
clear: both;
padding: 3px;
background-color: #F6F6F6;
}
#page-grade-grading-pick .template-name .type {
font-weight: normal;
text-transform: uppercase;
font-size: 60%;
padding: 0.25em;
border: 1px solid #eee;
.border-radius(5px);
}
#page-grade-grading-pick .template-name .type.shared {
background-color: #e7f1c3;
border-color: #AAEEAA;
}
#page-grade-grading-pick .template-name .type.ownform {
background-color: #d2ebff;
border-color: #AACCEE;
}
#page-grade-grading-pick .template-description {
margin-bottom: 1em;
padding: 0 2em 0 0px;
margin-right: 51%;
}
#page-grade-grading-pick .template-preview {
width: 50%;
float: right;
border: 1px solid #EEE;
padding: 1em;
margin-bottom: 1em;
}
#page-grade-grading-pick .template-actions {
margin-bottom: 1em;
padding: 0 2em 0 0px;
margin-right: 51%;
}
#page-grade-grading-pick .template-actions .action {
display: inline-block;
margin: 0.25em;
padding: 0.25em;
border: 2px solid transparent;
}
#page-grade-grading-pick .template-actions .action.pick {
background-color: #EEE;
border: 2px solid #CCC;
.border-radius(3px);
}
#page-grade-grading-pick .template-actions .action:hover {
text-decoration: none;
background-color: #F6F6F6;
border: 2px solid #CCC;
.border-radius(3px);
}
#page-grade-grading-pick .template-actions .action .action-text {
display: inline;
}
#page-grade-grading-pick .template-actions .action .action-icon {
margin: 0 3px;
}
#page-grade-grading-pick .template-preview-confirm {
width: 50%;
margin: 1em auto;
border: 1px solid #EEE;
padding: 1em;
}
#page-grade-grading-pick .singlebutton {
clear: both;
}
// replaces grades/report/grader/styles.css
table#user-grades tr.avg td.cell {
background-color: #EFEFFF;
font-weight: 700;
color: #00008B;
}
table#user-grades tr td.overridden {
background-color:#F3E4C0;
}
table#user-grades tr.odd td.overridden {
background-color:#EFD9A4;
}
table#user-grades tr td.ajaxoverridden {
background-color:#FFE3A0;
}
table#user-grades tr.odd td.ajaxoverridden {
background-color:#FFDA83;
}
table#user-grades tr.even td.excluded {
background-color:#EABFFF;
}
table#user-grades tr.odd td.excluded {
background-color:#E5AFFF;
}
table#user-grades tr.groupavg td.cell {
background-color:#efffef;
font-weight:700;
color:#006400;
}
table#user-grades td.cat,
table#user-grades td.course {
font-weight:700;
}
.path-grade-report-grader #overDiv table {
margin:0;
}
.path-grade-report-grader #overDiv table td.feedback {
border:0;
}
.path-grade-report-grader #overDiv .feedback {
font-size: @fontSizeMini;
background-color:#ABF;
font-weight:400;
}
.path-grade-report-grader #overDiv .caption {
font-size: @fontSizeMini;
background-color:#56C;
color:#CCF;
font-weight:700;
}
.path-grade-report-grader #overDiv .intersection {
font-size: @fontSizeMini;
background-color:#ABF;
color:#000;
font-weight:400;
}
.path-grade-report-grader #overDiv .intersectioncaption {
background-color:#56C;
color:#CCF;
font-weight:700;
}
.path-grade-report-grader div.gradeparent,
table#user-grades td.ajax {
text-align:left;
}
.path-grade-report-grader.dir-rtl div.gradeparent,
.dir-rtl table#user-grades td.ajax {
text-align: right;
}
table#user-grades td,
table#user-grades th {
text-align: right;
}
table#user-grades .courseitem {
white-space: nowrap;
text-align: right;
}
table#user-grades th.category,
table#user-grades th#studentheader,
table#user-grades th.user {
text-align: left;
}
.dir-rtl table#user-grades th.category,
.dir-rtl table#user-grades th#studentheader,
.dir-rtl table#user-grades th.user {
text-align: right;
}
div.gradertoggle {
display: inline;
margin-left: 20px;
}
table#user-grades .userpic {
margin-right: 10px;
}
table#user-grades .quickfeedback {
border:1px dashed #000;
margin-left: 10px;
}
.dir-rtl table#user-grades .quickfeedback {
margin-left: 0;
margin-right: 10px;
}
.path-grade-report-grader #siteconfiglink {
text-align:right;
}
table#user-grades .datesubmitted {
font-size: @fontSizeMini;
}
.path-grade-report-grader span.inclusion-links {
margin: 0 5px 0 10px;
}
.path-grade-report-grader th.user img.userpicture {
margin-right: 0.5em;
}
.path-grade-report-grader.dir-rtl th.user img.userpicture {
margin-left: 0.5em;
}
.path-grade-report-grader a.quickedit {
line-height:1em;
display:block;
float:right;
clear:none;
font-size:9px;
background-color:transparent;
margin:.1em 0 0;
}
.path-grade-report-grader a.quickedit2 {
display:block;
float:right;
clear:none;
background-color:transparent;
margin:1.3em 0 0;
}
.path-grade-report-grader table#quick_edit {
border:1px solid #cecece;
margin:0 auto;
}
.path-grade-report-grader table#quick_edit td {
vertical-align:middle;
border:1px solid #cecece;
text-align:left;
margin:0;
padding:5px;
}
.path-grade-report-grader table#quick_edit td img {
border:3px double #cecece;
vertical-align:middle;
padding:0;
}
.path-grade-report-grader table#quick_edit td.fullname {
border-left:0;
padding-left:5px;
}
.path-grade-report-grader table#quick_edit td.picture {
border-right:0;
}
.path-grade-report-grader table#quick_edit td.finalgrade input {
width:5em;
}
.path-grade-report-grader h1 {
text-align:center;
clear:both;
}
.path-grade-report-grader input.center {
margin:10px auto 0;
}
.path-grade-report-grader .lefttbody {
width:auto;
vertical-align:middle;
}
.path-grade-report-grader .left_scroller {
float:left;
clear:none;
#fixed_column .heading th.header,
#fixed_column td,
#fixed_column th {
height: 4em;
}
#fixed_column td.controls {
height: 2em;
}
}
.path-grade-report-grader.dir-rtl .left_scroller {
float: right;
}
.path-grade-report-grader .right_scroller {
width: auto;
clear: none;
overflow-x: scroll;
tr.heading_name_row th,
table#user-grades td.grade {
height: 4em;
}
.path-grade-report-grader .left_scroller .topleft,
tr.avg td,
tr.groupavg,
tr.controls_row,
div.right_scroller tr {
height: 2em;
}
}
table#fixed_column,
table#user-grades,
table#fixed_column th,
table#fixed_column td,
table#user-grades td,
table#user-grades th,
table#user-grades input {
font-size:10px;
margin: 0;
padding: 0 2px;
vertical-align: middle;
}
.path-grade-report-grader form td.excluded {
color: @errorText;
}
.path-grade-report-grader .excludedfloater {
font-weight: 700;
color: @errorText;
font-size: 9px;
float: left;
}
.path-grade-report-grader span.gradepass {
color:#298721;
}
.path-grade-report-grader span.gradefail {
color:#890d0d;
}
.path-grade-report-grader .gradeweight {
color:#461d7c;
font-weight:700;
}
.path-grade-report-grader td select {
font-size: 100%;
padding: 0;
}
.path-grade-report-grader .right_scroller td select {
font-size: @fontSizeSmall;
}
.path-grade-report-grader .grade_icons img.ajax {
float:right;
}
.path-grade-report-grader .gradestable th.user,
.path-grade-report-grader .gradestable th.range,
.path-grade-report-grader .flexible th,
.path-grade-report-grader .flexible td,
.path-grade-report-grader .flexible th a,
.path-grade-report-grader .flexible td a,
.path-grade-report-grader .gradestable th.range,
.path-grade-report-grader th,
.path-grade-report-grader td {
white-space: nowrap;
}
table#user-grades td.vmarked {
background-color: #fc3;
}
table#user-grades td.hmarked {
background-color: #ff9;
}
table#user-grades td.hmarked.vmarked {
background-color: #fc9;
}
.path-grade-report-grader .gradeparent {
overflow: auto;
}
table#fixed_column tr.controls td,
table#user-grades tr.controls td,
.path-grade-report-grader table tr.avg,
.path-grade-report-grader table tr.avg:hover {
background-color: @infoBackground;
}
.path-grade-report-grader table th.user,
.path-grade-report-grader table td.userfield {
text-align:left;
}
.path-grade-report-grader.dir-rtl {
table th.user,
table td.userfield {
text-align:right;
}
}
.path-grade-report-grader .usersuspended a:link,
.path-grade-report-grader .usersuspended a:visited {
.muted
}
.path-grade-report-grader table th.usersuspended img.usersuspendedicon {
vertical-align: text-bottom;
margin-left: .45em;
}
.path-grade-report-grader .yui3-overlay {
background-color: #FFEE69;
border-color: #D4C237 #A6982B #A6982B;
border-style: solid;
border-width: 1px;
left: 0;
padding: 2px 5px;
font-size: 0.7em;
}
.path-grade-report-grader .yui3-overlay .fullname {
color: #5F3E00;
font-weight: bold;
}
.path-grade-report-grader .yui3-overlay .itemname {
color: #194F3E;
font-weight: bold;
}
.path-grade-report-grader .yui3-overlay .feedback {
color: #5F595E;
}
.path-grade-report-grader #tooltipPanel {
text-align: left;
}
.path-grade-report-grader .yui3-overlay a.container-close {
margin-top: -3px;
}
.path-grade-report-grader #hiddentooltiproot, .tooltipDiv {
display: none;
}
.gradingform_rubric.editor .criteria .definition textarea,
.gradingform_rubric.editor .criteria .scorevalue input {
width: auto;
}
.gradingform_rubric.editor .criteria .scorevalue input {
float: left;
}

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long

9
theme/bootstrapbase/upgrade.txt Normal file
View File

@ -0,0 +1,9 @@
This file describes API changes in /theme/bootstrapbase
information provided here is intended especially for theme designers.
=== 2.6 ===
Notes:
* File theme/bootstrapbase/less/moodle/grade.less is removed. Corrections are
made to the grade report to make it work with Bootstrapbase.
Theme developers need to alter config.php and update $THEME->plugins_exclude_sheets
to not to list stylesheet from gradereport_grade any more. See MDL-40347

3
theme/clean/config.php
View File

@ -48,9 +48,6 @@ $THEME->plugins_exclude_sheets = array(
'block' => array(
'html',
),
'gradereport' => array(
'grader',
),
);
$THEME->rendererfactory = 'theme_overridden_renderer_factory';

2
theme/mymobile/style/core.css
View File

@ -1162,7 +1162,7 @@ div.gradeparent, #attemptsform .no-overflow, .usersubmissions .no-overflow {
#attemptsform .no-overflow, .usersubmissions .no-overflow {
max-height: 200px;
}
.userenrolment .col_enrol .enrolment, #page-admin-course-manage .generalbox th, .editcourse .header, .results .header, #attempts .header, .generaltable .header, .plugincompattable th, .environmenttable th, .forumheaderlist th, .path-mod-assignment #dates .c0, .userenrolment tr.r1, .userenrolment tr.r0, table#user-grades .catlevel1, table#user-grades .r1, .path-grade-report-grader table tr.even td.cell, .path-grade-report-grader table tr.even th, .gradestable .lastrow td.cell, .gradestable .lastrow th.header, table#user-grades tr.avg td.cell, table#fixed_column tr.odd th, table#user-grades tr.odd th, table#user-grades tr.odd td.cell, table#user-grades td.topleft, table#user-grades .catlevel1, table#user-grades .r1, .path-grade-report-grader table tr.even td.cell, .path-grade-report-grader table tr.even th {
.userenrolment .col_enrol .enrolment, #page-admin-course-manage .generalbox th, .editcourse .header, .results .header, #attempts .header, .generaltable .header, .plugincompattable th, .environmenttable th, .forumheaderlist th, .path-mod-assignment #dates .c0, .userenrolment tr.r1, .userenrolment tr.r0, table#user-grades .catlevel1, table#user-grades .catlevel2, table#user-grades .catlevel3, table#user-grades .categoryitem, table#user-grades .r1, .path-grade-report-grader table tr.even td.cell, .path-grade-report-grader table tr.even th, .gradestable .lastrow td.cell, .gradestable .lastrow th.header, table#user-grades td.controls, table#user-grades tr.avg td.cell, table#user-grades tr.groupavg td.cell, table#user-grades tr.range td.cell, table#fixed_column tr.odd th, table#user-grades tr.odd th, table#user-grades tr.odd td.cell, table#user-grades td.topleft, table#user-grades .catlevel1, table#user-grades .r1, .path-grade-report-grader table tr.even td.cell, .path-grade-report-grader table tr.even th {
background-color:inherit !important;
background: inherit !important;
}

4
theme/upgrade.txt
View File

@ -1,15 +1,15 @@
This files describes API changes in /theme/* themes,
information provided here is intended especially for theme designer.
=== 2.6 ===
Notes:
* The parameters value for the following functions have been modified: core_renderer::heading() and core_renderer::heading_with_help().
This means that headings using the default options will no longer have the class "main" which was the previous default.
* The file picker and activity chooser have been converted to use M.core.dialogue. This means the styles
for these elements have changed in the base and bootstrapbase themes and you will need to copy the new styles
if you are not inheriting from either one of these themes.
* For the themes based on bootstrapbase please also read theme/bootstrapbase/upgrade.txt
* A new component action_menu is now used to display editing icons for courses and blocks within a drop down. If you have a theme that doesn't
extend base, canvas, or clean then you will need to style for this new component within your theme.