Moving all the config to config.php ... styles.php should now not

need to be touched for most themes.

diff --git a/theme/orangewhite/config.php b/theme/orangewhite/config.php
index 420c2996d036d9fd941d5c581c1af4bbfec19bd9..49bfc7473049c9f06ef88881a88a13553344f157 100644 (file)
--- a/theme/orangewhite/config.php
+++ b/theme/orangewhite/config.php
@@ -14,7 +14,13 @@ $THEME->custompix = false;
 /// for all the activity modules.
 ////////////////////////////////////////////////////////////////////////////////
 
-// $THEME->standardsheets = array('styles_layout', 'styles_fonts', 'styles_color');
+$THEME->subsheets = array('styles_layout', 'styles_font', 'styles_color');
+
+/// This array specifies the names of .css files from the current 
+/// directory that you want to be loaded for this theme.
+////////////////////////////////////////////////////////////////////////////////
+
+
 $THEME->standardsheets = false;
 
 /// This variable can be set to an array containing

diff --git a/theme/orangewhite/styles.php b/theme/orangewhite/styles.php
index 026a1f08cd61a90ebef1223807977647d174f10d..97621a943b9fb7a054d78a3468574fc712bc8023 100644 (file)
--- a/theme/orangewhite/styles.php
+++ b/theme/orangewhite/styles.php
@@ -4,6 +4,8 @@
 /// up any necessary variables, and lets us include raw CSS files.
 /// The output of this script should be a completely standard CSS file.
 
+/// THERE IS USUALLY NO NEED TO EDIT THIS FILE!  See config.php
+
     if (!isset($themename)) {
         $themename = NULL;
     }
@@ -11,13 +13,9 @@
     $nomoodlecookie = true;
     require_once("../../config.php");
 
-    $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) {
+    foreach ($THEME->subsheets as $subsheet) {
         $lastmodifiedsub = filemtime($subsheet.'.css');
         if ($lastmodifiedsub > $lastmodified) {
             $lastmodified = $lastmodifiedsub;
@@ -26,7 +24,7 @@
 
     $themeurl = style_sheet_setup($lastmodifiedsub, 600, $themename);
 
-    foreach ($subsheets as $subsheet) {
+    foreach ($THEME->subsheets as $subsheet) {
         include_once($subsheet.'.css');
     }