Merge branch 'MDL-47363' of git://github.com/marinaglancy/moodle

This commit is contained in:
Dan Poltawski
2014-10-17 14:46:30 +01:00
5 changed files with 467 additions and 86 deletions
+10 -3
View File
@@ -30,9 +30,6 @@
text-align: center;
}
.path-grade-report-singleview itemnav.previtem {
float:left;
}
.path-grade-report-singleview itemnav.previtem {
float:left;
}
@@ -45,3 +42,13 @@
.path-grade-report-singleview.dir-rtl small.nextitem {
float:left;
}
.path-grade-report-singleview .generaltable {
width: 100%;
}
.path-grade-report-singleview .generaltable th {
text-align: left;
}
.dir-rtl.path-grade-report-singleview .generaltable th {
text-align: right;
}
+60 -60
View File
@@ -1,62 +1,62 @@
.path-grade-report-user .user-grade .datesubmitted {font-size: 0.7em;}
.path-grade-report-user .user-grade .courseitem,
.path-grade-report-user .user-grade .categoryitem {font-weight: bold;}
.path-grade-report-user .user-grade td.cell {padding-left: 5px;padding-right: 5px;}
#graded_users_selector {float: right;text-align: right;}
.path-grade-report-user #graded_users_selector {
float: right;
}
.path-grade-report-user #graded_users_selector .singleselect label {
display: inline-block;
}
/* this must be last if we want to override other category and course item colors */
.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;}
.user-grade thead th {padding: 0.25em 0.75em;}
.user-grade tbody th {text-align:left;}
/* These need to be this specific to override the css from .generaltable */
.user-grade tbody > tr:nth-child(n) > td.oddd1,
.user-grade tbody > tr:nth-child(n) > th.oddd1 {background-color: #f3dfd0;}
.user-grade tbody > tr:nth-child(n) > td.oddd2,
.user-grade tbody > tr:nth-child(n) > th.oddd2 {background-color: #d0dbf3;}
.user-grade tbody > tr:nth-child(n) > td.oddd3,
.user-grade tbody > tr:nth-child(n) > th.oddd3 {background-color: #d0f3d6;}
.user-grade tbody > tr:nth-child(n) > td.oddd4,
.user-grade tbody > tr:nth-child(n) > th.oddd4 {background-color: #f0f0aa;}
.user-grade tbody > tr:nth-child(n) > td.evend2,
.user-grade tbody > tr:nth-child(n) > th.evend2 {background-color: #b0bbd3;}
.user-grade tbody > tr:nth-child(n) > td.evend3,
.user-grade tbody > tr:nth-child(n) > th.evend3 {background-color: #b0dfb6;}
.user-grade tbody > tr:nth-child(n) > td.evend4,
.user-grade tbody > tr:nth-child(n) > th.evend4 {background-color: #cac8be;}
.user-grade td.b1t,
.user-grade td.b2t,
.user-grade th.b1t,
.user-grade th.b2t {border-top: 2px solid black;}
.user-grade td.b1r,
.user-grade td.b2r,
.user-grade th.b1r,
.user-grade th.b2r {border-right: 2px solid black;}
.user-grade td.b1b,
.user-grade td.b2b,
.user-grade th.b1b,
.user-grade th.b2b {border-bottom: 2px solid black;}
.user-grade td.b1l,
.user-grade td.b2l,
.user-grade th.b1l,
.user-grade th.b2l {border-left: 2px solid black;}
.user-grade td.baggt,
.user-grade td.baggb,
.user-grade th.baggt,
.user-grade th.baggb {font-style: italic;font-weight: bold;}
.user-grade td.baggt,
.user-grade th.baggt {border-top: 3px double black;}
.user-grade td.baggb,
.user-grade th.baggb {border-bottom: 3px double black;}
.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.feedbacktext {max-width:600px;padding:2px 2px;}
.pagelayout-report .user-grade .feedbacktext .no-overflow {overflow:auto;padding:0.25em;}
.path-grade-report-user .user-grade {
width: 100%;
border: 1px solid;
}
.path-grade-report-user .user-grade thead th {
vertical-align: bottom;
}
.path-grade-report-user .user-grade th {
text-align:left;
}
.path-grade-report-user .user-grade td {
min-width: 4.5em;
vertical-align: top;
}
.path-grade-report-user .user-grade .b1l {
padding: 0;
width:24px;
min-width: 24px;
}
.path-grade-report-user .user-grade tbody .column-itemname {
padding-left: 0;
padding-right: 8px
}
.path-grade-report-user .user-grade .column-itemname.item,
.path-grade-report-user .user-grade .gradeitemdescription {
font-weight: normal;
padding-left: 24px;
}
.path-grade-report-user .user-grade .column-itemname.baggt,
.path-grade-report-user .user-grade .column-itemname.baggb {
padding-left: 24px;
}
.path-grade-report-user .user-grade .baggt,
.path-grade-report-user .user-grade .baggb {
font-weight: bold;
}
table.user-grade td.feedbacktext {text-align:left;width: 40%;font-size: 0.8em;white-space:normal;}
table.user-grade td.itemcenter {text-align:center;}
.user-grade .gradeitemdescription { font-weight: normal; position: absolute; }
.user-grade .gradeitemdescriptionfiller { clear: left; height: 1em; }
.user-grade .gradeitemdescription { font-weight: normal; position: absolute;}
.dir-rtl.path-grade-report-user #graded_users_selector {
float: left;
}
.dir-rtl.path-grade-report-user .user-grade th {
text-align:right;
}
.dir-rtl.path-grade-report-user .user-grade tbody .column-itemname {
padding-right: 0;
padding-left: 8px;
}
.dir-rtl.path-grade-report-user .user-grade .column-itemname.item,
.dir-rtl.path-grade-report-user .user-grade .gradeitemdescription {
padding-right: 24px;
}
.dir-rtl.path-grade-report-user .user-grade .column-itemname.baggt,
.dir-rtl.path-grade-report-user .user-grade .column-itemname.baggb {
padding-right: 24px;
}
+198 -20
View File
@@ -4,10 +4,189 @@
.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;}
.path-grade-edit-tree .setup-grades {
width: 100%;
}
.path-grade-edit-tree .setup-grades thead th {
text-align: left;
}
.path-grade-edit-tree .setup-grades .column-rowspan {
padding: 0;
width: 24px;
min-width: 24px;
max-width: 24px;
}
.path-grade-edit-tree .setup-grades .category td.column-name {
padding-left: 0;
}
.path-grade-edit-tree .setup-grades td.column-name {
padding-left: 24px;
}
.path-grade-edit-tree .setup-grades .column-name h4 img.icon {
padding-left: 0;
}
.path-grade-edit-tree .setup-grades .column-name img.smallicon {
margin: 0 .3em;
}
.path-grade-edit-tree .setup-grades .category input[type="text"],
.path-grade-edit-tree .setup-grades .category .column-range,
.path-grade-edit-tree .setup-grades .categoryitem,
.path-grade-edit-tree .setup-grades .courseitem {
font-weight: bold;
}
.path-grade-edit-tree .setup-grades .emptyrow {
display: none;
}
.path-grade-edit-tree .setup-grades.generaltable .levelodd {
background-color: #f0f0f0;
}
.path-grade-edit-tree .setup-grades.generaltable .leveleven {
background-color: #fafafa;
}
.path-grade-edit-tree .setup-grades.generaltable tbody tr:hover > td,
.path-grade-edit-tree .setup-grades.generaltable tbody tr:hover > th {
background-color: #f5f5f5;
}
.path-grade-edit-tree .setup-grades .column-weight.level3 {
padding-left: 37px;
}
.path-grade-edit-tree .setup-grades .column-weight.level4 {
padding-left: 66px;
}
.path-grade-edit-tree .setup-grades .column-weight.level5 {
padding-left: 95px;
}
.path-grade-edit-tree .setup-grades .column-weight.level6 {
padding-left: 124px;
}
.path-grade-edit-tree .setup-grades .column-weight.level7 {
padding-left: 153px;
}
.path-grade-edit-tree .setup-grades .column-weight.level8 {
padding-left: 182px;
}
.path-grade-edit-tree .setup-grades .column-weight.level9 {
padding-left: 211px;
}
.path-grade-edit-tree .setup-grades .column-weight.level10 {
padding-left: 240px;
}
.path-grade-edit-tree .setup-grades .column-range.level2 {
padding-left: 37px;
}
.path-grade-edit-tree .setup-grades .column-range.level3 {
padding-left: 66px;
}
.path-grade-edit-tree .setup-grades .column-range.level4 {
padding-left: 95px;
}
.path-grade-edit-tree .setup-grades .column-range.level5 {
padding-left: 124px;
}
.path-grade-edit-tree .setup-grades .column-range.level6 {
padding-left: 153px;
}
.path-grade-edit-tree .setup-grades .column-range.level7 {
padding-left: 182px;
}
.path-grade-edit-tree .setup-grades .column-range.level8 {
padding-left: 211px;
}
.path-grade-edit-tree .setup-grades .column-range.level9 {
padding-left: 240px;
}
.path-grade-edit-tree .setup-grades .column-range.level10 {
padding-left: 269px;
}
.dir-rtl.path-grade-edit-tree .setup-grades thead th {
text-align: right;
}
.dir-rtl.path-grade-edit-tree .setup-grades .category td.column-name {
padding-right: 0;
}
.dir-rtl.path-grade-edit-tree .setup-grades td.column-name {
padding-right: 24px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-name h4 img.icon {
padding-left: 4px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight input[type="checkbox"] {
margin-right: 0;
margin-left: 7px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-select input[type="checkbox"] {
margin-right: 0;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level3 {
padding-left: 0;
padding-right: 37px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level4 {
padding-left: 0;
padding-right: 66px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level5 {
padding-left: 0;
padding-right: 95px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level6 {
padding-left: 0;
padding-right: 124px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level7 {
padding-left: 0;
padding-right: 153px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level8 {
padding-left: 0;
padding-right: 182px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level9 {
padding-left: 0;
padding-right: 211px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-weight.level10 {
padding-left: 0;
padding-right: 240px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level2 {
padding-left: 0;
padding-right: 37px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level3 {
padding-left: 0;
padding-right: 66px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level4 {
padding-left: 0;
padding-right: 95px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level5 {
padding-left: 0;
padding-right: 124px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level6 {
padding-left: 0;
padding-right: 153px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level7 {
padding-left: 0;
padding-right: 182px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level8 {
padding-left: 0;
padding-right: 211px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level9 {
padding-left: 0;
padding-right: 240px;
}
.dir-rtl.path-grade-edit-tree .setup-grades .column-range.level10 {
padding-left: 0;
padding-right: 269px;
}
#grade-report-toggles {text-align: center;}
#grade-aggregation-help dt {margin-top: 15px;}
@@ -16,19 +195,7 @@
.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;}
@@ -73,10 +240,6 @@
text-align:center;
}
.path-grade-edit-tree table.setup-grades .column-select {
text-align: center;
}
.path-grade-edit-tree table.setup-grades .column-weight {
white-space: nowrap;
}
@@ -85,3 +248,18 @@
font-weight: normal;
font-style: italic;
}
/** User report **/
.path-grade-report-user .user-grade {
border-color: black;
}
.path-grade-report-user .user-grade.generaltable .levelodd {
background-color: #f0f0f0;
}
.path-grade-report-user .user-grade.generaltable .leveleven {
background-color: #fafafa;
}
.path-grade-report-user .user-grade.generaltable tbody tr:hover > td,
.path-grade-report-user .user-grade.generaltable tbody tr:hover > th {
background-color: #f5f5f5;
}
+198 -2
View File
@@ -231,8 +231,185 @@
}
}
.path-grade-edit-tree table.setup-grades .column-select {
text-align: center;
// Set up grades layout.
.path-grade-edit-tree .setup-grades {
.column-rowspan {
padding: 0;
width: 24px;
min-width: 24px;
max-width: 24px;
}
.category td.column-name {
padding-left: 0;
}
td.column-name {
padding-left: 24px;
}
.column-name h4 img.icon {
padding-left: 0;
}
.category input[type="text"],
.category .column-range,
.categoryitem,
.courseitem {
font-weight: bold;
}
.emptyrow {
display: none;
}
.column-weight {
&.level3 {
padding-left: 37px;
}
&.level4 {
padding-left: 66px;
}
&.level5 {
padding-left: 95px;
}
&.level6 {
padding-left: 124px;
}
&.level7 {
padding-left: 153px;
}
&.level8 {
padding-left: 182px;
}
&.level9 {
padding-left: 211px;
}
&.level10 {
padding-left: 240px;
}
}
.column-range {
&.level2 {
padding-left: 37px;
}
&.level3 {
padding-left: 66px;
}
&.level4 {
padding-left: 95px;
}
&.level5 {
padding-left: 124px;
}
&.level6 {
padding-left: 153px;
}
&.level7 {
padding-left: 182px;
}
&.level8 {
padding-left: 211px;
}
&.level9 {
padding-left: 240px;
}
&.level10 {
padding-left: 269px;
}
}
&.generaltable {
.levelodd {
background-color: @tableBackgroundAccent;
}
.leveleven {
background-color: @tableBackground;
}
tbody tr:hover > td,
tbody tr:hover > th {
background-color: @tableBackgroundHover;
}
}
}
.dir-rtl {
&.path-grade-edit-tree .setup-grades {
.category td.column-name {
padding-right: 0;
}
td.column-name {
padding-right: 24px;
}
.column-name h4 img.icon {
padding-left: 4px;
}
.column-weight {
&.level3 {
padding-left: 0;
padding-right: 37px;
}
&.level4 {
padding-left: 0;
padding-right: 66px;
}
&.level5 {
padding-left: 0;
padding-right: 95px;
}
&.level6 {
padding-left: 0;
padding-right: 124px;
}
&.level7 {
padding-left: 0;
padding-right: 153px;
}
&.level8 {
padding-left: 0;
padding-right: 182px;
}
&.level9 {
padding-left: 0;
padding-right: 211px;
}
&.level10 {
padding-left: 0;
padding-right: 240px;
}
}
.column-range {
&.level2 {
padding-left: 0;
padding-right: 37px;
}
&.level3 {
padding-left: 0;
padding-right: 66px;
}
&.level4 {
padding-left: 0;
padding-right: 95px;
}
&.level5 {
padding-left: 0;
padding-right: 124px;
}
&.level6 {
padding-left: 0;
padding-right: 153px;
}
&.level7 {
padding-left: 0;
padding-right: 182px;
}
&.level8 {
padding-left: 0;
padding-right: 211px;
}
&.level9 {
padding-left: 0;
padding-right: 240px;
}
&.level10 {
padding-left: 0;
padding-right: 269px;
}
}
}
}
.path-grade-edit-tree table.setup-grades .column-weight {
@@ -264,3 +441,22 @@
}
}
}
/**
* User report.
*/
.path-grade-report-user .user-grade {
border: none;
&.generaltable {
.levelodd {
background-color: @tableBackgroundAccent;
}
.leveleven {
background-color: @tableBackground;
}
tbody tr:hover > td,
tbody tr:hover > th {
background-color: @tableBackgroundHover;
}
}
}
File diff suppressed because one or more lines are too long