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

This commit is contained in:
Sam Hemelryk 2012-01-24 11:07:22 +08:00
commit 9e63f744c1
5 changed files with 98 additions and 62 deletions

View File

@ -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.
////////////////////////////////////////////////////
////////////////////////////////////////////////////

View File

@ -113,27 +113,38 @@ echo $OUTPUT->doctype() ?>
<!-- END OF CONTENT -->
</div>
<!-- END OF WRAPPER -->
<!-- START OF FOOTER -->
<div id="page-footer">
<div class="footnote"><?php echo $footnote; ?></div>
<?php
echo $OUTPUT->login_info();
echo $OUTPUT->standard_footer_html();
?>
</div>
<div id="page-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>
<!-- 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>
</html>

View File

@ -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() ?>
<!-- END OF CONTENT -->
</div>
<!-- END OF WRAPPER -->
<!-- START OF FOOTER -->
<?php if ($hasfooter) { ?>
<div id="page-footer">
<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>

View File

@ -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 */

View File

@ -0,0 +1,5 @@
/* @group Custom CSS */
[[setting:customcss]]
/* @end */