merged from 1.9 :: Some theme enhancements while working on MDL-12098 and MDL-11154...

diff --git a/theme/custom_corners/footer.html b/theme/custom_corners/footer.html
index 6cfc0f2e1a5ee3b03cca742ebfcc86539e174d3a..1b7d69e8ae8a6e9e5dc1b0f95358ebdf1a370762 100644 (file)
--- a/theme/custom_corners/footer.html
+++ b/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
@@ -16,7 +25,6 @@
 ?>
     <?php print_custom_corners_end(); ?>
 </div>
-</div>
 <?php 
      $useridarray = array(2 // MD
                           );
@@ -24,8 +32,13 @@
      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() {

diff --git a/theme/custom_corners/header.html b/theme/custom_corners/header.html
index 1f039a3936cb6beefc72674c4d6e1d514c7f86ab..57d089e540ed2710ebc0504f92a527fa86a36b4c 100644 (file)
--- a/theme/custom_corners/header.html
+++ b/theme/custom_corners/header.html
@@ -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
@@ -53,6 +59,7 @@
                 }
             }
         }
+        
     ?>
 </head>
 
@@ -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(); ?>
@@ -94,7 +101,9 @@
     </div>
     <?php print_custom_corners_end(); ?>
     </div>
-<?php } ?>
+<?php }
+    }
+?>
     <!-- END OF HEADER -->
 <div id="content">
     <?php print_custom_corners_start(true, false, 'content'); ?>

diff --git a/theme/custom_corners/user_styles.css b/theme/custom_corners/user_styles.css
index b14859aa9b65d0a100b7b25b7a9b88918dc4fb16..215cdf854e8ab9ebeec3230911ee3ac4e0447fd7 100644 (file)
--- a/theme/custom_corners/user_styles.css
+++ b/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;
@@ -26,6 +25,7 @@ div#page {
   margin: 0 4%;
   padding-top: 2px;
   width: auto;
+  /* min-width: 800px; */
 }
 div.clearer {
   clear: both;
@@ -1028,6 +1028,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;