Permalink
Browse files

merged from 1.5

  • Loading branch information...
urs_hunkler
urs_hunkler committed Jul 14, 2005
1 parent 80f8d28 commit be59cfc13d4d44a6cc29bf2cceebe20eb86c6a02
Showing with 202 additions and 1,935 deletions.
  1. +66 −8 theme/orangewhitepda/config.php
  2. +0 −88 theme/orangewhitepda/csshover.htc
  3. BIN theme/orangewhitepda/farbstreifen_moodle.gif
  4. +5 −3 theme/orangewhitepda/footer.html
  5. +5 −7 theme/orangewhitepda/header.html
  6. +0 −9 theme/orangewhitepda/nostyle.css
  7. BIN theme/orangewhitepda/pix/colorstrip.gif
  8. BIN theme/orangewhitepda/{ → pix}/css.gif
  9. BIN theme/orangewhitepda/pix/gray.gif
  10. BIN theme/orangewhitepda/pix/rightarrow2.gif
  11. BIN theme/orangewhitepda/{ → pix}/section_508.gif
  12. BIN theme/orangewhitepda/pix/switch_minus.gif
  13. BIN theme/orangewhitepda/pix/switch_plus.gif
  14. BIN theme/orangewhitepda/pix/tab/left.gif
  15. BIN theme/orangewhitepda/pix/tab/left2.gif
  16. BIN theme/orangewhitepda/pix/tab/left_active.gif
  17. BIN theme/orangewhitepda/pix/tab/left_active2.gif
  18. BIN theme/orangewhitepda/pix/tab/left_hover.gif
  19. BIN theme/orangewhitepda/pix/tab/left_hover2.gif
  20. BIN theme/orangewhitepda/pix/tab/left_inactive.gif
  21. BIN theme/orangewhitepda/pix/tab/left_inactive2.gif
  22. BIN theme/orangewhitepda/pix/tab/right.gif
  23. BIN theme/orangewhitepda/pix/tab/right2.gif
  24. BIN theme/orangewhitepda/pix/tab/right_active.gif
  25. BIN theme/orangewhitepda/pix/tab/right_active2.gif
  26. BIN theme/orangewhitepda/pix/tab/right_end.gif
  27. BIN theme/orangewhitepda/pix/tab/right_end2.gif
  28. BIN theme/orangewhitepda/pix/tab/right_hover.gif
  29. BIN theme/orangewhitepda/pix/tab/right_hover2.gif
  30. BIN theme/orangewhitepda/pix/tab/right_inactive.gif
  31. BIN theme/orangewhitepda/pix/tab/right_inactive2.gif
  32. BIN theme/orangewhitepda/pix/tab/tabsbg.gif
  33. BIN theme/orangewhitepda/pix/tab/tabsbg2.gif
  34. BIN theme/orangewhitepda/pix/tab/tabsbg_x2.gif
  35. BIN theme/orangewhitepda/{ → pix}/xhtml_1_0.gif
  36. +10 −40 theme/orangewhitepda/styles.php
  37. +0 −639 theme/orangewhitepda/styles_color.css
  38. +0 −390 theme/orangewhitepda/styles_font.css
  39. +0 −751 theme/orangewhitepda/styles_layout.css
  40. +116 −0 theme/orangewhitepda/styles_pda.css
@@ -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"
@@ -1,88 +0,0 @@
-<attach event="ondocumentready" handler="parseStylesheets" />
-<script language="JScript">
-/**
- * PSUEDOS - V1.21.041022 - hover & active
- * ---------------------------------------------
- * Peterned - http://www.xs4all.nl/~peterned/
- * (c) 2004 - Peter Nederlof
- *
- * Credits - Arnoud Berendsen
- * - Martin Reurings
- * for inspiring me and finding really sick bugs
- *
- * howto: body { behavior:url("csshover.htc"); }
- * ---------------------------------------------
- */
-
-var currentSheet, doc = window.document;
-var activators = {
- onhover:{on:'onmouseover', off:'onmouseout'},
- onactive:{on:'onmousedown', off:'onmouseup'}
-}
-
-function parseStylesheets() {
- var sheets = doc.styleSheets, l = sheets.length;
- for(var i=0; i<l; i++)
- parseStylesheet(sheets[i]);
-}
- function parseStylesheet(sheet) {
- var l, rules, imports;
- if(sheet.imports) {
- imports = sheet.imports, l = imports.length;
- for(var i=0; i<l; i++)
- parseStylesheet(sheet.imports[i]);
- }
-
- rules = (currentSheet = sheet).rules, l = rules.length;
- for(var j=0; j<l; j++) parseCSSRule(rules[j]);
- }
-
- function parseCSSRule(rule) {
- var select = rule.selectorText, style = rule.style.cssText;
- if(!(/(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i).test(select) || !style) return;
-
- var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
- var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
- var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1];
- var affected = select.replace(/:hover.*$/, '');
- var elements = getElementsBySelect(affected);
-
- currentSheet.addRule(newSelect, style);
- for(var i=0; i<elements.length; i++)
- new HoverElement(elements[i], className, activators[pseudo]);
- }
-
-function HoverElement(node, className, events) {
- if(!node.hovers) node.hovers = {};
- if(node.hovers[className]) return;
- node.hovers[className] = true;
- node.attachEvent(events.on,
- function() { node.className += ' ' + className; });
- node.attachEvent(events.off,
- function() { node.className =
- node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
-}
-
-function getElementsBySelect(rule) {
- var parts, nodes = [doc];
- parts = rule.split(' ');
- for(var i=0; i<parts.length; i++) {
- nodes = getSelectedNodes(parts[i], nodes);
- } return nodes;
-}
- function getSelectedNodes(select, elements) {
- var result, node, nodes = [];
- var classname = (/\.([a-z0-9_-]+)/i).exec(select);
- var identify = (/\#([a-z0-9_-]+)/i).exec(select);
- var tagName = (/^[a-z0-9]+/i).exec(select.toUpperCase()) || '*';
- for(var i=0; i<elements.length; i++) {
- result = elements[i].getElementsByTagName(tagName);
- for(var j=0; j<result.length; j++) {
- node = result[j];
- if((identify && node.id != identify[1]) || (classname && !(new RegExp('\\b' +
- classname[1] + '\\b').exec(node.className)))) continue;
- nodes[nodes.length] = node;
- }
- } return nodes;
- }
-</script>
Binary file not shown.
@@ -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>
@@ -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">
@@ -1,9 +0,0 @@
-*, body, p, td,
-h1, h2, h3, h4, h5, h6
-{
- font-style:inherit;
- font-family:inherit;
- font-size:100%;
- background-color:#FFFFFF;
- color:#000000;
-}
Binary file not shown.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -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);
+
?>
Oops, something went wrong.

0 comments on commit be59cfc

Please sign in to comment.