From 06f8943cb326ebf62b1c5b7483819bb49496f84a Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Fri, 2 Feb 2007 08:29:45 +0000
Subject: [PATCH] Some changes to make this theme sort of work, but it still
needs a lot of love <3
---
theme/cornflower/README.html | 8 +---
theme/cornflower/footer.html | 27 ++++++++++-
theme/cornflower/header.html | 79 ++++++++++---------------------
theme/cornflower/styles_color.css | 4 ++
4 files changed, 55 insertions(+), 63 deletions(-)
diff --git a/theme/cornflower/README.html b/theme/cornflower/README.html
index 71b316f6da..2a5588d328 100644
--- a/theme/cornflower/README.html
+++ b/theme/cornflower/README.html
@@ -3,19 +3,15 @@
<p>CR-CornflowerToo is based on the color scheme of the original Cornflower Theme.</p>
-<p>Free Moodle themes can be downloaded from <a href="http://www.classroomrevolution.com">ClassroomRevolution</a> under Themes.</p>
-
-<p>All CR-Themes will be updated to 1.5 in due time.</p>
+<p>Created by Jeffery Watkins of <a href="http://www.classroomrevolution.com">ClassroomRevolution.com</a>.</p>
<p>Support <a href="http://www.moodle.org">Moodle</a> and Open Source Software</p>
<p>This theme is based on Moodle's Standard Theme. By default, the styles of the Standard theme
-are automatically loaded before any other
-themes, so that all custom themes need to do is to define their
+are automatically loaded before any other themes, so that all custom themes need to do is to define their
own styles to augment or overwrite particular standard styles.</p>
<p>For CR-CornflowerToo to work properly, the Moodle Standard theme must be present and un altered in the Theme directory.</p>
<p>In this way custom themes are not "left behind" by Moodle upgrades.</p>
-<p>Notes: Photoshop image files (PSD) are available from the author's website</p>
diff --git a/theme/cornflower/footer.html b/theme/cornflower/footer.html
index c47adbd0fd..584ce5765e 100644
--- a/theme/cornflower/footer.html
+++ b/theme/cornflower/footer.html
@@ -9,10 +9,33 @@
echo '</p>';
?>
+<?php if ($navigation and false) { ?>
+ <div class="navbar clearfix">
+ <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
+ <div class="menu"><?php echo $menu; ?></div>
+ </div>
+<?php } ?>
+
<?php echo $loggedinas ?>
-<p align="center"><a href="http://moodle.org" target="_blank"><img src="<?php echo $CFG->themewww .'/'. current_theme() ?>/images/moodlelogo.gif" style="border:0px" /></a></p>
+<?php echo $homelink ?>
+
+<?php if (!empty($performanceinfo)) {
+ echo $performanceinfo;
+} ?>
+
+<?php if ($CFG->debug > 7) {
+?>
+ <br />
+ <hr size="1" noshade="noshade" />
+ <p align="center">
+ <a href="http://validator.w3.org/check?verbose=1&ss=1&uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a> |
+ <a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=-1&url1=<?php echo urlencode(qualified_me()) ?>">Section 508 Check</a> |
+ <a href="http://www.contentquality.com/mynewtester/cynthia.exe?rptmode=0&warnp2n3e=1&url1=<?php echo urlencode(qualified_me()) ?>">WCAG 1 (2,3) Check</a>
+ </p>
+<?php } ?>
+
</div>
</div>
-</td></tr></table></body>
+</div>
</html>
diff --git a/theme/cornflower/header.html b/theme/cornflower/header.html
index 02374dd2dc..aec2c6b39d 100644
--- a/theme/cornflower/header.html
+++ b/theme/cornflower/header.html
@@ -4,72 +4,41 @@
<?php echo $meta ?>
<meta name="keywords" content="moodle, <?php echo $title ?> " />
<title><?php echo $title ?></title>
- <link rel="shortcut icon" href="<?php echo $CFG->themewww .'/'. current_theme() ?>/favicon.ico" />
+ <link rel="shortcut icon" href="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/favicon.ico" />
<?php include("$CFG->javascript"); ?>
</head>
-<body background="<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/images/bg.gif" <?php
+<body <?php
echo " $bodytags";
if ($focus) {
echo " onload=\"setfocus()\"";
}
?>>
-<table align="center" width="100%" border="2" cellpadding="0" cellspacing="0" bgcolor="#D0E2EE">
-<tr><td>
+<div class="cornflowersurround">
<div id="page">
-<?php if ($home) { // This is what gets printed on the home page only
-?>
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-
- <tr>
- <td>
- <table background="<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/images/headerbg.jpg" width="100%" height="112" cellpadding="0" cellspacing="0" border="0">
-
- <tr>
-
- <td valign="top" class="headermain"><?php echo $heading ?></td>
-
-
-
- <td align="right" style="padding-right:5px" valign="top" class="headerhomemenu"><?php echo $menu ?></td>
-
- </tr>
- </table></tr></td>
- </table>
-<?php } else if ($heading) { // This is what gets printed on any other page with a heading
- ?>
-
- <table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td>
-
-<table background="<?php echo $CFG->httpsthemewww .'/'. current_theme() ?>/images/headerbg.jpg" width="100%" height="112" cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td valign="top"><?php echo $heading ?></td>
- <td align="right" sty class="headermain"le="padding-right:5px" valign="top" class="headerhomemenu"><?php echo $menu ?></td>
- </tr>
-</table>
- </tr>
- </td>
-</table>
-
-<?php } ?>
- <div class="clearer"> </div>
-
-<?php if ($navigation) { // This is the navigation table with breadcrumbs ?>
- <table border="0" cellpadding="3" cellspacing="0" width="100%">
- <tr>
- <td><?php print_navigation("$navigation"); ?></td>
- <td align="right" width="20" valign="top"><?php echo $button; ?></td>
- </tr>
- </table>
- <img src="<?php echo $CFG->httpswwwroot?>/pix/spacer.gif" alt="" height="5" width="1" /><br />
-
-<?php } else if ($heading) { // If no navigation, but a heading, then print a line
+<?php if ($home) { // home page ?>
+ <div id="header-home">
+ <div class="headermain"><img alt="" src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/logo.jpg" width="457" height="112" /></div>
+ <div class="headermenu"><?php echo $menu ?></div>
+ </div>
+<?php } else if ($heading) { // This is what gets printed on any other page with a heading
?>
+ <div id="header-home">
+ <div class="headermain"><img alt="" src="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/logo.jpg" width="457" height="112" /></div>
+ <div class="headermenu"><?php echo $menu ?></div>
+ </div>
+ <div class="clearer"></div>
<?php } ?>
- <div class="clearer"> </div>
+<?php //Accessibility: breadcrumb trail/navbar now a DIV, not a table.
+ if ($navigation) { // This is the navigation bar with breadcrumbs ?>
+ <div class="navbar clearfix">
+ <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
+ <div class="navbutton"><?php echo $button; ?></div>
+ </div>
+<?php } else if ($heading) { // If no navigation, but a heading, then print a line ?>
+
+<?php } ?>
<!-- END OF HEADER -->
+ <div class="clearer"></div>
<div id="content">
diff --git a/theme/cornflower/styles_color.css b/theme/cornflower/styles_color.css
index f115d48a90..d8b203cb50 100644
--- a/theme/cornflower/styles_color.css
+++ b/theme/cornflower/styles_color.css
@@ -777,3 +777,7 @@ body#mod-quiz-report table#attempts .r1 {
text-decoration: underline;
color: #ffffff;
}
+
+.cornflowersurround {
+ background: #D0E2EE;
+}
--
2.39.5