merged from 1.5

theme/orangewhitepda/config.php

@@ -6,14 +6,14 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->sheets = array('styles_layout', 'styles_font', 'styles_color');
+$THEME->sheets = array('styles_pda');
 
 /// This variable is an array containing the names of all the 
 /// stylesheet files you want included in this theme, and in what order
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->standardsheets = false;  
+$THEME->standardsheets = array('styles_layout');
 
 /// This variable can be set to an array containing
 /// filenames from the *STANDARD* theme.  If the 
@@ -24,12 +24,11 @@
 /// This parameter can be used, for example, to prevent 
 /// having to override too many classes.
 /// Note that the trailing .css should not be included
-/// eg $THEME->standardsheets = array('styles_layout', 'styles_fonts', 
-///                                   'styles_color', 'styles_moz');
+/// eg $THEME->standardsheets = array('styles_layout','styles_fonts','styles_color');
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->parent = '';  
+$THEME->parent = 'orangewhite';  
 
 /// This variable can be set to the name of a parent theme
 /// which you want to have included before the current theme.
@@ -40,7 +39,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-$THEME->parentsheets = false;  
+$THEME->parentsheets = array('styles_layout', 'styles_fonts', 'styles_color', 'styles_tabs');  
 
 /// This variable can be set to an array containing
 /// filenames from a chosen *PARENT* theme.  If the 
@@ -51,11 +50,70 @@
 /// This parameter can be used, for example, to prevent 
 /// having to override too many classes.
 /// Note that the trailing .css should not be included
-/// eg $THEME->standardsheets = array('styles_layout', 'styles_fonts', 
-///                                   'styles_color', 'styles_moz');
+/// eg $THEME->parentsheets = array('styles_layout','styles_fonts','styles_color');
 ////////////////////////////////////////////////////////////////////////////////
 
 
+$THEME->modsheets = true;  
+
+/// When this is enabled, then this theme will search for 
+/// files named "styles.php" inside all Activity modules and 
+/// include them.   This allows modules to provide some basic 
+/// layouts so they work out of the box.
+/// It is HIGHLY recommended to leave this enabled.
+
+
+$THEME->blocksheets = true;  
+
+/// When this is enabled, then this theme will search for 
+/// files named "styles.php" inside all Block modules and 
+/// include them.   This allows Blocks to provide some basic 
+/// layouts so they work out of the box.
+/// It is HIGHLY recommended to leave this enabled.
+
+
+$THEME->langsheets = false;  
+
+/// By setting this to true, then this theme will search for 
+/// a file named "styles.php" inside the current language
+/// directory.  This allows different languages to provide 
+/// different styles.
+
+
+$THEME->navmenuwidth = 50;
+
+/// You can use this to control the cutoff point for strings 
+/// in the navmenus (list of activities in popup menu etc)
+/// Default is 50 characters wide.
+
+
+$THEME->makenavmenulist = false;
+
+/// By setting this to true, then you will have access to a
+/// new variable in your header.html and footer.html called
+/// $navmenulist ... this contains a simple XHTML menu of 
+/// all activities in the current course, mostly useful for 
+/// creating popup navigation menus and so on.
+
+
+
+$THEME->resource_mp3player_colors = 
+ 'bgColour=000000&btnColour=ffffff&btnBorderColour=cccccc&iconColour=000000&'.
+ 'iconOverColour=00cc00&trackColour=cccccc&handleColour=ffffff&loaderColour=ffffff&'.
+ 'font=Arial&fontColour=3333FF&buffer=10&waitForPlay=no&autoPlay=yes';
+
+/// With this you can control the colours of the "big" MP3 player 
+/// that is used for MP3 resources.
+
+
+$THEME->filter_mediaplugin_colors = 
+ 'bgColour=000000&btnColour=ffffff&btnBorderColour=cccccc&iconColour=000000&'.
+ 'iconOverColour=00cc00&trackColour=cccccc&handleColour=ffffff&loaderColour=ffffff&'.
+ 'waitForPlay=yes';
+
+/// ...And this controls the small embedded player
+
+
 $THEME->custompix = false;
 
 /// If true, then this theme must have a "pix" 

theme/orangewhitepda/footer.html

@@ -1,13 +1,15 @@
 
 </div> <!-- end div containerContent -->
 <!-- START OF FOOTER -->
+<?php global $CFG, $course; ?>
 <div id="footer">
 <?php echo $loggedinas ?>
-<p class="homelink"><?php echo $homelink ?></p>
+<?php echo $homelink ?>
+<!-- <p><div class="homelink"><a target="<?php echo $CFG->framename ?>" href="<?php $CFG->wwwroot ?>/course/view.php?id=<?php $course->id ?>"> <?php $course->shortname ?> </a></div></p> -->
 <p>
-<a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/xhtml_1_0.gif" alt="XHTML Validator" /></a> 
+<!-- <<a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/xhtml_1_0.gif" alt="XHTML Validator" /></a>
 <a href="http://jigsaw.w3.org/css-validator/validator?uri=<?php echo urlencode(qualified_me()) ?>&amp;warning=1&amp;profile=css2&amp;usermedium=all"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/css.gif" alt="CSS Validator" /></a> 
-<a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/section_508.gif" alt="Section 508 Validator" /></a>
+<a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&amp;url1=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->wwwroot/theme/$CFG->theme" ?>/section_508.gif" alt="Section 508 Validator" /></a> -->
 </p>
 </div>
 </div>

theme/orangewhitepda/header.html

@@ -23,23 +23,21 @@
         <div class="headermain"><?php echo $heading ?></div>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
-    <div class="clearer"></div>
-    <div id="nav-bar">
+    <div class="navbar">
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading 
 ?>
     <div id="header">
         <div class="headermain"><?php echo $heading ?></div>
         <div class="headermenu"><?php echo $menu ?></div>
+        <!-- <div class="headermenu"><div id="new-menu"><?php echo $navmenulist ?></div></div> -->
     </div>
 <?php } ?>
-    <div class="clearer"></div>
 <?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
-    <div id="nav-bar">
-        <div id="breadcrumb"><?php print_navigation("$navigation"); ?></div>
-        <div id="navbutton"><?php echo $button; ?></div>
+    <div class="navbar">
+        <div class="breadcrumb"><?php print_navigation("$navigation"); ?></div>
+        <div class="navbutton"><?php echo $button; ?></div>
     </div>
 <?php } ?>
-    <div class="clearer"></div>
     <!-- END OF HEADER -->
 <div id="content">

theme/orangewhitepda/styles.php

@@ -1,48 +1,18 @@
 <?PHP /*  $Id$ */
 
-/// This PHP script is used because it provides a place for setting 
-/// up any necessary variables, and lets us include raw CSS files.
+/// Every theme should contain a copy of this script.  It lets us 
+/// set up variables and so on before we include the raw CSS files.
 /// The output of this script should be a completely standard CSS file.
 
-/// There should be no need to modify this file!!  Use config.php instead.
+/// THERE SHOULD BE NO NEED TO MODIFY THIS FILE!!  USE CONFIG.PHP INSTEAD.
 
-    $nomoodlecookie = true;
-    require_once("../../config.php");
 
-    $lastmodified = 0;
-    $lifetime = 600;
-
-/// If we are a parent theme, then check for parent definitions
-
-    if (isset($parent)) {
-        if (!isset($THEME->parentsheets) or $THEME->parentsheets === true) {     // Use all the sheets we have
-            $THEME->sheets = array('styles_layout', 'styles_fonts', 'styles_color', 'styles_moz');
-        } else if (empty($THEME->parentsheets)) {                                // We can stop right now!
-            exit;
-        } else {                                                                 // Use the provided subset only
-            $THEME->sheets = $THEME->parentsheets;
-        }
-    }
-
-/// Work out the last modified date for this theme
-
-    foreach ($THEME->sheets as $sheet) {
-        if (file_exists($sheet.'.css')) {
-            $sheetmodified = filemtime($sheet.'.css');
-            if ($sheetmodified > $lastmodified) {
-                $lastmodified = $sheetmodified;
-            }
-        }
-    }
-
-/// Print out the entire style sheet
-
-    style_sheet_setup($lastmodified, $lifetime);
-
-    foreach ($THEME->sheets as $sheet) {
-        echo "/***** $sheet.css start *****/\n\n";
-        include_once($sheet.'.css');
-        echo "\n\n/***** $sheet.css end *****/\n\n";
-    }
+    $lifetime  = 600;                                   // Seconds to cache this stylesheet
+    $nomoodlecookie = true;                             // Cookies prevent caching, so don't use them
+    require_once("../../config.php");                   // Load up the Moodle libraries
+    $themename = basename(dirname(__FILE__));           // Name of the folder we are in
+    $forceconfig = optional_param('forceconfig', '', PARAM_FILE);   // Get config from this theme
 
+    style_sheet_setup(filemtime('styles.php'), $lifetime, $themename, $forceconfig);
+
 ?>