Permalink
Browse files

MDL-31328_master theme_sky_high: fixed report layout and related file…

…s + updated css + added horizontal scroll
  • Loading branch information...
1 parent 3bfeac2 commit c13c397355c7dbbcd581e517c2ab96696e9cdc59 @lazydaisy lazydaisy committed with Sam Hemelryk Feb 25, 2012
View
@@ -121,7 +121,7 @@
'defaultregion' => 'side-post',
),
'admin' => array(
- 'file' => 'general.php',
+ 'file' => 'report.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
@@ -162,14 +162,20 @@
'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',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
'report' => array(
- 'theme' => 'base',
'file' => 'report.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
@@ -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 @@
} 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 {
@@ -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 @@
} 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 {
@@ -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 @@
<?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 @@
<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="page-content-wrapper">
- <div id="page-content">
- <div id="region-main-box">
- <div id="region-post-box">
+<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="region-main-wrap">
- <div id="region-main">
- <div class="region-content">
- <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
- </div>
+ <div id="report-region-main">
+ <div class="region-content">
+ <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</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 @@
<!-- 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>
-<!-- END OF FOOTER -->
+<!-- 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>
- <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>
Oops, something went wrong.

0 comments on commit c13c397

Please sign in to comment.