From 739efc85f8413dac8faaf394d964cceecdddcab8 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Mon, 23 Jan 2012 00:55:59 +0000 Subject: [PATCH] MDL-31189 fixes performance info in theme_sky_high footer --- theme/sky_high/config.php | 21 +++---------- theme/sky_high/layout/frontpage.php | 43 +++++++++++++++---------- theme/sky_high/layout/general.php | 42 ++++++++++++++++--------- theme/sky_high/style/core.css | 49 ++++++++++++++++++++--------- theme/sky_high/style/settings.css | 5 +++ 5 files changed, 98 insertions(+), 62 deletions(-) create mode 100644 theme/sky_high/style/settings.css diff --git a/theme/sky_high/config.php b/theme/sky_high/config.php index 2f7c358f4ad..4344ffa0448 100644 --- a/theme/sky_high/config.php +++ b/theme/sky_high/config.php @@ -52,11 +52,12 @@ $THEME->parents = array( $THEME->sheets = array( - 'core', 'pagelayout', + 'core', 'menu', 'report', - 'admin' + 'admin', + 'settings' ); //////////////////////////////////////////////////// @@ -220,12 +221,6 @@ $THEME->csspostprocess = 'sky_high_process_css'; // Overrides the right arrow image used throughout Moodle //////////////////////////////////////////////////// -// $THEME->layouts - -//////////////////////////////////////////////////// -// An array setting the layouts for the theme -//////////////////////////////////////////////////// - // $THEME->parents_exclude_javascripts //////////////////////////////////////////////////// @@ -233,13 +228,6 @@ $THEME->csspostprocess = 'sky_high_process_css'; // the themes parents //////////////////////////////////////////////////// -// $THEME->parents_exclude_sheets - -//////////////////////////////////////////////////// -// An array of stylesheets not to inherit from the -// themes parents -//////////////////////////////////////////////////// - // $THEME->plugins_exclude_sheets //////////////////////////////////////////////////// @@ -252,5 +240,4 @@ $THEME->csspostprocess = 'sky_high_process_css'; //////////////////////////////////////////////////// // Sets a custom render factory to use with the // theme, used when working with custom renderers. -//////////////////////////////////////////////////// - +//////////////////////////////////////////////////// \ No newline at end of file diff --git a/theme/sky_high/layout/frontpage.php b/theme/sky_high/layout/frontpage.php index f09862d8482..eced8e3dab6 100644 --- a/theme/sky_high/layout/frontpage.php +++ b/theme/sky_high/layout/frontpage.php @@ -113,27 +113,38 @@ echo $OUTPUT->doctype() ?> + + -
-
- login_info(); - echo $OUTPUT->standard_footer_html(); - ?> -
+
+ + + + +
+
+ login_info(); + ?> +
+ + + +

+ home_link(); ?> + standard_footer_html(); ?> + + +
+ - -

- -

- home_link(); - echo $OUTPUT->standard_end_of_body_html() ?> -
+ + +standard_end_of_body_html() ?> - + \ No newline at end of file diff --git a/theme/sky_high/layout/general.php b/theme/sky_high/layout/general.php index 066e7c8a8d7..ff182479f9e 100644 --- a/theme/sky_high/layout/general.php +++ b/theme/sky_high/layout/general.php @@ -3,6 +3,7 @@ $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)); $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)); $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT)); @@ -124,27 +125,38 @@ echo $OUTPUT->doctype() ?> + + + +
-
-
- login_info(); - echo $OUTPUT->standard_footer_html(); - ?> -
+ + +
+
+ login_info(); + ?> +
+ + + +

+ home_link(); ?> + standard_footer_html(); ?> + + +
+ + - -

- -

- home_link(); - echo $OUTPUT->standard_end_of_body_html() ?> -
+ + +standard_end_of_body_html() ?> diff --git a/theme/sky_high/style/core.css b/theme/sky_high/style/core.css index cf667524578..1af68bb5bc3 100644 --- a/theme/sky_high/style/core.css +++ b/theme/sky_high/style/core.css @@ -91,7 +91,7 @@ a:hover, a:active, a:focus { padding-right: 0px; } -.headermain { +.headermain { font-weight:normal; margin:.8em 0.5em 0.75em; } @@ -162,11 +162,11 @@ p.helplink { /* @group Blocks */ -.block_action { +.block_action { padding:0px; } -.block .content { +.block .content { background:#c7eafd; border:1px solid #867f6a; } @@ -207,7 +207,7 @@ p.helplink { /* @group Course */ -.headingblock { +.headingblock { border: 0px none; border-bottom: 1px solid #98bcd6; padding-bottom: 0px; @@ -297,17 +297,25 @@ body.has_dock { /* @end */ /* @group Footer */ -#page-footer{ + +#page-footer { + text-align: center; + margin: 0; + padding: 0; +} + +#page-footer-inner{ padding: 20px 0 30px; clear: both; background: url([[pix:theme|footer]]) no-repeat top right #dfdfdf; - margin-top: 0px; + margin: 0px 5%; border: 1px solid #98bcd6; border-top: 5px solid #98bcd6; height: 75px; + text-align: left; } -.footnote { +#page-footer .footnote { float: left; padding-top: 80px; padding-left: 20px; @@ -317,6 +325,26 @@ body.has_dock { padding-top: 80px; text-align: right; } + +.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; +} +.purgecaches a:hover { + border-width: 2px 1px 1px 2px; + border-color: #8A8A8A #CECECE #CECECE #8A8A8A; +} + /* @end */ /* @group Forums */ @@ -342,11 +370,4 @@ body.has_dock { padding:4px; } - -/* @end */ - -/* @group Custom CSS */ - -[[setting:customcss]] - /* @end */ \ No newline at end of file diff --git a/theme/sky_high/style/settings.css b/theme/sky_high/style/settings.css new file mode 100644 index 00000000000..9d3e41b8072 --- /dev/null +++ b/theme/sky_high/style/settings.css @@ -0,0 +1,5 @@ +/* @group Custom CSS */ + +[[setting:customcss]] + +/* @end */ \ No newline at end of file