Changes for new styles and scheme

diff --git a/theme/index.php b/theme/index.php
index bdcd17bb0c19dbeb6cf28264b6cfd4436a6fbe58..5c4aef8ba95c50e9113a8b5bf10f29b0c811add2 100644 (file)
--- a/theme/index.php
+++ b/theme/index.php
@@ -11,7 +11,7 @@
 
     if ($preview) {
         $CFG->theme = $preview;
-        $CFG->stylesheet  = "$CFG->wwwroot/theme/$CFG->theme/styles.css";
+        $CFG->stylesheet  = "$CFG->wwwroot/theme/$CFG->theme/styles.php?themename=$preview";
         $CFG->header      = "$CFG->dirroot/theme/$CFG->theme/header.html";
         $CFG->footer      = "$CFG->dirroot/theme/$CFG->theme/footer.html";
         include ("$CFG->theme/config.php");
@@ -55,7 +55,7 @@
     $themes = get_list_of_plugins("theme");
 
     echo "<TABLE ALIGN=CENTER cellpadding=7 cellspacing=5>";
-    echo "<TR><TH>$strtheme<TH>&nbsp;</TR>";
+    echo "<TR><TH class=\"generaltableheader\">$strtheme<TH class=\"generaltableheader\">&nbsp;</TR>";
     foreach ($themes as $theme) {
         include ("$theme/config.php");
         echo "<TR>";

diff --git a/theme/standard/config.php b/theme/standard/config.php
index 0de3ab15032f98ff1f846ce6d128febce6f3aa16..d97004832ad9c1172c2f4915d0e14706027ccf39 100644 (file)
--- a/theme/standard/config.php
+++ b/theme/standard/config.php
@@ -2,9 +2,10 @@
 
 $THEME->body         = "#FFEECE";  // Main page color
 $THEME->cellheading  = "#FFD991";  // Standard headings of big tables
-$THEME->cellheading2 = "#FFB62D";  // Highlight headings of tables
+$THEME->cellheading2 = "#FFC85F";  // Highlight headings of tables
 $THEME->cellcontent  = "#FFFFFF";  // For areas with text
 $THEME->cellcontent2 = "#FEE6B9";  // Alternate colour
 $THEME->borders      = "#555555";  // Table borders
+$THEME->highlight    = "#AAFFAA";  // Highlighted text (eg after a search)
 
 ?>

diff --git a/theme/standard/gradient.jpg b/theme/standard/gradient.jpg
new file mode 100755 (executable)
index 0000000..a122ff2
Binary files /dev/null and b/theme/standard/gradient.jpg differ

diff --git a/theme/standard/header.html b/theme/standard/header.html
index c4f7620a28d708d80496f4b4a2cbff0be1cd5fcb..40d5f9facff752140df48daa4a829b069e48fd46 100644 (file)
--- a/theme/standard/header.html
+++ b/theme/standard/header.html
@@ -3,7 +3,7 @@
 <TITLE><?=$title ?></TITLE>
 <META NAME="keywords" CONTENT="Moodle, <?=$title ?> ">
 <?=$meta ?>
-<LINK REL="stylesheet" HREF="<?=$styles ?>">
+<LINK REL="stylesheet" TYPE="text/css" HREF="<?=$styles ?>">
 <LINK REL="SHORTCUT ICON" HREF="<?=$CFG->wwwroot?>/theme/standard/favicon.ico">
 <? include("$CFG->javascript"); ?>
 </HEAD>
@@ -36,10 +36,10 @@
 
      <TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>
        <TR>
-         <TD BGCOLOR="<?=$THEME->cellheading?>">
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar">
            <FONT SIZE=2><B><? print_navigation("$navigation"); ?></B></FONT>
          </TD>
-         <TD BGCOLOR="<?=$THEME->cellheading?>" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
        </TR>
      </TABLE>
      <IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>

diff --git a/theme/standard/styles.css b/theme/standard/styles.css
deleted file mode 100644 (file)
index 4272ce4..0000000
--- a/theme/standard/styles.css
+++ /dev/null
@@ -1,29 +0,0 @@
-a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
-           text-decoration: none; \r
-           color: blue;}\r
-a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
-           text-decoration: none; \r
-           color: blue;}\r
-a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
-           text-decoration: underline; \r
-           color: red;}\r
-\r
-body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
-      font-weight: bold; \r
-      background-color: #FFD991;}\r
-td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-\r
-li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-\r
-form { margin-bottom: 0 ; }\r
-\r
-.highlight {\r
-    background-color: #AAFFAA;\r
-}\r
-\r

diff --git a/theme/standard/styles.php b/theme/standard/styles.php
new file mode 100644 (file)
index 0000000..9251967
--- /dev/null
+++ b/theme/standard/styles.php
@@ -0,0 +1,119 @@
+<?PHP // $Id$\r
+\r
+/// We use PHP so we can do value substitutions into the styles\r
+\r
+    require_once("../../config.php"); \r
+\r
+    if (isset($themename)) {\r
+        $CFG->theme = $themename;\r
+    }\r
+\r
+    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";\r
+\r
+/// From here on it's nearly a normal stylesheet.\r
+/// First are some CSS definitions for normal tags, \r
+/// then custom tags follow.\r
+///\r
+/// Note that colours are all defined in config.php\r
+/// in this directory\r
+\r
+?>\r
+\r
+\r
+a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: underline; \r
+           color: red;}\r
+\r
+body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+      font-weight: bold; \r
+      background-color: <?PHP echo $THEME->cellheading?>;}\r
+\r
+td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+form { margin-bottom: 0; }\r
+\r
+.highlight {\r
+    background-color: <?PHP echo $THEME->highlight?>;\r
+}\r
+\r
+.headingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.navbar {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generalbox {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.generaltable {\r
+}\r
+\r
+.generaltableheader {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generaltablecell {\r
+}\r
+\r
+.sideblock {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.sideblockheading {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.sideblockmain {\r
+}\r
+\r
+.sideblocklinks {\r
+}\r
+\r
+.sideblocklatestnews {\r
+}\r
+\r
+.sideblockrecentactivity {\r
+}\r
+\r
+.outlineheadingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.weeklyoutline {\r
+}\r
+\r
+.topicsoutline {\r
+}\r

diff --git a/theme/standardblue/config.php b/theme/standardblue/config.php
index 24afb470d9cb408b4037532d910f3b890f359da7..a2e1f9d45df1ae6cfb056863d03c967cd23d8e1c 100644 (file)
--- a/theme/standardblue/config.php
+++ b/theme/standardblue/config.php
@@ -3,9 +3,9 @@
 $THEME->body         = "#C5EFFF";  // Main page color
 $THEME->cellheading  = "#9ADAF4";  // Standard headings of big tables
 $THEME->cellheading2 = "#73C1E1";  // Highlight headings of tables
-
 $THEME->cellcontent  = "#FFFFFF";  // For areas with text
-$THEME->cellcontent2 = "#FFD991";  // Alternate colour
+$THEME->cellcontent2 = "#B7E4F6";  // Alternate colour
 $THEME->borders      = "#555555";  // Table borders
+$THEME->highlight    = "#AAFFAA";  // Highlighted text (eg after a search)
 
 ?>

diff --git a/theme/standardblue/gradient.jpg b/theme/standardblue/gradient.jpg
new file mode 100755 (executable)
index 0000000..c7abdc2
Binary files /dev/null and b/theme/standardblue/gradient.jpg differ

diff --git a/theme/standardblue/header.html b/theme/standardblue/header.html
index de14e537a8f1e71f84e9bc175490062c8ed6ce97..004feaa73a8e5c741344151742f027c787deb41a 100644 (file)
--- a/theme/standardblue/header.html
+++ b/theme/standardblue/header.html
@@ -3,7 +3,7 @@
 <TITLE><?=$title ?></TITLE>
 <META NAME="keywords" CONTENT="Moodle, <?=$title ?> ">
 <?=$meta ?>
-<LINK REL="stylesheet" HREF="<?=$styles ?>">
+<LINK REL="stylesheet" TYPE="text/css" HREF="<?=$styles ?>">
 <LINK REL="SHORTCUT ICON" HREF="<?=$CFG->wwwroot?>/theme/standardblue/favicon.ico">
 <? include("$CFG->javascript"); ?>
 </HEAD>
@@ -36,10 +36,10 @@
 
      <TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>
        <TR>
-         <TD BGCOLOR="<?=$THEME->cellheading?>">
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar">
            <FONT SIZE=2><B><? print_navigation("$navigation"); ?></B></FONT>
          </TD>
-         <TD BGCOLOR="<?=$THEME->cellheading?>" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
        </TR>
      </TABLE>
      <IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>

diff --git a/theme/standardblue/styles.css b/theme/standardblue/styles.css
deleted file mode 100644 (file)
index d25b6e0..0000000
--- a/theme/standardblue/styles.css
+++ /dev/null
@@ -1,21 +0,0 @@
-a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: none; color: blue;}
-a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: none; color: blue;}
-a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: underline; color: red;}
-
-body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-weight: bold; background-color: #8BCDE8;}
-td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-
-li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-
-form { margin-bottom: 0 ; }
-
-.highlight {
-    background-color: #AAFFAA;
-}
-

diff --git a/theme/standardblue/styles.php b/theme/standardblue/styles.php
new file mode 100644 (file)
index 0000000..9251967
--- /dev/null
+++ b/theme/standardblue/styles.php
@@ -0,0 +1,119 @@
+<?PHP // $Id$\r
+\r
+/// We use PHP so we can do value substitutions into the styles\r
+\r
+    require_once("../../config.php"); \r
+\r
+    if (isset($themename)) {\r
+        $CFG->theme = $themename;\r
+    }\r
+\r
+    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";\r
+\r
+/// From here on it's nearly a normal stylesheet.\r
+/// First are some CSS definitions for normal tags, \r
+/// then custom tags follow.\r
+///\r
+/// Note that colours are all defined in config.php\r
+/// in this directory\r
+\r
+?>\r
+\r
+\r
+a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: underline; \r
+           color: red;}\r
+\r
+body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+      font-weight: bold; \r
+      background-color: <?PHP echo $THEME->cellheading?>;}\r
+\r
+td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+form { margin-bottom: 0; }\r
+\r
+.highlight {\r
+    background-color: <?PHP echo $THEME->highlight?>;\r
+}\r
+\r
+.headingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.navbar {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generalbox {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.generaltable {\r
+}\r
+\r
+.generaltableheader {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generaltablecell {\r
+}\r
+\r
+.sideblock {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.sideblockheading {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.sideblockmain {\r
+}\r
+\r
+.sideblocklinks {\r
+}\r
+\r
+.sideblocklatestnews {\r
+}\r
+\r
+.sideblockrecentactivity {\r
+}\r
+\r
+.outlineheadingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.weeklyoutline {\r
+}\r
+\r
+.topicsoutline {\r
+}\r

diff --git a/theme/standardgreen/config.php b/theme/standardgreen/config.php
index 245a33f55cce563fb66966f40c168aca5ca2ccf9..1d6286b83b60bad1dad38bbf560bf101786561ed 100644 (file)
--- a/theme/standardgreen/config.php
+++ b/theme/standardgreen/config.php
@@ -1,11 +1,11 @@
 <?PHP // $Id$
 
 $THEME->body         = "#B4EFC1";  // Main page color
-$THEME->cellheading  = "#85E49A";  // Standard headings of big tables
+$THEME->cellheading  = "#8CDD94";  // Standard headings of big tables
 $THEME->cellheading2 = "#3DD35F";  // Highlight headings of tables
-
 $THEME->cellcontent  = "#FFFFFF";  // For areas with text
-$THEME->cellcontent2 = "#85E49A";  // Alternate colour
+$THEME->cellcontent2 = "#AFE9BB";  // Alternate colour
 $THEME->borders      = "#555555";  // Table borders
+$THEME->highlight    = "#AAFFAA";  // Highlighted text (eg after a search)
 
 ?>

diff --git a/theme/standardgreen/gradient.jpg b/theme/standardgreen/gradient.jpg
new file mode 100755 (executable)
index 0000000..1f7af1b
Binary files /dev/null and b/theme/standardgreen/gradient.jpg differ

diff --git a/theme/standardgreen/header.html b/theme/standardgreen/header.html
index d92154c01d2d1c4847b4e25d8245938c4711b8bb..c702e1e96d64e1bbf464ad1c8b5ef0dee3a2691e 100644 (file)
--- a/theme/standardgreen/header.html
+++ b/theme/standardgreen/header.html
@@ -3,7 +3,7 @@
 <TITLE><?=$title ?></TITLE>
 <META NAME="keywords" CONTENT="Moodle, <?=$title ?> ">
 <?=$meta ?>
-<LINK REL="stylesheet" HREF="<?=$styles ?>">
+<LINK REL="stylesheet" TYPE="text/css" HREF="<?=$styles ?>">
 <LINK REL="SHORTCUT ICON" HREF="<?=$CFG->wwwroot?>/theme/standardgreen/favicon.ico">
 <? include("$CFG->javascript"); ?>
 </HEAD>
@@ -36,10 +36,10 @@
 
      <TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>
        <TR>
-         <TD BGCOLOR="<?=$THEME->cellheading?>">
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar">
            <FONT SIZE=2><B><? print_navigation("$navigation"); ?></B></FONT>
          </TD>
-         <TD BGCOLOR="<?=$THEME->cellheading?>" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
        </TR>
      </TABLE>
      <IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>

diff --git a/theme/standardgreen/styles.css b/theme/standardgreen/styles.css
deleted file mode 100644 (file)
index 8c96053..0000000
--- a/theme/standardgreen/styles.css
+++ /dev/null
@@ -1,21 +0,0 @@
-a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: none; color: blue;}
-a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: none; color: blue;}
-a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: underline; color: red;}
-
-body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-weight: bold; background-color: #3DD35F;}
-td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-
-li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-
-form { margin-bottom: 0 ; }
-
-.highlight {
-    background-color: #FFAAAA;
-}
-

diff --git a/theme/standardgreen/styles.php b/theme/standardgreen/styles.php
new file mode 100644 (file)
index 0000000..9251967
--- /dev/null
+++ b/theme/standardgreen/styles.php
@@ -0,0 +1,119 @@
+<?PHP // $Id$\r
+\r
+/// We use PHP so we can do value substitutions into the styles\r
+\r
+    require_once("../../config.php"); \r
+\r
+    if (isset($themename)) {\r
+        $CFG->theme = $themename;\r
+    }\r
+\r
+    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";\r
+\r
+/// From here on it's nearly a normal stylesheet.\r
+/// First are some CSS definitions for normal tags, \r
+/// then custom tags follow.\r
+///\r
+/// Note that colours are all defined in config.php\r
+/// in this directory\r
+\r
+?>\r
+\r
+\r
+a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: underline; \r
+           color: red;}\r
+\r
+body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+      font-weight: bold; \r
+      background-color: <?PHP echo $THEME->cellheading?>;}\r
+\r
+td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+form { margin-bottom: 0; }\r
+\r
+.highlight {\r
+    background-color: <?PHP echo $THEME->highlight?>;\r
+}\r
+\r
+.headingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.navbar {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generalbox {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.generaltable {\r
+}\r
+\r
+.generaltableheader {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generaltablecell {\r
+}\r
+\r
+.sideblock {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.sideblockheading {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.sideblockmain {\r
+}\r
+\r
+.sideblocklinks {\r
+}\r
+\r
+.sideblocklatestnews {\r
+}\r
+\r
+.sideblockrecentactivity {\r
+}\r
+\r
+.outlineheadingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.weeklyoutline {\r
+}\r
+\r
+.topicsoutline {\r
+}\r

diff --git a/theme/standardlogo/config.php b/theme/standardlogo/config.php
index 6806d64d175f2da44beec40e2533a213f56cbe94..e231a15aa85d248c1edb9d824c8d51cbcabc2f45 100644 (file)
--- a/theme/standardlogo/config.php
+++ b/theme/standardlogo/config.php
@@ -6,5 +6,6 @@ $THEME->cellheading2 = "#FFB62D";  // Highlight headings of tables
 $THEME->cellcontent  = "#FFFFFF";  // For areas with text
 $THEME->cellcontent2 = "#FFD991";  // Alternate colour
 $THEME->borders      = "#555555";  // Table borders
+$THEME->highlight    = "#AAFFAA";  // Highlighted text (eg after a search)
 
 ?>

diff --git a/theme/standardlogo/gradient.jpg b/theme/standardlogo/gradient.jpg
new file mode 100755 (executable)
index 0000000..a122ff2
Binary files /dev/null and b/theme/standardlogo/gradient.jpg differ

diff --git a/theme/standardlogo/header.html b/theme/standardlogo/header.html
index f60e894721cfb465c4c74589e725760d642cc9d1..fce7df27cc29da4cbd1eac4c70699b5e0207f7da 100644 (file)
--- a/theme/standardlogo/header.html
+++ b/theme/standardlogo/header.html
@@ -3,7 +3,7 @@
 <TITLE><?=$title ?></TITLE>
 <META NAME="keywords" CONTENT="Moodle, <?=$title ?> ">
 <?=$meta ?>
-<LINK REL="stylesheet" HREF="<?=$styles ?>">
+<LINK REL="stylesheet" TYPE="text/css" HREF="<?=$styles ?>">
 <LINK REL="SHORTCUT ICON" HREF="<?=$CFG->wwwroot?>/theme/standardlogo/favicon.ico">
 <? include("$CFG->javascript"); ?>
 </HEAD>
@@ -38,10 +38,10 @@
 
      <TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>
        <TR>
-         <TD BGCOLOR="<?=$THEME->cellheading?>">
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar">
            <FONT SIZE=2><B><? print_navigation("$navigation"); ?></B></FONT>
          </TD>
-         <TD BGCOLOR="<?=$THEME->cellheading?>" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
        </TR>
      </TABLE>
      <IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>

diff --git a/theme/standardlogo/styles.css b/theme/standardlogo/styles.css
deleted file mode 100644 (file)
index 46c1c22..0000000
--- a/theme/standardlogo/styles.css
+++ /dev/null
@@ -1,29 +0,0 @@
-a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
-           text-decoration: none; \r
-           color: blue;}\r
-a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
-           text-decoration: none; \r
-           color: blue;}\r
-a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
-           text-decoration: underline; \r
-           color: red;}\r
-\r
-body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
-      font-weight: bold; \r
-      background-color: #FFD991;}\r
-td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-\r
-li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
-\r
-form { margin-bottom: 0 ; }\r
-\r
-\r
-.highlight {\r
-    background-color: #AAFFAA;\r
-}\r

diff --git a/theme/standardlogo/styles.php b/theme/standardlogo/styles.php
new file mode 100644 (file)
index 0000000..9251967
--- /dev/null
+++ b/theme/standardlogo/styles.php
@@ -0,0 +1,119 @@
+<?PHP // $Id$\r
+\r
+/// We use PHP so we can do value substitutions into the styles\r
+\r
+    require_once("../../config.php"); \r
+\r
+    if (isset($themename)) {\r
+        $CFG->theme = $themename;\r
+    }\r
+\r
+    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";\r
+\r
+/// From here on it's nearly a normal stylesheet.\r
+/// First are some CSS definitions for normal tags, \r
+/// then custom tags follow.\r
+///\r
+/// Note that colours are all defined in config.php\r
+/// in this directory\r
+\r
+?>\r
+\r
+\r
+a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: underline; \r
+           color: red;}\r
+\r
+body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+      font-weight: bold; \r
+      background-color: <?PHP echo $THEME->cellheading?>;}\r
+\r
+td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+form { margin-bottom: 0; }\r
+\r
+.highlight {\r
+    background-color: <?PHP echo $THEME->highlight?>;\r
+}\r
+\r
+.headingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.navbar {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generalbox {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.generaltable {\r
+}\r
+\r
+.generaltableheader {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generaltablecell {\r
+}\r
+\r
+.sideblock {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.sideblockheading {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.sideblockmain {\r
+}\r
+\r
+.sideblocklinks {\r
+}\r
+\r
+.sideblocklatestnews {\r
+}\r
+\r
+.sideblockrecentactivity {\r
+}\r
+\r
+.outlineheadingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.weeklyoutline {\r
+}\r
+\r
+.topicsoutline {\r
+}\r

diff --git a/theme/standardred/config.php b/theme/standardred/config.php
index 37d2472fc5d6f86074503768580018c988a41297..ba43d182ec10ea4a1789906b2f207f830fe90c84 100644 (file)
--- a/theme/standardred/config.php
+++ b/theme/standardred/config.php
@@ -3,9 +3,9 @@
 $THEME->body         = "#F5E7E7";  // Main page color
 $THEME->cellheading  = "#ECD2D2";  // Standard headings of big tables
 $THEME->cellheading2 = "#E9C5C6";  // Highlight headings of tables
-
 $THEME->cellcontent  = "#FFFFFF";  // For areas with text
-$THEME->cellcontent2 = "#ECD2D2";  // Alternate colour
+$THEME->cellcontent2 = "#ECD9D9";  // Alternate colour
 $THEME->borders      = "#552021";  // Table borders
+$THEME->highlight    = "#AAFFAA";  // Highlighted text (eg after a search)
 
 ?>

diff --git a/theme/standardred/gradient.jpg b/theme/standardred/gradient.jpg
new file mode 100755 (executable)
index 0000000..a9f2a1b
Binary files /dev/null and b/theme/standardred/gradient.jpg differ

diff --git a/theme/standardred/header.html b/theme/standardred/header.html
index 2d0472ad3cd91838acf534b75fe23fa128f4322f..30c2325bae8b6331a3dcb60573ad1911739f7eae 100644 (file)
--- a/theme/standardred/header.html
+++ b/theme/standardred/header.html
@@ -3,7 +3,7 @@
 <TITLE><?=$title ?></TITLE>
 <META NAME="keywords" CONTENT="Moodle, <?=$title ?> ">
 <?=$meta ?>
-<LINK REL="stylesheet" HREF="<?=$styles ?>">
+<LINK REL="stylesheet" TYPE="text/css" HREF="<?=$styles ?>">
 <LINK REL="SHORTCUT ICON" HREF="<?=$CFG->wwwroot?>/theme/standardred/favicon.ico">
 <? include("$CFG->javascript"); ?>
 </HEAD>
@@ -36,10 +36,10 @@
 
      <TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>
        <TR>
-         <TD BGCOLOR="<?=$THEME->cellheading?>">
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar">
            <FONT SIZE=2><B><? print_navigation("$navigation"); ?></B></FONT>
          </TD>
-         <TD BGCOLOR="<?=$THEME->cellheading?>" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
+         <TD BGCOLOR="<?=$THEME->cellheading?>" CLASS="navbar" ALIGN=RIGHT WIDTH=20 VALIGN=TOP><?=$button ?></TD>
        </TR>
      </TABLE>
      <IMG SRC="<?=$CFG->wwwroot?>/pix/spacer.gif" ALT="" HEIGHT=5 WIDTH=1><BR>

diff --git a/theme/standardred/styles.css b/theme/standardred/styles.css
deleted file mode 100644 (file)
index c75a4dc..0000000
--- a/theme/standardred/styles.css
+++ /dev/null
@@ -1,22 +0,0 @@
-a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: none; color: #CC3366;}
-a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: none; color: #CC3366;}
-a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; text-decoration: underline; color: #FF0000;}
-
-body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-weight: bold; background-color: #E9C5C6;}
-td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-
-li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}
-
-form { margin-bottom: 0 ; }
-
-
-.highlight {
-    background-color: #FFAAAA;
-}
-

diff --git a/theme/standardred/styles.php b/theme/standardred/styles.php
new file mode 100644 (file)
index 0000000..9251967
--- /dev/null
+++ b/theme/standardred/styles.php
@@ -0,0 +1,119 @@
+<?PHP // $Id$\r
+\r
+/// We use PHP so we can do value substitutions into the styles\r
+\r
+    require_once("../../config.php"); \r
+\r
+    if (isset($themename)) {\r
+        $CFG->theme = $themename;\r
+    }\r
+\r
+    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";\r
+\r
+/// From here on it's nearly a normal stylesheet.\r
+/// First are some CSS definitions for normal tags, \r
+/// then custom tags follow.\r
+///\r
+/// Note that colours are all defined in config.php\r
+/// in this directory\r
+\r
+?>\r
+\r
+\r
+a:link    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:visited {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: none; \r
+           color: blue;}\r
+a:hover   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+           text-decoration: underline; \r
+           color: red;}\r
+\r
+body {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+p    {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h1   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h2   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h3   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+h4   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+th   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; \r
+      font-weight: bold; \r
+      background-color: <?PHP echo $THEME->cellheading?>;}\r
+\r
+td   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+li   {font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;}\r
+\r
+form { margin-bottom: 0; }\r
+\r
+.highlight {\r
+    background-color: <?PHP echo $THEME->highlight?>;\r
+}\r
+\r
+.headingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.navbar {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generalbox {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.generaltable {\r
+}\r
+\r
+.generaltableheader {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.generaltablecell {\r
+}\r
+\r
+.sideblock {\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.sideblockheading {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+}\r
+\r
+.sideblockmain {\r
+}\r
+\r
+.sideblocklinks {\r
+}\r
+\r
+.sideblocklatestnews {\r
+}\r
+\r
+.sideblockrecentactivity {\r
+}\r
+\r
+.outlineheadingblock {\r
+    background-image: url(<?PHP echo "$themeurl"?>/gradient.jpg);\r
+    border-width: 1px;\r
+    border-color: <?PHP echo $THEME->borders?>;\r
+    border-style: solid;\r
+}\r
+\r
+.weeklyoutline {\r
+}\r
+\r
+.topicsoutline {\r
+}\r