Updated to use the new standardsheets variable

diff --git a/theme/XHTML_CSS_UH/config.php b/theme/XHTML_CSS_UH/config.php
index 9388a1c5d06502a9ee99311079d59720530d00d0..b8561b7f85116388619e20301f0e9e122ea32bea 100644 (file)
--- a/theme/XHTML_CSS_UH/config.php
+++ b/theme/XHTML_CSS_UH/config.php
@@ -1,18 +1,31 @@
 <?PHP // $Id$
 
-$THEME->body         = "#FFF8EF";  // Main page color
-$THEME->cellheading  = "#A7B1B7";  // Standard headings of big tables
-$THEME->cellheading2 = "#849DBC";  // Highlight headings of tables
-$THEME->cellcontent  = "#FFFFFF";  // For areas with text
-$THEME->cellcontent2 = "#A7B1B7";  // Alternate colour
-$THEME->borders      = "##A7B1B7";  // Table borders
-$THEME->highlight    = "#849DBC";  // Highlighted text (eg after a search)
-$THEME->hidden       = "#979EA8";  // To color things that are hidden
-$THEME->autolink     = "#FFF8EF";  // To color auto-generated links (eg glossary)
+////////////////////////////////////////////////////////////////////////////////
+/// This file contains a few configuration variables that control 
+/// how Moodle uses this theme.
+////////////////////////////////////////////////////////////////////////////////
 
-$THEME->custompix    = false;       // If true, then this theme must have a "pix"
-                                   // subdirectory that contains copies of all
-                                   // files from the moodle/pix directory
-                                   // See "cordoroyblue" for an up-to-date example.
+$THEME->custompix = false;
+
+/// If true, then this theme must have a "pix" 
+/// subdirectory that contains copies of all 
+/// files from the moodle/pix directory, plus a
+/// "pix/mod" directory containing all the icons 
+/// for all the activity modules.
+////////////////////////////////////////////////////////////////////////////////
+
+$THEME->standardsheets = array('styles_layout', 'styles_fonts', 'styles_color');
+
+/// This variable can be set to an array containing
+/// filenames from the *STANDARD* theme.  If the 
+/// array exists, it will be used to choose the 
+/// files to include in the standard style sheet.
+/// When false, then no files are used.
+/// When true or NON-EXISTENT, then ALL standard files are used.
+/// 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');
+////////////////////////////////////////////////////////////////////////////////
 
-?>

diff --git a/theme/XHTML_CSS_UH/styles.php b/theme/XHTML_CSS_UH/styles.php
index 5ed58ad69486021855d1cc9ed135c524cbd65435..026a1f08cd61a90ebef1223807977647d174f10d 100644 (file)
--- a/theme/XHTML_CSS_UH/styles.php
+++ b/theme/XHTML_CSS_UH/styles.php
@@ -1,6 +1,8 @@
 <?PHP /*  $Id$ */
 
-/// We use PHP so we can do value substitutions into the styles
+/// This PHP script is used because it provides a place for setting 
+/// up any necessary variables, and lets us include raw CSS files.
+/// The output of this script should be a completely standard CSS file.
 
     if (!isset($themename)) {
         $themename = NULL;
@@ -8,10 +10,24 @@
 
     $nomoodlecookie = true;
     require_once("../../config.php");
-    $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);
 
-    include ("./styles_layout.css");
-    include ("./styles_font.css");
-    include ("./styles_color.css");
-    // include ("./styles_block.css");
-?>
\ No newline at end of file
+    $subsheets = array('styles_layout', 'styles_font', 'styles_color');
+
+/// There should be no need to touch the following
+
+    $lastmodified = filemtime('styles.php');
+
+    foreach ($subsheets as $subsheet) {
+        $lastmodifiedsub = filemtime($subsheet.'.css');
+        if ($lastmodifiedsub > $lastmodified) {
+            $lastmodified = $lastmodifiedsub;
+        }
+    }
+
+    $themeurl = style_sheet_setup($lastmodifiedsub, 600, $themename);
+
+    foreach ($subsheets as $subsheet) {
+        include_once($subsheet.'.css');
+    }
+
+?>