Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Some theme enhancements while working on MDL-12098 and MDL-11154.Some…
… theme enhancements while working on MDL-12098 and MDL-11154.
  • Loading branch information
urs_hunkler committed Nov 11, 2007
1 parent fb87e8a commit 6a1a00b
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
19 changes: 16 additions & 3 deletions theme/custom_corners/footer.html
@@ -1,7 +1,16 @@
<?php print_custom_corners_end(false, 'content'); ?>
</div> <!-- end div containerContent -->
<!-- START OF FOOTER -->
<?php global $CFG, $COURSE; ?>
<?php
global $CFG, $COURSE;
if (function_exists('get_in_popup')) {
$inpopup = get_in_popup();
} else {
$inpopup = false;
}

if (!$inpopup) {
?>
<div id="footer">
<?php print_custom_corners_start(); ?>
<?php
Expand All @@ -16,16 +25,20 @@
?>
<?php print_custom_corners_end(); ?>
</div>
</div>
<?php
$useridarray = array(2 // MD
);

if (!empty($performanceinfo) && isloggedin() && in_array($USER->id, $useridarray)) {
echo $performanceinfo;
}
?>

} // end if inpopup
?>
</div> <!-- end page div -->
<?php
print_custom_corners_end();
?>
<script type="text/javascript">
/* <![CDATA[ */
$(document).ready(function() {
Expand Down
21 changes: 15 additions & 6 deletions theme/custom_corners/header.html
Expand Up @@ -15,6 +15,12 @@
<?php

global $PAGE;

if (function_exists('get_in_popup')) {
$inpopup = get_in_popup();
} else {
$inpopup = false;
}

// handle pages which get displayed wrong
// either no custom corners or too much
Expand Down Expand Up @@ -53,6 +59,7 @@
}
}
}

?>
</head>

Expand All @@ -66,20 +73,20 @@
<?php if(!empty($infooutput)) { ?>
<div id="infowrapper"><div id="infooverlay"><?php echo $infooutput; ?></div></div>
<?php } ?>
<div id="page">
<div id="page"<?php echo (' class="'.(($inpopup) ? 'inpopup' : 'notinpopup').'"'); ?>>

<?php if ($home) { // This is what gets printed on the home page only
<?php if (!$inpopup) {
if ($home) { // This is what gets printed on the home page only
?>
<div id="header-home" class="clearfix">
<?php print_custom_corners_start(); ?>
<div class="wraphome">
<div class="wraphome clearfix">
<h1 class="headermain"><?php echo $heading ?></h1>
<div class="headermenu"><?php echo $menu ?></div>
<div class="clearer">&nbsp;</div>
</div>
<?php print_custom_corners_end(); ?>
</div>
<?php } else { // This is what gets printed on any other page with a heading
<?php } else if ($heading) { // This is what gets printed on any other page with a heading
?>
<div id="header" class="clearfix">
<?php print_custom_corners_start(); ?>
Expand All @@ -94,7 +101,9 @@ <h1 class="headermain"><?php echo $heading ?></h1>
</div>
<?php print_custom_corners_end(); ?>
</div>
<?php } ?>
<?php }
}
?>
<!-- END OF HEADER -->
<div id="content">
<?php print_custom_corners_start(true, false, 'content'); ?>
6 changes: 5 additions & 1 deletion theme/custom_corners/user_styles.css
@@ -1,4 +1,3 @@
/* @override http://ubuntu.userver.lan/moodle_19/theme/custom_corners/user_styles.css */
div#infowrapper {
position: fixed;
overflow: auto;
Expand Down Expand Up @@ -26,6 +25,7 @@ div#page {
margin: 0 4%;
padding-top: 2px;
width: auto;
/* min-width: 800px; */
}
div.clearer {
clear: both;
Expand Down Expand Up @@ -1026,6 +1026,10 @@ body#course-user div.section {
body#course-user div.tabtree {
margin-bottom: 10px;
}
.tabrow0 div,
.tabrow0 ul {
top: 2.1em;
}
a.dimmed:link,
a.dimmed:visited {
color: #AAAAAA;
Expand Down

0 comments on commit 6a1a00b

Please sign in to comment.