MDL-31328_master theme_sky_high: fixed report layout and related files + updated css + added horizontal scroll

This commit is contained in:
Mary Evans
2012-03-06 09:59:27 +13:00
committed by Sam Hemelryk
parent 575a553094
commit ad7ecc08d3
7 changed files with 230 additions and 253 deletions
+8 -2
View File
@@ -121,7 +121,7 @@ $THEME->layouts = array(
'defaultregion' => 'side-post',
),
'admin' => array(
'file' => 'general.php',
'file' => 'report.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
@@ -162,6 +162,13 @@ $THEME->layouts = array(
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
// The pagelayout used when a redirection is occuring.
'redirect' => array(
'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
),
// Should display the content and basic headers only.
'print' => array(
'file' => 'general.php',
@@ -169,7 +176,6 @@ $THEME->layouts = array(
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
'report' => array(
'theme' => 'base',
'file' => 'report.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
+6 -9
View File
@@ -1,10 +1,9 @@
<?php
$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
$hassidepre = $PAGE->blocks->region_has_content('side-pre', $OUTPUT);
$hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
$showsidepre = $hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT);
$showsidepost = $hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT);
$custommenu = $OUTPUT->custom_menu();
$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
@@ -17,16 +16,14 @@ if ($showsidepre && !$showsidepost) {
} else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only';
}
if ($hassidepre || $hassidepost) {
$bodyclasses[] = 'background';
if ($hascustommenu) {
$bodyclasses[] = 'has_custom_menu';
}
if (!empty($PAGE->theme->settings->logo)) {
$logourl = $PAGE->theme->settings->logo;
} else {
$logourl = NULL;
}
if (!empty($PAGE->theme->settings->footnote)) {
$footnote = $PAGE->theme->settings->footnote;
} else {
+8 -4
View File
@@ -1,9 +1,12 @@
<?php
$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
$hasheading = ($PAGE->heading);
$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
$hasfooter = (empty($PAGE->layout_options['nofooter']));
$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
$haslogininfo = (empty($PAGE->layout_options['nologininfo']));
$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
@@ -18,16 +21,17 @@ if ($showsidepre && !$showsidepost) {
} else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only';
}
if ($hascustommenu) {
$bodyclasses[] = 'has_custom_menu';
}
if ($hassidepre || $hassidepost) {
$bodyclasses[] = 'background';
}
if (!empty($PAGE->theme->settings->logo)) {
$logourl = $PAGE->theme->settings->logo;
} else {
$logourl = NULL;
}
if (!empty($PAGE->theme->settings->footnote)) {
$footnote = $PAGE->theme->settings->footnote;
} else {
+52 -47
View File
@@ -2,18 +2,18 @@
$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
$hasfooter = (empty($PAGE->layout_options['nofooter']));
$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
$custommenu = $OUTPUT->custom_menu();
$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
$bodyclasses = array();
if (!$showsidepre) {
if ($showsidepre) {
$bodyclasses[] = 'side-pre-only';
} else {
$bodyclasses[] = 'content-only';
}
if ($hassidepre) {
$bodyclasses[] = 'background';
}
if (!empty($PAGE->theme->settings->logo)) {
$logourl = $PAGE->theme->settings->logo;
@@ -39,29 +39,28 @@ echo $OUTPUT->doctype() ?>
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
<div id="wrapper" class="clearfix">
<div id="report-wrapper" class="clearfix">
<!-- START OF HEADER -->
<div id="page-header" class="clearfix">
<div id="page-header-wrapper">
<?php if($logourl == NULL) { ?>
<h1 class="headermain">
<h1 class="headermain">
<?php echo $PAGE->heading ?>
</h1>
<?php } else { ?>
<img class="logo" src="<?php echo $logourl;?>" alt="Custom logo here" /><h1 class="headerwlogo">- <?php echo $PAGE->heading ?></h1>
<img class="logo" src="<?php echo $logourl;?>" alt="Custom logo here" /><h1 class="headerwlogo">- <?php echo $PAGE->heading ?></h1>
<?php } ?>
<div class="headermenu">
<?php
echo $OUTPUT->login_info();
if (!empty($PAGE->layout_options['langmenu'])) {
echo $OUTPUT->lang_menu();
}
echo $PAGE->headingmenu
?>
echo $OUTPUT->login_info();
if (!empty($PAGE->layout_options['langmenu'])) {
echo $OUTPUT->lang_menu();
}
echo $PAGE->headingmenu
?>
</div>
</div>
</div>
@@ -73,30 +72,25 @@ echo $OUTPUT->doctype() ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
<?php } ?>
<div class="navbar clearfix">
<?php if ($hasnavbar) { ?>
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
<div class="navbutton"> <?php echo $PAGE->button; ?></div>
<?php } ?>
</div>
<?php if ($hasnavbar) { ?>
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
<div class="navbutton"> <?php echo $PAGE->button; ?></div>
<?php } ?>
</div>
<div id="report-page-content-wrapper">
<div id="report-page-content">
<div id="report-region-main-box">
<div id="report-region-post-box">
<div id="page-content-wrapper">
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo $OUTPUT->main_content() ?>
</div>
<div id="report-region-main">
<div class="region-content">
<?php echo $OUTPUT->main_content() ?>
</div>
</div>
<?php if ($hassidepre) { ?>
<div id="region-pre" class="block-region">
<div id="report-region-pre" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
@@ -110,27 +104,38 @@ echo $OUTPUT->doctype() ?>
<!-- END OF CONTENT -->
</div>
<!-- END OF WRAPPER -->
<!-- START OF FOOTER -->
<?php if ($hasfooter) { ?>
<div id="page-footer">
<div class="footnote"><?php echo $footnote; ?></div>
<?php
echo $OUTPUT->login_info();
echo $OUTPUT->standard_footer_html();
?>
</div>
<!-- START OF FOOTER-INNER -->
<div id="page-footer-inner">
<div class="footnote"><?php echo $footnote; ?></div>
<?php
echo $OUTPUT->login_info();
?>
</div>
<!-- END OF FOOTER-INNER -->
<p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')); ?></p>
<?php echo $OUTPUT->home_link(); ?>
<?php echo $OUTPUT->standard_footer_html(); ?>
</div>
<?php } ?>
<!-- END OF FOOTER -->
</div>
</div>
<p class="helplink">
<?php echo page_doc_link(get_string('moodledocslink')) ?>
</p><center>
<?php
echo $OUTPUT->home_link();
echo $OUTPUT->standard_end_of_body_html() ?>
</center>
<!-- END OF PAGE -->
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
</html>
+28 -73
View File
@@ -1,30 +1,21 @@
/* @group Core */
.pagelayout-frontpage,
.pagelayout-incourse,
.pagelayout-general,
.pagelayout-course,
.pagelayout-coursecategory,
.pagelayout-admin,
.pagelayout-mydashboard,
.pagelayout-mypublic,
.pagelayout-login,
.pagelayout-report {
background:url([[pix:theme|body]]) top left repeat-x #dcecf9;
html, body {
background: #dcecf9 url([[pix:theme|body]]) left top repeat-x fixed;
}
body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
font-family:Arial, Helvetica, sans-serif;
color:#333;
body.pagelayout-popup.background {
background: #dcecf9 url([[pix:theme|body]]) left top repeat-x fixed !important;
}
#page, h1, h2, h3, h4, h5, h6, p, ul, ol, dl, input, textarea {
font-family: Arial, Helvetica, sans-serif;
color: #333;
}
#wrapper {
background:#fff;
margin:20px 5% 0px 5%;
padding:0px;
border:1px solid #c1bc9d;
background: #fff;
margin: 20px 5% 0;
padding: 0px;
border: 1px solid #c1bc9d;
}
#page-content-wrapper {
padding: 0px;
padding-top: 0px;
@@ -32,23 +23,19 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea {
border-top: 1px solid #ccc;
}
.pagelayout-frontpage #page-content #region-main-box #region-post-box {
padding-top: 0;
padding-top: 0;
}
a:link, a:visited {
color: #003466;
text-decoration: none;
}
a:hover, a:active, a:focus {
a:active, a:hover, a:focus {
color: #4785ac;
text-decoration: none;
}
#region-main-box {
border: 0px none;
}
#newmessageoverlay {
background: #f9f9d4;
margin-left: 55px;
@@ -60,9 +47,7 @@ a:hover, a:active, a:focus {
-moz-opacity:0.9;
-khtml-opacity: 0.9;
opacity: 0.9;
}
#newmessageoverlay #newmessagelinks {
border-top: 1px dashed #ccc;
padding-top: 5px;
@@ -82,7 +67,6 @@ a:hover, a:active, a:focus {
height: 80px;
border-bottom: 1px solid #fff;
}
.logo {
height: 50px;
float: left;
@@ -90,12 +74,10 @@ a:hover, a:active, a:focus {
padding-top: 18px;
padding-right: 0px;
}
.headermain {
font-weight:normal;
margin:.8em 0.5em 0.75em;
}
h1.headermain {
color: #006699;
font-weight: normal;
@@ -110,23 +92,23 @@ h1.headerwlogo {
display: block;
float: left;
margin-top: 35px;
}
.tagline {
color: #006699 !important;
padding-top: 7px;
font-size: .45em;
text-transform: uppercase;
}
.headermenu {
font-size: .9em;
}
p.helplink {
text-align: center;
p.helplink a {
display: block;
width: 25%;
margin: 0 auto;
padding: 10px;
}
/* @end */
/* @group Navbar */
@@ -139,25 +121,21 @@ p.helplink {
margin-left: 4px;
margin-right: 4px;
}
.breadcrumb {
text-transform: uppercase;
font-weight: bold;
font-size: .9em;
margin-left: 7px;
}
.breadcrumb a {
color: #336699 !important;
}
.breadcrumb ul {
color: #666;
}
.arrow, .arrow_button input {
color: #aaa;
}
/* @end */
/* @group Blocks */
@@ -165,41 +143,34 @@ p.helplink {
.block_action {
padding:0px;
}
.block .content {
background:#c7eafd;
border:1px solid #867f6a;
}
.block .minicalendar td,
.block .minicalendar th {
border: none;
}
.block {
border: 0px none;
}
.block .header {
border: 1px solid #ccc;
background: #fff;
padding-left:5px;
}
.block .title h2 {
text-transform: uppercase;
padding-bottom: 0px;
color: #336699;
font-size: .95em;
}
.block .content {
background: #fff;
border: 1px solid #ccc;
padding: 10px;
margin-top: -2px;
}
.block_calendar_month table.minicalendar.calendartable td,.block_calendar_month table.minicalendar.calendartable th {
border: none !important;
}
@@ -216,7 +187,6 @@ p.helplink {
font-size: 1.8em;
font-weight: normal;
}
.completionprogress {
color: #336699;
text-transform: uppercase;
@@ -227,22 +197,18 @@ p.helplink {
border: 1px solid #ccc;
margin-right: 20px;
}
.path-course-view li.activity {
border-bottom: 1px dashed #c3daf9;
padding-top: 10px;
padding-bottom: 5px;
}
/* @end */
/* @group Dock */
body.has_dock {
margin:0;
margin: 0;
}
#dock {
border-right: 0px none;
background: url([[pix:theme|dock]]) repeat-y top right #fff;
@@ -251,48 +217,42 @@ body.has_dock {
bottom:auto;
background-color:#5ea4dc;
}
#dock .dockeditem {
background: url([[pix:theme|dock]]) repeat-y top right #fff;
padding:2px;
padding-right:0px;
}
#dock .dockedtitle {
border-width:0;
}
#dock .dockedtitle h2 {
margin:0;
padding:10px 3px;
}
#dock .dockedtitle.activeitem {
background-color:#407ea8;
border-top: 1px solid #6f6856;
}
#dockeditempanel {
background-color:#5ea4dc;
margin-left:0px;
border-left: none;
}
#dockeditempanel .dockeditempanel_content {
border-color:#6f6856;
border-left: none;
}
#dockeditempanel .dockeditempanel_hd {
background: #407ea8;
border-width:0;
}
#dockeditempanel .dockeditempanel_hd h2 {
font-size:1em;
color:#fff;
}
#dockeditempanel .dockeditempanel_bd .block_navigation .block_tree li {
overflow:visible;
}
/* @end */
@@ -303,7 +263,6 @@ body.has_dock {
margin: 0;
padding: 0;
}
#page-footer-inner{
padding: 20px 0 30px;
clear: both;
@@ -314,28 +273,26 @@ body.has_dock {
height: 75px;
text-align: left;
}
#page-footer .footnote {
float: left;
padding-top: 80px;
padding-left: 20px;
}
#page-footer .logininfo {
padding-top: 80px;
text-align: right;
}
.purgecaches {
padding-bottom: 10px;
}
.purgecaches a {
text-decoration: none;
padding: 0 1em;
}
.purgecaches a:link,
.purgecaches a:hover {
border-style: solid;
}
.purgecaches a:link {
border-width: 1px 2px 2px 1px;
border-color: #CECECE #8A8A8A #8A8A8A #CECECE;
@@ -344,7 +301,6 @@ body.has_dock {
border-width: 2px 1px 1px 2px;
border-color: #8A8A8A #CECECE #CECECE #8A8A8A;
}
/* @end */
/* @group Forums */
@@ -369,5 +325,4 @@ body.has_dock {
background: #FFF;
padding:4px;
}
/* @end */
/* @end */
-1
View File
@@ -12,7 +12,6 @@ body {
#page {
width:100%;
max-width: 1600px;
overflow:hidden;
margin:0 auto;
}
+128 -117
View File
@@ -1,127 +1,138 @@
/** Report layout **/
body.pagelayout-report {
background-image: none;
background-color: #fff;
#report-wrapper {
background: #fff;
margin: 20px 2% 0;
padding: 0px;
border: 1px solid #c1bc9d;
}
body.pagelayout-report.has_dock {
margin-left: 30px;
}
.pagelayout-report #page {
width: 100%;
margin: 0 auto;
position: relative;
}
.pagelayout-report #page-header,
.pagelayout-report #page-footer {
float: none;
background: #f3f3f3 none;
width: 100%;
margin: 0;
padding: 0;
text-align: left;
}
.pagelayout-report #page-header {
background:#97d3f4 url([[pix:theme|header]]) no-repeat top right;
margin-bottom: 0px;
height: 105px;
border-bottom: 1px solid #FFF;
}
.pagelayout-report #page-header #custommenu {
display: none;
}
.pagelayout-report .navbar {
background-color: #FFF;
height: 20px;
margin: 0;
padding: 5px 0;
}
.pagelayout-report #page-footer {
text-align: center;
height: auto;
}
.pagelayout-report #page-footer .logininfo,
.pagelayout-report #page-footer .homelink {
margin: 1em 0 0;
padding: 0;
text-align: center;
}
.pagelayout-report #page-content {
background: #FFF url([[pix:theme|top_bg]]) repeat-x center top;
float: none;
overflow: visible;
width: auto;
padding-top: 1em;
}
.pagelayout-report #report-main-content {
#report-page-content {
clear: both;
float: left;
width: 100%;
}
.pagelayout-report #report-main-content .region-content {
margin-left: 210px;
overflow: visible;
padding-bottom: 20px;
}
.pagelayout-report #report-main-content .region-content table.generaltable {
background-color: #FFF;
width: 98%;
margin: 0 auto;
padding: 0;
}
.pagelayout-report #report-region-wrap {
width: 0;
float: right;
overflow: hidden;
position: relative;
left: -100%;
}
.pagelayout-report #report-region-pre {
width: 200px;
margin-left: 5px;
}
/** CONTENT ONLY **/
.pagelayout-report.content-only #report-main-content .region-content {
margin-left: 10px;
}
.pagelayout-report.content-only #report-region-pre {
width: 0;
}
/** Correct for right to left languages **/
.dir-rtl.pagelayout-report #report-main-content .region-content {
margin-left: 0;
margin-right: 210px;
}
.dir-rtl.pagelayout-report #report-region-wrap {
left:0;
}
/** Stabalise IE6 behaviour on the report layout **/
.ie6.pagelayout-report #report-main-content {
float: none;
width: auto;
}
.ie6.pagelayout-report #report-region-wrap {
float: none;
width: 200px;
left: auto;
position: absolute;
top: 0;
}
.ie6.pagelayout-report #report-region-pre,
.ie6.pagelayout-report #report-region-pre .block {
width: 100%;
}
#report-page-content #report-region-main-box {
float: left;
right: 0%;
position: relative;
width: 100%;
}
#report-page-content #report-region-main-box #report-region-post-box {
float: left;
right: 82%;
position: relative;
width: 100%;
}
#report-page-content #report-region-main-box
#report-region-post-box #report-region-main {
float: left;
overflow: hidden;
position: relative;
margin-right: 0px;
left: 101%;
width: 80%;
}
#report-page-content #report-region-main-box
#report-region-post-box #report-region-pre {
float: left;
overflow: hidden;
position: relative;
left: 3%;
width: 16%;
}
#report-page-content #report-region-main-box
#report-region-post-box #report-region-main .region-content {
overflow: hidden;
padding: 20px 0px;
}
#report-page-content #report-region-main-box
#report-region-post-box #report-region-pre .region-content {
overflow: hidden;
padding: 20px 0 0;
}
#report-page-content-wrapper .generaltable {
width: 100%;
}
/* REPORT FOOTER
-------------------------*/
.pagelayout-admin #page-footer-inner,
.pagelayout-report #page-footer-inner {
margin: 0 2%;
}
/* REPORT DOCK
-------------------------*/
body.pagelayout-report.has_dock {
margin-left: 3%
}
.pagelayout-report #dock {
width: 3%;
}
/* CONTENT-ONLY
-------------------------*/
.pagelayout-admin.content-only #report-page-content-wrapper
#report-page-content #report-region-main-box #report-region-post-box,
.pagelayout-report.content-only #report-page-content-wrapper
#report-page-content #report-region-main-box #report-region-post-box {
right: 1%;
width: 100%;
}
.pagelayout-admin.content-only #report-page-content-wrapper
#report-page-content #report-region-main-box #report-region-post-box #report-region-main,
.pagelayout-report.content-only #report-page-content-wrapper
#report-page-content #report-region-main-box #report-region-post-box #report-region-main {
left: 1%;
width: 100%;
}
.pagelayout-admin.content-only #report-page-content-wrapper #report-page-content
#report-region-main-box #report-region-post-box #report-region-pre,
.pagelayout-report.content-only #report-page-content-wrapper #report-page-content
#report-region-main-box #report-region-post-box #report-region-pre {
left: 0;
width: 0;
}
.pagelayout-admin.content-only #report-page-content-wrapper
#report-page-content #report-region-main-box #report-region-post-box
#report-region-main .region-content,
.pagelayout-report.content-only #report-page-content-wrapper
#report-page-content #report-region-main-box #report-region-post-box
#report-region-main .region-content {
padding: 0 1%;
}
/* @pagelayout-report - overflow */
.pagelayout-admin #report-page-content #report-region-main,
.pagelayout-report #report-page-content #report-region-main {
overflow: auto;
}
.pagelayout-admin #report-page-content #report-region-main .region-content,
.pagelayout-report #report-page-content #report-region-main .region-content {
overflow: visible;
}
/* @pagelayout-report - horizontal overflow */
.pagelayout-admin #report-page-content-wrapper #report-page-content #report-region-main-box
#report-region-post-box #report-region-main .region-content .no-overflow,
.pagelayout-report #report-page-content-wrapper #report-page-content #report-region-main-box
#report-region-post-box #report-region-main .region-content .no-overflow {
overflow: auto;
}
@media print {
.pagelayout-report .region-content {margin-left: 0px !important;}
.pagelayout-report #report-region-pre {width: 0px !important;}
.pagelayout-report .region-content table.generaltable {font-size:70% !important;}
.pagelayout-report #page-header,
.pagelayout-report #page-footer,
.pagelayout-report #dock { display: none;}
#report-page-content #report-region-main-box {right: 0%;}
#report-page-content #report-region-main-box #report-region-post-box {right: 100%;}
#report-page-content #report-region-main-box #report-region-post-box #report-region-main {left: 101%; width: 98%;}
#report-page-content #report-region-main-box #report-region-post-box #report-region-pre {width: 0%; left: 0%}
#report-page-content-wrapper table.generaltable { font-size: 70% !important;}
#page-header,
#page-footer,
#dock { display: none;}
}