Merge branch 'MDL-22351' of git://github.com/lazydaisy/moodle

Conflicts:
	theme/anomaly/style/general.css

Merged with some changes done with the introduction of
the new report plugins (MDL-29030)

diff --cc theme/anomaly/style/general.css
index 22e3cd2,2688c76..188bce1
--- 1/theme/anomaly/style/general.css
--- 2/theme/anomaly/style/general.css
+++ b/theme/anomaly/style/general.css
@@@ -1,71 -1,237 +1,236 @@@
- a:link {text-decoration:none;color: #697F55;}
- a:visited {text-decoration:none;color: #697F55;}
- a:hover {text-decoration:underline;}
+ /** Core **/
+ 
+ a:link {
+     text-decoration: none;
+     color: #697F55;
+ }
+ a:visited {
+     text-decoration: none;
+     color: #697F55;
+ }
+ a:hover {
+     text-decoration: underline;
+ }
  
  img.icon,
- img.iconhelp {vertical-align:middle;}
- 
- html, body {background-color:#C8C9C7;}
- #page #page-content {background-color:#FFF;}
- #page-header {background-color: #222; color:#FFF;border-bottom:5px solid #697F55;}
- .hasnavbar #page-header {border-bottom-width:0px;}
- #page-footer {background-color: #222; color:#FFF;}
- #page-header .headermain span {color:#C8C9C7;}
- 
- #page-header .navbar {background-color:#697F55;width:100%;}
- #page-header .navbar {color:#000;}
+ img.iconhelp {
+     vertical-align: middle;
+ }
+ 
+ html, body {
+     background-color: #C8C9C7;
+ }
+ 
+ #page-content {
+     background-color: #FFF;
+ }
+ 
+ #page-header {
+     background-color: #222;
+     color: #FFF;
+     border-bottom: 5px solid #697F55;
+ }
+ .hasnavbar #page-header {
+     border-bottom-width: 0;
+ }
+ 
+ #page-footer {
+     background-color: #222;
+     color: #FFF;
+ }
+ 
+ #page-header .headermain span {
+     color: #C8C9C7;
+ }
+ 
+ #page-header .navbar {
+     background-color: #697F55;
+     width: 100%;
+ }
+ #page-header .navbar {
+     color: #000;
+ }
  #page-header .navbar a:link,
- #page-header .navbar a:visited {color:#fff;}
+ #page-header .navbar a:visited {
+     color: #fff;
+ }
  #page-header .navbar .breadcrumb,
- #page-header .navbar .navbutton {margin:5px 1em;}
+ #page-header .navbar .navbutton {
+     margin: 5px 1em;
+ }
  
  /** General **/
- .generalbox {border: 1px solid #DDDDDD;}
- .generaltable td {border-width:0;}
- .sitetopic {border-width:0;}
- .headingblock {margin-bottom:10px;border-bottom:1px solid #697F55;background-color:#E3E3E3;padding:4px 5px;}
- 
- .coursebox {width:100%;margin:10px 0px;border-bottom:1px solid #E3E3E3;overflow:hidden;padding-bottom:10px;}
- .coursebox .info {width:35%;float:left;}
- .coursebox .summary {width:60%;float:right;}
- 
- .course-content ul.section {margin:0;}
- .course-content .headingblock.outline {margin-top:0;}
- .course-content .section.main {border:1px solid #E3E3E3;margin-bottom:10px;}
- .course-content .section.main .left.side {float:left;width:20px;padding:5px;}
- .course-content .section.main .right.side {float:right;width:20px;padding:5px;}
- .course-content .section.main .content {margin:0 30px 10px 30px;background-color:#FFF;}
- .course-content .section.main .content .section_add_menus {text-align:right;}
- 
- #page-report-outline-user .section {border:1px solid #DDD;margin:0 5% 1.5em 5%;}
+ .generalbox {
+     border: 1px solid #DDDDDD;
+ }
+ .generaltable td {
+     border-width: 0;
+ }
+ .sitetopic {
+     border-width: 0;
+ }
+ .headingblock {
+     margin-bottom: 10px;
+     border-bottom: 1px solid #697F55;
+     background-color: #E3E3E3;
+     padding: 4px 5px;
+ }
+ 
+ .coursebox {
+     width: 100%;
+     margin: 10px 0;
+     border-bottom: 1px solid #E3E3E3;
+     overflow: hidden;
+     padding-bottom: 10px;
+ }
+ .coursebox .info {
+     width: 35%;
+     float: left;
+ }
+ .coursebox .summary {
+     width: 60%;
+     float: right;
+ }
+ 
+ .course-content ul.section {
+     margin: 0;
+ }
+ 
+ .course-content .headingblock.outline {
+     margin-top: 0;
+ }
+ 
+ .course-content .section.main {
+     border:1px solid #E3E3E3;
+     margin-bottom: 10px;
+ }
+ 
+ .course-content .section.main .left.side {
+     float:left;width:20px;padding:5px;
+ }
+ 
+ .course-content .section.main .right.side {
+     float: right;
+     width: 20px;
+     padding: 5px;
+ }
+ 
+ .course-content .section.main .content {
+     margin: 0 30px 10px 30px;
+     background-color: #FFF;
+ }
+ 
+ .course-content .section.main .content .section_add_menus {
+     text-align: right;
+ }
+ 
 -#course-user .section {
 -    border: 1px solid #DDD;
++#page-report-outline-user .section {
++    border:i 1px solid #DDD;
+     margin: 0 5% 1.5em 5%;
+ }
  
 -#course-user .section h2,
 -#course-user .section .content {
 +#page-report-outline-user .section h2,
- #page-report-outline-user .section .content {margin:5px 1em;}
- #page-report-outline-user .section table td {border:0;}
- 
- .generaltable {border:1px solid #DDD;}
- .generaltable .cell {background-color:#FFF;border:1px solid #EEE;border-collapse: collapse;}
- .generaltable .header {background-color:#EEE;border:1px solid #EEE;font-weight:bold;}
++#page-report-outline-user .section .content {
+     margin: 5px 1em;
+ }
+ 
 -#course-user .section table td {
++#page-report-outline-user .section table td {
+     border: 0;
+ }
+ 
+ .generaltable {
+     border: 1px solid #DDD;
+ }
+ 
+ .generaltable .cell {
+     background-color: #FFF;
+     border:1px solid #EEE;
+     border-collapse: collapse;
+ }
+ 
+ .generaltable .header {
+     background-color: #EEE;
+     border: 1px solid #EEE;
+     font-weight: bold;
+ }
  
 -
  /** Login **/
- .loginbox {margin-top:15px;margin-bottom:15px;}
- .loginbox .loginform {margin-top:15px;}
- .loginbox .loginform .form-label {width:39%;float:left;text-align:right;}
- .loginbox .loginform .form-input {width:60%;float:right;text-align:left;}
- .loginbox .loginform .form-input input {width:6em;}
- 
- .loginbox.twocolumns {border:1px solid #DDD;}
- .loginbox.twocolumns .loginpanel {float:left;width:49%;text-align:center;}
- .loginbox.twocolumns .signuppanel {float:left;width:50%;border-left:1px solid #DDD;}
- .loginbox.twocolumns .signuppanel h2 {text-align:center;}
- .loginbox.twocolumns .signuppanel div {margin:1em;}
- .loginbox.twocolumns .signuppanel div li {font-size:90%;}
- 
- .loginbox .loginsub {margin-left:10%;margin-right:10%;padding:10px;margin-bottom:5px;}
- .loginbox .guestsub {margin-left:10%;margin-right:10%;padding:10px;margin-bottom:5px;border-top:1px solid #DDD;}
+ .loginbox {
+     margin-top: 15px;
+     margin-bottom: 15px;
+ }
+ 
+ .loginbox .loginform {
+     margin-top: 15px;
+ }
+ 
+ .loginbox .loginform .form-label {
+     width: 39%;
+     float: left;
+     text-align: right;
+ }
+ 
+ .loginbox .loginform .form-input {
+     width: 60%;
+     float: right;
+     text-align: left;
+ }
+ 
+ .loginbox .loginform .form-input input {
+     width: 6em;
+ }
+ 
+ .loginbox.twocolumns {
+     border: 1px solid #DDD;
+ }
+ 
+ .loginbox.twocolumns .loginpanel {
+     float: left;
+     width: 49%;
+     text-align: center;
+ }
+ 
+ .loginbox.twocolumns .signuppanel {
+     float: left;
+     width: 50%;
+     border-left: 1px solid #DDD;
+ }
+ 
+ .loginbox.twocolumns .signuppanel h2 {
+     text-align: center;
+ }
+ 
+ .loginbox.twocolumns .signuppanel div {
+     margin: 1em;
+ }
+ 
+ .loginbox.twocolumns .signuppanel div li {
+     font-size: 90%;
+ }
+ 
+ .loginbox .loginsub {
+     margin-left: 10%;
+     margin-right: 10%;
+     padding: 10px;
+     margin-bottom: 5px;
+ }
+ 
+ .loginbox .guestsub {
+     margin-left: 10%;
+     margin-right: 10%;
+     padding: 10px;
+     margin-bottom: 5px;
+     border-top: 1px solid #DDD;
+ }
  
  /** Blocks **/
- .block {border:1px solid #C8C9C7;background-color: #E3E3E3;margin-bottom:10px;overflow:hidden;}
+ 
+ .block {
+     border: 1px solid #C8C9C7;
+     background-color: #E3E3E3;
+     margin-bottom: 10px;
+     overflow: hidden;
+ }
  .block h1,
  .block h2,
  .block h3,
@@@ -244,4 -775,6 +774,6 @@@
  
  #custommenu .yui3-menu-label-active,
  #custommenu .yui3-menu-label-menuvisible,
- #custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content {background-color: #697F55;}
+ #custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content {
+     background-color: #697F55;
 -}
++}