diff --git a/theme/formal_white/lang/en/theme_formal_white.php b/theme/formal_white/lang/en/theme_formal_white.php index e460f68381c..371d9eaa6c5 100644 --- a/theme/formal_white/lang/en/theme_formal_white.php +++ b/theme/formal_white/lang/en/theme_formal_white.php @@ -29,6 +29,7 @@ $string['blockcontentbgc'] = 'Blocks content background colour'; $string['blockcontentbgcdesc'] = 'This sets the blocks content background colour for the theme.'; $string['blockpadding'] = 'Margin around blocks'; $string['blockpaddingdesc'] = 'This sets the margin between each block and the containing column.'; +$string['blueberry'] = 'blueberry'; $string['choosereadme'] = '
@@ -69,7 +70,7 @@ $string['customcssdesc'] = 'Any CSS you enter here will be added to every page a 
a:link, a:visited, a:hover, a:active, a:focus {color:blue;}
Please adjust colors and CSS rules to fit your needs.'; $string['customlogourl'] = 'Custom logo'; -$string['customlogourldesc'] = 'Change the logo for this theme by entering the full or relative URL to an image you wish to use (i.e. http://www.yoursite.tld/mylogo.png or ../path/to/your/logo.png). As a reference, the default logo is 200px wide, 50px high and a transparent png will work best.'; +$string['customlogourldesc'] = 'Change the logo for this theme by entering the full or relative URL to an image you wish to use (i.e. http://www.yoursite.tld/mylogo.png or ../path/to/your/logo.png). As a reference the default logo is 200px wide, 50px high and a transparent png will work best.'; $string['displayheading'] = 'Display page heading'; $string['displaylogo'] = 'Display logo'; $string['fontsizereference'] = 'Font size reference'; @@ -79,17 +80,25 @@ $string['footnotedesc'] = 'The content from this textarea will be displayed in t $string['framemargin'] = 'Frame margin'; $string['framemargindesc'] = 'Room between the frame and the edge of the browser window. (This setting will be ignored if "{$a}" is requested).'; $string['frontpagelogourl'] = 'Custom front page logo'; -$string['frontpagelogourldesc'] = 'Change the logo that is displayed on the front page of your site by entering the full or relative URL to the image you wish to use. This setting overrides the custom logo setting. As a reference the default logo is 300px wide, 80px high and a transparent png will work best.'; +$string['frontpagelogourldesc'] = 'Change the logo that is displayed on the front page of your site by entering the full or relative URL to the image you wish to use (i.e. http://www.yoursite.tld/myfrontpagelogo.png or ../path/to/your/logo.png). This setting overrides the custom logo setting. As a reference the default logo is 300px wide, 80px high and a transparent png will work best.'; $string['headerbgc'] = 'Header background colour'; $string['headerbgcdesc'] = 'This sets the blocks header background colour for the theme.'; $string['headercontent'] = 'Header content'; $string['headercontentdesc'] = 'Choose whether display moodle logo or page heading text in the header.'; $string['lblockcolumnbgc'] = 'Left column background colour'; $string['lblockcolumnbgcdesc'] = 'This sets the left column background colour for the theme.'; +$string['lemon'] = 'lemon'; +$string['lime'] = 'lime'; +$string['mink'] = 'mink'; $string['noframe'] = 'Formal white 1.9 look'; $string['noframedesc'] = 'Select this option to require your moodle page to look like moodle 1.*, alias, without the surrounding frame.'; +$string['orange'] = 'orange'; +$string['peach'] = 'peach'; $string['pluginname'] = 'Formal white'; $string['rblockcolumnbgc'] = 'Right column background colour'; $string['rblockcolumnbgcdesc'] = 'This sets the right column background colour for the theme. If you leave this empty the left column background colour will be used.'; $string['region-side-post'] = 'Right'; $string['region-side-pre'] = 'Left'; +$string['silver'] = 'silver'; +$string['trendcolor'] = 'Trend color'; +$string['trendcolordesc'] = 'Choose the general trend for the color of the theme.'; diff --git a/theme/formal_white/layout/frontpage.php b/theme/formal_white/layout/frontpage.php index edbb42c373d..d015b490c7d 100644 --- a/theme/formal_white/layout/frontpage.php +++ b/theme/formal_white/layout/frontpage.php @@ -223,7 +223,7 @@ if ($hasfooter) {
- +
diff --git a/theme/formal_white/layout/general.php b/theme/formal_white/layout/general.php index b7fbcfe31fc..24d52e40642 100644 --- a/theme/formal_white/layout/general.php +++ b/theme/formal_white/layout/general.php @@ -253,7 +253,7 @@ if ($hasfooter) { ?> - +
diff --git a/theme/formal_white/layout/report.php b/theme/formal_white/layout/report.php index 04c2cff3aa9..2b366b574e9 100644 --- a/theme/formal_white/layout/report.php +++ b/theme/formal_white/layout/report.php @@ -222,7 +222,7 @@ if ($hasfooter) { - +
diff --git a/theme/formal_white/lib.php b/theme/formal_white/lib.php index c9cd2103407..7d16c340f77 100644 --- a/theme/formal_white/lib.php +++ b/theme/formal_white/lib.php @@ -27,6 +27,14 @@ function formal_white_user_settings($css, $theme) { } $css = formal_white_set_framemargin($css, $framemargin); + // Set the images according to color trend + if (!isset($theme->settings->trendcolor)) { + $trendcolor = 'mink'; // default + } else { + $trendcolor = $theme->settings->trendcolor; + } + $css = formal_white_set_trendcolor($css, $trendcolor); + // Set the page header background color if (empty($theme->settings->headerbgc)) { $headerbgc = '#E3DFD4'; // default @@ -86,7 +94,17 @@ function formal_white_user_settings($css, $theme) { return $css; } - +function theme_formal_white_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options = array()) { + if ($context->contextlevel == CONTEXT_SYSTEM and $filearea === 'frontpagelogourl') { + $theme = theme_config::load('formal_white'); + return $theme->setting_file_serve('frontpagelogourl', $args, $forcedownload, $options); + } if ($context->contextlevel == CONTEXT_SYSTEM and $filearea === 'customlogourl') { + $theme = theme_config::load('formal_white'); + return $theme->setting_file_serve('customlogourl', $args, $forcedownload, $options); + } else { + send_file_not_found(); + } +} /** * Sets the link color variable in CSS @@ -110,6 +128,83 @@ function formal_white_set_framemargin($css, $framemargin) { return $css; } +function formal_white_set_trendcolor($css, $trendcolor) { + // __setting_trendcolor__ is part of URLS so it is already between double square bracket. + // I can not enclose it between double square bracket once again otherwise images path parser get confused. + $tag = urlencode('__setting_trendcolor__'); // urlencode is useless but it is correct to put it here + $css = str_replace($tag, $trendcolor, $css); + + // of the basis of the general choosed trend, I need the right background color. + switch ($trendcolor) { + case 'blueberry': + // page background + $tag = '[[setting:pagebackground]]'; + $css = str_replace($tag, '#DAF1FF', $css); + + // block header background + $tag = '[[setting:blockheaderbackground]]'; + $css = str_replace($tag, '#CDE2F3', $css); + break; + case 'lemon': + // page background + $tag = '[[setting:pagebackground]]'; + $css = str_replace($tag, '#FFEB9A', $css); + + // block header background + $tag = '[[setting:blockheaderbackground]]'; + $css = str_replace($tag, '#F7DA41', $css); + break; + case 'lime': + // page background + $tag = '[[setting:pagebackground]]'; + $css = str_replace($tag, '#F0F5BB', $css); + + // block header background + $tag = '[[setting:blockheaderbackground]]'; + $css = str_replace($tag, '#E2E499', $css); + break; + case 'mink': + // page background + $tag = '[[setting:pagebackground]]'; + $css = str_replace($tag, '#EFEFEF', $css); + + // block header background + $tag = '[[setting:blockheaderbackground]]'; + $css = str_replace($tag, '#E3DFD4', $css); + break; + case 'orange': + // page background + $tag = '[[setting:pagebackground]]'; + $css = str_replace($tag, '#FFD46C', $css); + + // block header background + $tag = '[[setting:blockheaderbackground]]'; + $css = str_replace($tag, '#FDC06D', $css); + break; + case 'peach': + // page background + $tag = '[[setting:pagebackground]]'; + $css = str_replace($tag, '#FCD3BC', $css); + + // block header background + $tag = '[[setting:blockheaderbackground]]'; + $css = str_replace($tag, '#F7C099', $css); + break; + case 'silver': + // page background + $tag = '[[setting:pagebackground]]'; + $css = str_replace($tag, '#EFF0F2', $css); + + // block header background + $tag = '[[setting:blockheaderbackground]]'; + $css = str_replace($tag, '#E0DFDD', $css); + break; + default: + debugging('It seems a colour has been added to the formal_white trend colours folder but was not fully managed. The code must be updated by a developer.'); + } + return $css; +} + function formal_white_set_headerbgc($css, $headerbgc) { $tag = '[[setting:headerbgc]]'; $css = str_replace($tag, $headerbgc, $css); diff --git a/theme/formal_white/pix/trend/blueberry/bg_bread.jpg b/theme/formal_white/pix/trend/blueberry/bg_bread.jpg new file mode 100755 index 00000000000..87cb9f793ed Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/bg_bread.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/blueberry.jpg b/theme/formal_white/pix/trend/blueberry/blueberry.jpg new file mode 100755 index 00000000000..f97448d68f0 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/blueberry.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/custommenubg.jpg b/theme/formal_white/pix/trend/blueberry/custommenubg.jpg new file mode 100755 index 00000000000..ad8b7609f90 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/custommenubg.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/gradient-sb.jpg b/theme/formal_white/pix/trend/blueberry/gradient-sb.jpg new file mode 100755 index 00000000000..81bfb5aaee8 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/gradient-sb.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/gradient_h.jpg b/theme/formal_white/pix/trend/blueberry/gradient_h.jpg new file mode 100755 index 00000000000..833b9b3e6d8 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/gradient_h.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/hgradient.jpg b/theme/formal_white/pix/trend/blueberry/hgradient.jpg new file mode 100755 index 00000000000..7dbeef9e7ba Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/hgradient.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/roundcorner/body_l.jpg b/theme/formal_white/pix/trend/blueberry/roundcorner/body_l.jpg new file mode 100755 index 00000000000..6fc7950b193 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/roundcorner/body_l.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/roundcorner/body_r.jpg b/theme/formal_white/pix/trend/blueberry/roundcorner/body_r.jpg new file mode 100755 index 00000000000..b43edf0007e Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/roundcorner/body_r.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/roundcorner/footer.jpg b/theme/formal_white/pix/trend/blueberry/roundcorner/footer.jpg new file mode 100755 index 00000000000..47e82bd744e Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/roundcorner/footer.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/roundcorner/footer_l.jpg b/theme/formal_white/pix/trend/blueberry/roundcorner/footer_l.jpg new file mode 100755 index 00000000000..a773b1e27b7 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/roundcorner/footer_l.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/roundcorner/footer_r.jpg b/theme/formal_white/pix/trend/blueberry/roundcorner/footer_r.jpg new file mode 100755 index 00000000000..2e6a04e25f1 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/roundcorner/footer_r.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/roundcorner/header.jpg b/theme/formal_white/pix/trend/blueberry/roundcorner/header.jpg new file mode 100755 index 00000000000..ac0d6ca0974 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/roundcorner/header.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/roundcorner/header_l.jpg b/theme/formal_white/pix/trend/blueberry/roundcorner/header_l.jpg new file mode 100755 index 00000000000..98c1bb47de2 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/roundcorner/header_l.jpg differ diff --git a/theme/formal_white/pix/trend/blueberry/roundcorner/header_r.jpg b/theme/formal_white/pix/trend/blueberry/roundcorner/header_r.jpg new file mode 100755 index 00000000000..fc1db80cf88 Binary files /dev/null and b/theme/formal_white/pix/trend/blueberry/roundcorner/header_r.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/bg_bread.jpg b/theme/formal_white/pix/trend/lemon/bg_bread.jpg new file mode 100755 index 00000000000..d7b60ee0a09 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/bg_bread.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/custommenubg.jpg b/theme/formal_white/pix/trend/lemon/custommenubg.jpg new file mode 100755 index 00000000000..fb449d77230 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/custommenubg.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/gradient-sb.jpg b/theme/formal_white/pix/trend/lemon/gradient-sb.jpg new file mode 100755 index 00000000000..45d885db7f8 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/gradient-sb.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/gradient_h.jpg b/theme/formal_white/pix/trend/lemon/gradient_h.jpg new file mode 100755 index 00000000000..ba73d382638 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/gradient_h.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/hgradient.jpg b/theme/formal_white/pix/trend/lemon/hgradient.jpg new file mode 100755 index 00000000000..581878fb270 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/hgradient.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/lemon.jpg b/theme/formal_white/pix/trend/lemon/lemon.jpg new file mode 100755 index 00000000000..066d7cba758 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/lemon.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/roundcorner/body_l.jpg b/theme/formal_white/pix/trend/lemon/roundcorner/body_l.jpg new file mode 100755 index 00000000000..a221eda5f76 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/roundcorner/body_l.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/roundcorner/body_r.jpg b/theme/formal_white/pix/trend/lemon/roundcorner/body_r.jpg new file mode 100755 index 00000000000..76dcc0cb501 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/roundcorner/body_r.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/roundcorner/footer.jpg b/theme/formal_white/pix/trend/lemon/roundcorner/footer.jpg new file mode 100755 index 00000000000..e57ad41828f Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/roundcorner/footer.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/roundcorner/footer_l.jpg b/theme/formal_white/pix/trend/lemon/roundcorner/footer_l.jpg new file mode 100755 index 00000000000..fff79dc2095 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/roundcorner/footer_l.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/roundcorner/footer_r.jpg b/theme/formal_white/pix/trend/lemon/roundcorner/footer_r.jpg new file mode 100755 index 00000000000..a8a13f5316f Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/roundcorner/footer_r.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/roundcorner/header.jpg b/theme/formal_white/pix/trend/lemon/roundcorner/header.jpg new file mode 100755 index 00000000000..81ff9a982d6 Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/roundcorner/header.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/roundcorner/header_l.jpg b/theme/formal_white/pix/trend/lemon/roundcorner/header_l.jpg new file mode 100755 index 00000000000..33facaa117c Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/roundcorner/header_l.jpg differ diff --git a/theme/formal_white/pix/trend/lemon/roundcorner/header_r.jpg b/theme/formal_white/pix/trend/lemon/roundcorner/header_r.jpg new file mode 100755 index 00000000000..907737f3d1b Binary files /dev/null and b/theme/formal_white/pix/trend/lemon/roundcorner/header_r.jpg differ diff --git a/theme/formal_white/pix/trend/lime/bg_bread.jpg b/theme/formal_white/pix/trend/lime/bg_bread.jpg new file mode 100755 index 00000000000..423d3e64500 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/bg_bread.jpg differ diff --git a/theme/formal_white/pix/trend/lime/custommenubg.jpg b/theme/formal_white/pix/trend/lime/custommenubg.jpg new file mode 100755 index 00000000000..325eaa763bf Binary files /dev/null and b/theme/formal_white/pix/trend/lime/custommenubg.jpg differ diff --git a/theme/formal_white/pix/trend/lime/gradient-sb.jpg b/theme/formal_white/pix/trend/lime/gradient-sb.jpg new file mode 100755 index 00000000000..7774cd82912 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/gradient-sb.jpg differ diff --git a/theme/formal_white/pix/trend/lime/gradient_h.jpg b/theme/formal_white/pix/trend/lime/gradient_h.jpg new file mode 100755 index 00000000000..2f71afd9bd5 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/gradient_h.jpg differ diff --git a/theme/formal_white/pix/trend/lime/hgradient.jpg b/theme/formal_white/pix/trend/lime/hgradient.jpg new file mode 100755 index 00000000000..e1660e224d0 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/hgradient.jpg differ diff --git a/theme/formal_white/pix/trend/lime/lime.jpg b/theme/formal_white/pix/trend/lime/lime.jpg new file mode 100755 index 00000000000..9ad27ba03d8 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/lime.jpg differ diff --git a/theme/formal_white/pix/trend/lime/roundcorner/body_l.jpg b/theme/formal_white/pix/trend/lime/roundcorner/body_l.jpg new file mode 100755 index 00000000000..1e022a3429e Binary files /dev/null and b/theme/formal_white/pix/trend/lime/roundcorner/body_l.jpg differ diff --git a/theme/formal_white/pix/trend/lime/roundcorner/body_r.jpg b/theme/formal_white/pix/trend/lime/roundcorner/body_r.jpg new file mode 100755 index 00000000000..bb93d242058 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/roundcorner/body_r.jpg differ diff --git a/theme/formal_white/pix/trend/lime/roundcorner/footer.jpg b/theme/formal_white/pix/trend/lime/roundcorner/footer.jpg new file mode 100755 index 00000000000..737cc85445a Binary files /dev/null and b/theme/formal_white/pix/trend/lime/roundcorner/footer.jpg differ diff --git a/theme/formal_white/pix/trend/lime/roundcorner/footer_l.jpg b/theme/formal_white/pix/trend/lime/roundcorner/footer_l.jpg new file mode 100755 index 00000000000..c48baa8d71f Binary files /dev/null and b/theme/formal_white/pix/trend/lime/roundcorner/footer_l.jpg differ diff --git a/theme/formal_white/pix/trend/lime/roundcorner/footer_r.jpg b/theme/formal_white/pix/trend/lime/roundcorner/footer_r.jpg new file mode 100755 index 00000000000..b72786cf82b Binary files /dev/null and b/theme/formal_white/pix/trend/lime/roundcorner/footer_r.jpg differ diff --git a/theme/formal_white/pix/trend/lime/roundcorner/header.jpg b/theme/formal_white/pix/trend/lime/roundcorner/header.jpg new file mode 100755 index 00000000000..e462a52bac6 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/roundcorner/header.jpg differ diff --git a/theme/formal_white/pix/trend/lime/roundcorner/header_l.jpg b/theme/formal_white/pix/trend/lime/roundcorner/header_l.jpg new file mode 100755 index 00000000000..489947301a1 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/roundcorner/header_l.jpg differ diff --git a/theme/formal_white/pix/trend/lime/roundcorner/header_r.jpg b/theme/formal_white/pix/trend/lime/roundcorner/header_r.jpg new file mode 100755 index 00000000000..49291206539 Binary files /dev/null and b/theme/formal_white/pix/trend/lime/roundcorner/header_r.jpg differ diff --git a/theme/formal_white/pix/bg_bread.jpg b/theme/formal_white/pix/trend/mink/bg_bread.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/bg_bread.jpg rename to theme/formal_white/pix/trend/mink/bg_bread.jpg diff --git a/theme/formal_white/pix/custommenubg.jpg b/theme/formal_white/pix/trend/mink/custommenubg.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/custommenubg.jpg rename to theme/formal_white/pix/trend/mink/custommenubg.jpg diff --git a/theme/formal_white/pix/gradient-sb.jpg b/theme/formal_white/pix/trend/mink/gradient-sb.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/gradient-sb.jpg rename to theme/formal_white/pix/trend/mink/gradient-sb.jpg diff --git a/theme/formal_white/pix/gradient_h.jpg b/theme/formal_white/pix/trend/mink/gradient_h.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/gradient_h.jpg rename to theme/formal_white/pix/trend/mink/gradient_h.jpg diff --git a/theme/formal_white/pix/hgradient.jpg b/theme/formal_white/pix/trend/mink/hgradient.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/hgradient.jpg rename to theme/formal_white/pix/trend/mink/hgradient.jpg diff --git a/theme/formal_white/pix/trend/mink/mink.jpg b/theme/formal_white/pix/trend/mink/mink.jpg new file mode 100755 index 00000000000..e15bf69b145 Binary files /dev/null and b/theme/formal_white/pix/trend/mink/mink.jpg differ diff --git a/theme/formal_white/pix/roundcorner/body_l.jpg b/theme/formal_white/pix/trend/mink/roundcorner/body_l.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/roundcorner/body_l.jpg rename to theme/formal_white/pix/trend/mink/roundcorner/body_l.jpg diff --git a/theme/formal_white/pix/roundcorner/body_r.jpg b/theme/formal_white/pix/trend/mink/roundcorner/body_r.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/roundcorner/body_r.jpg rename to theme/formal_white/pix/trend/mink/roundcorner/body_r.jpg diff --git a/theme/formal_white/pix/roundcorner/footer.jpg b/theme/formal_white/pix/trend/mink/roundcorner/footer.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/roundcorner/footer.jpg rename to theme/formal_white/pix/trend/mink/roundcorner/footer.jpg diff --git a/theme/formal_white/pix/roundcorner/footer_l.jpg b/theme/formal_white/pix/trend/mink/roundcorner/footer_l.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/roundcorner/footer_l.jpg rename to theme/formal_white/pix/trend/mink/roundcorner/footer_l.jpg diff --git a/theme/formal_white/pix/roundcorner/footer_r.jpg b/theme/formal_white/pix/trend/mink/roundcorner/footer_r.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/roundcorner/footer_r.jpg rename to theme/formal_white/pix/trend/mink/roundcorner/footer_r.jpg diff --git a/theme/formal_white/pix/roundcorner/header.jpg b/theme/formal_white/pix/trend/mink/roundcorner/header.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/roundcorner/header.jpg rename to theme/formal_white/pix/trend/mink/roundcorner/header.jpg diff --git a/theme/formal_white/pix/roundcorner/header_l.jpg b/theme/formal_white/pix/trend/mink/roundcorner/header_l.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/roundcorner/header_l.jpg rename to theme/formal_white/pix/trend/mink/roundcorner/header_l.jpg diff --git a/theme/formal_white/pix/roundcorner/header_r.jpg b/theme/formal_white/pix/trend/mink/roundcorner/header_r.jpg old mode 100644 new mode 100755 similarity index 100% rename from theme/formal_white/pix/roundcorner/header_r.jpg rename to theme/formal_white/pix/trend/mink/roundcorner/header_r.jpg diff --git a/theme/formal_white/pix/trend/orange/bg_bread.jpg b/theme/formal_white/pix/trend/orange/bg_bread.jpg new file mode 100755 index 00000000000..8b4fea2e632 Binary files /dev/null and b/theme/formal_white/pix/trend/orange/bg_bread.jpg differ diff --git a/theme/formal_white/pix/trend/orange/custommenubg.jpg b/theme/formal_white/pix/trend/orange/custommenubg.jpg new file mode 100755 index 00000000000..3b4f2064a9b Binary files /dev/null and b/theme/formal_white/pix/trend/orange/custommenubg.jpg differ diff --git a/theme/formal_white/pix/trend/orange/gradient-sb.jpg b/theme/formal_white/pix/trend/orange/gradient-sb.jpg new file mode 100755 index 00000000000..5464193d5df Binary files /dev/null and b/theme/formal_white/pix/trend/orange/gradient-sb.jpg differ diff --git a/theme/formal_white/pix/trend/orange/gradient_h.jpg b/theme/formal_white/pix/trend/orange/gradient_h.jpg new file mode 100755 index 00000000000..e3467923cd5 Binary files /dev/null and b/theme/formal_white/pix/trend/orange/gradient_h.jpg differ diff --git a/theme/formal_white/pix/trend/orange/hgradient.jpg b/theme/formal_white/pix/trend/orange/hgradient.jpg new file mode 100755 index 00000000000..74692b28676 Binary files /dev/null and b/theme/formal_white/pix/trend/orange/hgradient.jpg differ diff --git a/theme/formal_white/pix/trend/orange/orange.jpg b/theme/formal_white/pix/trend/orange/orange.jpg new file mode 100755 index 00000000000..9aeaca1fc57 Binary files /dev/null and b/theme/formal_white/pix/trend/orange/orange.jpg differ diff --git a/theme/formal_white/pix/trend/orange/roundcorner/body_l.jpg b/theme/formal_white/pix/trend/orange/roundcorner/body_l.jpg new file mode 100755 index 00000000000..88c2fa5652d Binary files /dev/null and b/theme/formal_white/pix/trend/orange/roundcorner/body_l.jpg differ diff --git a/theme/formal_white/pix/trend/orange/roundcorner/body_r.jpg b/theme/formal_white/pix/trend/orange/roundcorner/body_r.jpg new file mode 100755 index 00000000000..5a6d360f239 Binary files /dev/null and b/theme/formal_white/pix/trend/orange/roundcorner/body_r.jpg differ diff --git a/theme/formal_white/pix/trend/orange/roundcorner/footer.jpg b/theme/formal_white/pix/trend/orange/roundcorner/footer.jpg new file mode 100755 index 00000000000..5dca88e592b Binary files /dev/null and b/theme/formal_white/pix/trend/orange/roundcorner/footer.jpg differ diff --git a/theme/formal_white/pix/trend/orange/roundcorner/footer_l.jpg b/theme/formal_white/pix/trend/orange/roundcorner/footer_l.jpg new file mode 100755 index 00000000000..f1e9d5cd0b2 Binary files /dev/null and b/theme/formal_white/pix/trend/orange/roundcorner/footer_l.jpg differ diff --git a/theme/formal_white/pix/trend/orange/roundcorner/footer_r.jpg b/theme/formal_white/pix/trend/orange/roundcorner/footer_r.jpg new file mode 100755 index 00000000000..156e9f909de Binary files /dev/null and b/theme/formal_white/pix/trend/orange/roundcorner/footer_r.jpg differ diff --git a/theme/formal_white/pix/trend/orange/roundcorner/header.jpg b/theme/formal_white/pix/trend/orange/roundcorner/header.jpg new file mode 100755 index 00000000000..eae91d49925 Binary files /dev/null and b/theme/formal_white/pix/trend/orange/roundcorner/header.jpg differ diff --git a/theme/formal_white/pix/trend/orange/roundcorner/header_l.jpg b/theme/formal_white/pix/trend/orange/roundcorner/header_l.jpg new file mode 100755 index 00000000000..fc60f1079fe Binary files /dev/null and b/theme/formal_white/pix/trend/orange/roundcorner/header_l.jpg differ diff --git a/theme/formal_white/pix/trend/orange/roundcorner/header_r.jpg b/theme/formal_white/pix/trend/orange/roundcorner/header_r.jpg new file mode 100755 index 00000000000..96450cc539f Binary files /dev/null and b/theme/formal_white/pix/trend/orange/roundcorner/header_r.jpg differ diff --git a/theme/formal_white/pix/trend/peach/bg_bread.jpg b/theme/formal_white/pix/trend/peach/bg_bread.jpg new file mode 100755 index 00000000000..00ebf85d36a Binary files /dev/null and b/theme/formal_white/pix/trend/peach/bg_bread.jpg differ diff --git a/theme/formal_white/pix/trend/peach/custommenubg.jpg b/theme/formal_white/pix/trend/peach/custommenubg.jpg new file mode 100755 index 00000000000..4945882a13e Binary files /dev/null and b/theme/formal_white/pix/trend/peach/custommenubg.jpg differ diff --git a/theme/formal_white/pix/trend/peach/gradient-sb.jpg b/theme/formal_white/pix/trend/peach/gradient-sb.jpg new file mode 100755 index 00000000000..a37b3c63d23 Binary files /dev/null and b/theme/formal_white/pix/trend/peach/gradient-sb.jpg differ diff --git a/theme/formal_white/pix/trend/peach/gradient_h.jpg b/theme/formal_white/pix/trend/peach/gradient_h.jpg new file mode 100755 index 00000000000..9251ab2680a Binary files /dev/null and b/theme/formal_white/pix/trend/peach/gradient_h.jpg differ diff --git a/theme/formal_white/pix/trend/peach/hgradient.jpg b/theme/formal_white/pix/trend/peach/hgradient.jpg new file mode 100755 index 00000000000..77949f9b942 Binary files /dev/null and b/theme/formal_white/pix/trend/peach/hgradient.jpg differ diff --git a/theme/formal_white/pix/trend/peach/peach.jpg b/theme/formal_white/pix/trend/peach/peach.jpg new file mode 100755 index 00000000000..7e76858032d Binary files /dev/null and b/theme/formal_white/pix/trend/peach/peach.jpg differ diff --git a/theme/formal_white/pix/trend/peach/roundcorner/body_l.jpg b/theme/formal_white/pix/trend/peach/roundcorner/body_l.jpg new file mode 100755 index 00000000000..faf688b5f73 Binary files /dev/null and b/theme/formal_white/pix/trend/peach/roundcorner/body_l.jpg differ diff --git a/theme/formal_white/pix/trend/peach/roundcorner/body_r.jpg b/theme/formal_white/pix/trend/peach/roundcorner/body_r.jpg new file mode 100755 index 00000000000..55af24c8161 Binary files /dev/null and b/theme/formal_white/pix/trend/peach/roundcorner/body_r.jpg differ diff --git a/theme/formal_white/pix/trend/peach/roundcorner/footer.jpg b/theme/formal_white/pix/trend/peach/roundcorner/footer.jpg new file mode 100755 index 00000000000..31fa072be5b Binary files /dev/null and b/theme/formal_white/pix/trend/peach/roundcorner/footer.jpg differ diff --git a/theme/formal_white/pix/trend/peach/roundcorner/footer_l.jpg b/theme/formal_white/pix/trend/peach/roundcorner/footer_l.jpg new file mode 100755 index 00000000000..5dfc5bff0eb Binary files /dev/null and b/theme/formal_white/pix/trend/peach/roundcorner/footer_l.jpg differ diff --git a/theme/formal_white/pix/trend/peach/roundcorner/footer_r.jpg b/theme/formal_white/pix/trend/peach/roundcorner/footer_r.jpg new file mode 100755 index 00000000000..3ff08d62bec Binary files /dev/null and b/theme/formal_white/pix/trend/peach/roundcorner/footer_r.jpg differ diff --git a/theme/formal_white/pix/trend/peach/roundcorner/header.jpg b/theme/formal_white/pix/trend/peach/roundcorner/header.jpg new file mode 100755 index 00000000000..130326871b0 Binary files /dev/null and b/theme/formal_white/pix/trend/peach/roundcorner/header.jpg differ diff --git a/theme/formal_white/pix/trend/peach/roundcorner/header_l.jpg b/theme/formal_white/pix/trend/peach/roundcorner/header_l.jpg new file mode 100755 index 00000000000..b5e2c9702d4 Binary files /dev/null and b/theme/formal_white/pix/trend/peach/roundcorner/header_l.jpg differ diff --git a/theme/formal_white/pix/trend/peach/roundcorner/header_r.jpg b/theme/formal_white/pix/trend/peach/roundcorner/header_r.jpg new file mode 100755 index 00000000000..8401ba3adf1 Binary files /dev/null and b/theme/formal_white/pix/trend/peach/roundcorner/header_r.jpg differ diff --git a/theme/formal_white/pix/trend/silver/bg_bread.jpg b/theme/formal_white/pix/trend/silver/bg_bread.jpg new file mode 100755 index 00000000000..a275c6a3daa Binary files /dev/null and b/theme/formal_white/pix/trend/silver/bg_bread.jpg differ diff --git a/theme/formal_white/pix/trend/silver/custommenubg.jpg b/theme/formal_white/pix/trend/silver/custommenubg.jpg new file mode 100755 index 00000000000..3205f89f8cd Binary files /dev/null and b/theme/formal_white/pix/trend/silver/custommenubg.jpg differ diff --git a/theme/formal_white/pix/trend/silver/gradient-sb.jpg b/theme/formal_white/pix/trend/silver/gradient-sb.jpg new file mode 100755 index 00000000000..8a60ddc5eb0 Binary files /dev/null and b/theme/formal_white/pix/trend/silver/gradient-sb.jpg differ diff --git a/theme/formal_white/pix/trend/silver/gradient_h.jpg b/theme/formal_white/pix/trend/silver/gradient_h.jpg new file mode 100755 index 00000000000..e0c9beabacd Binary files /dev/null and b/theme/formal_white/pix/trend/silver/gradient_h.jpg differ diff --git a/theme/formal_white/pix/trend/silver/hgradient.jpg b/theme/formal_white/pix/trend/silver/hgradient.jpg new file mode 100755 index 00000000000..9ded50c6690 Binary files /dev/null and b/theme/formal_white/pix/trend/silver/hgradient.jpg differ diff --git a/theme/formal_white/pix/trend/silver/roundcorner/body_l.jpg b/theme/formal_white/pix/trend/silver/roundcorner/body_l.jpg new file mode 100755 index 00000000000..a930d14e0bb Binary files /dev/null and b/theme/formal_white/pix/trend/silver/roundcorner/body_l.jpg differ diff --git a/theme/formal_white/pix/trend/silver/roundcorner/body_r.jpg b/theme/formal_white/pix/trend/silver/roundcorner/body_r.jpg new file mode 100755 index 00000000000..da1a0bf0f5c Binary files /dev/null and b/theme/formal_white/pix/trend/silver/roundcorner/body_r.jpg differ diff --git a/theme/formal_white/pix/trend/silver/roundcorner/footer.jpg b/theme/formal_white/pix/trend/silver/roundcorner/footer.jpg new file mode 100755 index 00000000000..0c3f1fe6f3d Binary files /dev/null and b/theme/formal_white/pix/trend/silver/roundcorner/footer.jpg differ diff --git a/theme/formal_white/pix/trend/silver/roundcorner/footer_l.jpg b/theme/formal_white/pix/trend/silver/roundcorner/footer_l.jpg new file mode 100755 index 00000000000..3da58532a68 Binary files /dev/null and b/theme/formal_white/pix/trend/silver/roundcorner/footer_l.jpg differ diff --git a/theme/formal_white/pix/trend/silver/roundcorner/footer_r.jpg b/theme/formal_white/pix/trend/silver/roundcorner/footer_r.jpg new file mode 100755 index 00000000000..ef1a10f2c39 Binary files /dev/null and b/theme/formal_white/pix/trend/silver/roundcorner/footer_r.jpg differ diff --git a/theme/formal_white/pix/trend/silver/roundcorner/header.jpg b/theme/formal_white/pix/trend/silver/roundcorner/header.jpg new file mode 100755 index 00000000000..9e4c9ea457f Binary files /dev/null and b/theme/formal_white/pix/trend/silver/roundcorner/header.jpg differ diff --git a/theme/formal_white/pix/trend/silver/roundcorner/header_l.jpg b/theme/formal_white/pix/trend/silver/roundcorner/header_l.jpg new file mode 100755 index 00000000000..d1b6c1290ae Binary files /dev/null and b/theme/formal_white/pix/trend/silver/roundcorner/header_l.jpg differ diff --git a/theme/formal_white/pix/trend/silver/roundcorner/header_r.jpg b/theme/formal_white/pix/trend/silver/roundcorner/header_r.jpg new file mode 100755 index 00000000000..38711a9485d Binary files /dev/null and b/theme/formal_white/pix/trend/silver/roundcorner/header_r.jpg differ diff --git a/theme/formal_white/pix/trend/silver/silver.jpg b/theme/formal_white/pix/trend/silver/silver.jpg new file mode 100755 index 00000000000..ed95fb35466 Binary files /dev/null and b/theme/formal_white/pix/trend/silver/silver.jpg differ diff --git a/theme/formal_white/settings.php b/theme/formal_white/settings.php index e2583cfe648..d040b81ffce 100644 --- a/theme/formal_white/settings.php +++ b/theme/formal_white/settings.php @@ -46,6 +46,20 @@ if ($ADMIN->fulltree) { $setting->set_updatedcallback('theme_reset_all_caches'); $settings->add($setting); + // Trend colour settings + $name = 'theme_formal_white/trendcolor'; + $title = get_string('trendcolor','theme_formal_white'); + $description = get_string('trendcolordesc', 'theme_formal_white'); + $default = 'mink'; + $trends = get_directory_list($CFG->dirroot.'/theme/formal_white/pix/trend/', '', false, true, false); + $choices = array(); + foreach ($trends as $trend) { + $choices[$trend] = get_string($trend, 'theme_formal_white'); + } + $setting = new admin_setting_configselect($name, $title, $description, $default, $choices); + $setting->set_updatedcallback('theme_reset_all_caches'); + $settings->add($setting); + // Custom site logo setting $name = 'theme_formal_white/customlogourl'; $title = get_string('customlogourl','theme_formal_white'); diff --git a/theme/formal_white/style/block.css b/theme/formal_white/style/block.css index d3c4eb2e694..cb1c933bfd1 100644 --- a/theme/formal_white/style/block.css +++ b/theme/formal_white/style/block.css @@ -4,7 +4,7 @@ .block {border:[[static:lb_blockborderwidth]] solid #C6BDA8;margin-bottom:[[setting:blockpadding]];} .block .header h2 {margin:0;padding-left:0.3em;} -.block .header .title {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;clear:both;line-height:2em;background-color:#E3DFD4;} +.block .header .title {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;clear:both;line-height:2em;} .block .header .title .commands {padding-left:0.3em;text-align:right;} .block .content {background-color:[[setting:blockcontentbgc]];} .block img.icon {padding-right:5px} diff --git a/theme/formal_white/style/calendar.css b/theme/formal_white/style/calendar.css index 8c46cbfc370..5f85f1aa361 100644 --- a/theme/formal_white/style/calendar.css +++ b/theme/formal_white/style/calendar.css @@ -2,24 +2,24 @@ * This file contains style information for calendar module * *************************************************************/ -/* i nomi dei mesi */ +/* the names of the months */ .path-calendar .minicalendarblock h3 {font-size:1.0em;margin:0;text-align:center;} -/* spaziatura fra nome del mese e minicalendar corrispondente */ +/* spacing between the month name and the corresponding minicalendar */ .path-calendar .block .minicalendar {margin:5px 0 10px 0;} -/* la quadrettatura del calendario */ +/* the grid of the calendar */ .path-calendar .calendartable th, .path-calendar .calendartable td {border:1px [[setting:lblockcolumnbgc]] solid;} -/* il rilievo del giorno corrente nel minicalendar */ +/* the different current day in minicalendar */ /*.path-calendar .calendartable td.today {border:2px #444444 solid;}*/ .path-calendar .minicalendar td.today {border:2px #444444 solid;} -/* il bordo del generico evento nella lista a centro pagina */ +/* the edge of the generic event in the list in the center of the page */ .path-calendar .maincalendar .eventlist .event {border: 1px [[setting:lblockcolumnbgc]] solid;} -/* se c'è una duration... nel minicalendar */ +/* if a duration exists... in the minicalendar */ .path-calendar .minicalendar .calendar_event_user, .path-calendar .minicalendar .duration_user {border-bottom:2px #A1BECB dotted;} .path-calendar .minicalendar .calendar_event_course, @@ -29,24 +29,24 @@ .path-calendar .minicalendar .calendar_event_group, .path-calendar .minicalendar .duration_group {border-bottom:2px #FBBB23 dotted;} -/* se c'è una duration... nel calendartable */ -/* attento: non servono perché potrei avere più di una duration */ -/* per questo la casella non va segnata con un border-bottom */ -/* ma vanno riporati gli eventi al suo interno */ +/* if a duration exists... in the calendartable */ +/* take care: it is not needed because I might have more than one duration + * this is why the cell must not be equipped with a border-bottom + * but events need to to drown inside + */ .path-calendar .maincalendar .calendarmonth th, -.path-calendar .minicalendar th {background:url([[pix:theme|gradient-sb]]) repeat-x 0 0;} +.path-calendar .minicalendar th {background:url([[pix:theme|trend/__setting_trendcolor__/gradient-sb]]) repeat-x 0 0;} -/* i settaggi del calendario del blocco */ - -/* la quadrettatura del calendario */ +/* settings for the block calendar */ +/* the grid of the calendar */ .calendartable th, .calendartable td {border:1px [[setting:lblockcolumnbgc]] solid;} -/* il rilievo del giorno corrente nel calendario del blocco */ +/* the different current day in the block calendar */ .calendartable .today {border:2px #444444 solid;} -/* se c'è una duration... nel minicalendar */ +/* if a duration exists... in the block calendar */ .calendartable .calendar_event_user, .calendartable .duration_user {border-bottom:2px #A1BECB dotted;} .calendartable .calendar_event_course, diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css index 2a5b3574c39..b27bd9b020e 100644 --- a/theme/formal_white/style/core.css +++ b/theme/formal_white/style/core.css @@ -154,6 +154,7 @@ textarea { color: #000000; text-decoration: none; } + .mform .btn-cancel:hover, .mform .btn-cancel:focus { color: #000000; text-decoration: underline; diff --git a/theme/formal_white/style/course.css b/theme/formal_white/style/course.css index 87be54ab610..ed981e77717 100644 --- a/theme/formal_white/style/course.css +++ b/theme/formal_white/style/course.css @@ -1,17 +1,28 @@ /** Course formats **/ .course-content .section li.activity {margin:7px 0;} -.course-content .header {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;border-top:1px solid #C6BDA8;background-color:#E3DFD4;} +.course-content .header {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;border-top:1px solid #C6BDA8;} .course-content h2.header {padding-left:1em;} .course-content ul.weeks li.section {border:1px solid #DDD;} .course-content ul.weeks li.section .content {background-color:#FAFAFA;padding:5px 10px;} .course-content ul.weeks li.section .content h3 {margin:0;color:#777;font-weight:normal;} .course-content ul.weeks li.section .left {padding:5px 0;} .course-content ul.weeks li.section .right {padding:5px 0;} +.course-content .single-section .section-navigation {margin-bottom:0;} /** Course **/ .coursebox {border:1px solid #DDD;border-color:#DDDDDD;} -.coursebox > .info {margin:0;font-size:100%;} +#page-enrol-index .generalbox.info, +#page-course-info .generalbox.info {border:none;} +.coursebox .info {margin:0;font-size:100%;} +.coursebox .name {margin:5px;} .coursebox .content {font-size:90%;} +.coursebox .teachers {margin:5px 1em;} +.coursebox .summary, +.coursebox .coursecat, +.coursebox .content .courseimage, +.coursebox .content .coursefile {margin:5px;} +.coursebox > .content:after, +.coursebox > .info:after {clear:both;content:".";display:block;height:0;min-width:0;visibility:hidden;} #page-course-recent h2.main {font-size:110%;} #page-course-recent .user {font-size:75%;} @@ -83,12 +94,15 @@ /* Course and category listings */ .course_category_tree .controls {margin-bottom:5px;text-align:right;float:right;} .course_category_tree .controls div {padding-right:2em;font-size:75%;} -.course_category_tree .category > .info {background-color:#e3dfd4;background-image:url([[pix:theme|hgradient]]);background-repeat:repeat-x;border:1px solid #ddd;} +.course_category_tree .category > .info {background-image:url([[pix:theme|trend/__setting_trendcolor__/hgradient]]);background-repeat:repeat-x;border:1px solid #ddd;} .course_category_tree.frontpage-category-names .category > .info {background:none;border:none;} +.course_category_tree .category > .info {margin: 5px 0;} +.course_category_tree .category > .info .name {margin:5px;padding-left:16px;} +.dir-rtl .course_category_tree .category > .info .name {padding-left:0;padding-right:16px;} .courses .coursebox.even {background-color:#f6f6f6;border-color:#eee;} .courses .coursebox:hover, -.course_category_tree .courses > .paging.paging-morelink:hover {background-color:#eee;} -.courses > .paging, +.course_category_tree .courses > .paging:hover {background-color:#eee;} +.course_category_tree .courses > .paging, .course_category_tree .subcategories > .paging {padding:5px;} /* Publication */ diff --git a/theme/formal_white/style/formal_white.css b/theme/formal_white/style/formal_white.css index 75fb058bc87..52461110909 100644 --- a/theme/formal_white/style/formal_white.css +++ b/theme/formal_white/style/formal_white.css @@ -6,7 +6,7 @@ html, body { font-family:Arial, Verdana, Helvetica, sans-serif; margin:0; padding:0; - background-color:#EFEFEF; + background-color:[[setting:pagebackground]]; font-size:[[setting:fontsizereference]]; } @@ -74,12 +74,12 @@ h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;} #dock {background-color:[[setting:blockcontentbgc]];border-right:1px dashed #000;} #dock .dockeditem_container {margin-top: 10px;} -#dock #dockeditempanel .dockeditempanel_hd {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;text-align:left;height:1.8em;background-color:#E3DFD4;} +#dock #dockeditempanel .dockeditempanel_hd {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;text-align:left;height:1.8em;} #dock #dockeditempanel .dockeditempanel_hd h2 {display:block;padding-left:0.3em;margin-top:0;text-align:left;} #dock #dockeditempanel .dockeditempanel_hd .commands {position:absolute;right:0.3em;top:0.25em;} /* navbar */ -.navbar {width:auto;background-image:url([[pix:theme|bg_bread]]);background-repeat:repeat-x;line-height:29px;} /* 30 pixel is the height if bg_bread */ +.navbar {width:auto;background-image:url([[pix:theme|trend/__setting_trendcolor__/bg_bread]]);background-repeat:repeat-x;line-height:29px;} /* 30 pixel is the height if bg_bread */ .navbar li span {color:#E3DFD4;} .navbar li a:link, .navbar li a:visited {color:white;} @@ -143,7 +143,7 @@ h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;} th.header, .formtable tbody th, .generalbox th, -.generaltable th.header {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;border-top:1px solid #C6BDA8;background-color:#E3DFD4;} +.generaltable th.header {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;border-top:1px solid #C6BDA8;} #modules, #compatibleblockstable {margin-left:auto; margin-right:auto;} table.flexible .r0, table.generaltable .r0 {background-color: #F0F0F0;} table.flexible .r1, table.generaltable .r1 {background-color: #FAFAFA;} @@ -154,7 +154,7 @@ table.groupmanagementtable, table.groupmanagementtable tr, table.groupmanagementtable td {border-width:0px;} table.groupmanagementtable td#buttonscell {vertical-align:middle;text-align:center;} -table#defineroletable tr.rolecapheading {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;background-color:#E3DFD4;} +table#defineroletable tr.rolecapheading {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;} /*table#defineroletable tr.rolecap {border-top:1px dashed #F30;}*/ tr.rolecap {border-top:1px dashed #F30;} tr.rolecapheading + tr.rolecap {border-top:none;} @@ -187,7 +187,7 @@ table td.cell p {margin:0;} .noframefooter {background-color:#FFF;clear: both;float: left;width:100%;} #page-footer-content {text-align:center;border:7px double #E3DFD4;margin:0;padding:0.5em;} #page-footer .logininfo {padding:0.3em 0 0.7em 0;} -#page-footer .moodledocs {text-align:center;background-color:#EFEFEF;padding:0.7em 0 0.8em 0;} +#page-footer .moodledocs {text-align:center;padding:0.7em 0 0.8em 0;} /* pre, code, tt */ pre, code, tt { @@ -224,7 +224,7 @@ pre, code, tt { } /* MDL-29403 */ -.capdefault {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;background-color:#E3DFD4;} +.capdefault {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;} table#defineroletable th {border-top:none;} form.loginform .rememberusername { diff --git a/theme/formal_white/style/frame.css b/theme/formal_white/style/frame.css index ff8d409f7ca..e100dab1890 100644 --- a/theme/formal_white/style/frame.css +++ b/theme/formal_white/style/frame.css @@ -54,7 +54,7 @@ #frametop, #footerframetop { - background-image:url([[pix:theme|roundcorner/header]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/roundcorner/header]]); margin:[[setting:framemargin]] [[setting:framemargin]] 0; background-position:0 0; background-repeat:repeat-x; @@ -63,7 +63,7 @@ #frametopright, #footerframetopright { /* Frame background top right */ - background-image:url([[pix:theme|roundcorner/header_r]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/roundcorner/header_r]]); background-repeat:no-repeat; background-position:100% 0; text-align:left; @@ -74,7 +74,7 @@ #frametopright div, #footerframetopright div { /* Frame background top left */ background-color:transparent; - background-image:url([[pix:theme|roundcorner/header_l]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/roundcorner/header_l]]); background-position:0 0; background-repeat:no-repeat; float:left; @@ -88,7 +88,7 @@ #frameleft, #footerframeleft { /* Frame background left */ - background-image:url([[pix:theme|roundcorner/body_l]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/roundcorner/body_l]]); background-repeat:repeat-y; background-position:0 0; background-color:#FFF; @@ -96,7 +96,7 @@ #frameright, #footerframeright { /* Frame background right */ - background-image:url([[pix:theme|roundcorner/body_r]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/roundcorner/body_r]]); background-repeat:repeat-y; background-position:100% 0; background-color:transparent; @@ -106,7 +106,7 @@ #framebottomright, #footerframebottomright { /* Frame background bottom right */ - background-image:url([[pix:theme|roundcorner/footer_r]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/roundcorner/footer_r]]); background-position:100% 0; background-repeat:no-repeat; height: 17px; @@ -117,7 +117,7 @@ #framebottomright div, #footerframebottomright div { /* Frame background bottom left */ background-color:transparent; - background-image:url([[pix:theme|roundcorner/footer_l]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/roundcorner/footer_l]]); background-position:0 0; background-repeat:no-repeat; float: left; @@ -133,7 +133,7 @@ #footerframebottom { /* Bottom Middle */ background-attachment:scroll; background-color:transparent; - background-image:url([[pix:theme|roundcorner/footer]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/roundcorner/footer]]); background-position:0 100%; background-repeat:repeat-x; } diff --git a/theme/formal_white/style/menu.css b/theme/formal_white/style/menu.css index 08b1362fa95..f6b8a18bd26 100644 --- a/theme/formal_white/style/menu.css +++ b/theme/formal_white/style/menu.css @@ -5,7 +5,7 @@ div.yui3-menu-content { /**************************************************************************************************/ #custommenu .yui3-menu { - background-image:url([[pix:theme|custommenubg]]); + background-image:url([[pix:theme|trend/__setting_trendcolor__/custommenubg]]); background-repeat:repeat-x; background-color:#e1e1df; } diff --git a/theme/formal_white/style/quiz.css b/theme/formal_white/style/quiz.css index 972376b1eef..64c09cca199 100644 --- a/theme/formal_white/style/quiz.css +++ b/theme/formal_white/style/quiz.css @@ -3,7 +3,7 @@ **********************************************************/ #page-mod-quiz-edit div.quizpage .pagecontent {background-color:[[setting:lblockcolumnbgc]];} -.questionbankwindow h2 {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;border-top:1px solid #C6BDA8;background-color:#E3DFD4;border-top:1px solid #C6BDA8;} +.questionbankwindow h2 {background-image:url([[pix:theme|trend/__setting_trendcolor__/gradient_h]]);background-color:[[setting:blockheaderbackground]];background-repeat:repeat-x;border-top:1px solid #C6BDA8;} #page-mod-quiz-edit .questionbankwindow div.header {background-color:transparent;} #page-mod-quiz-edit .questionbankwindow div.header .title {color:#000;} #page-mod-quiz-edit .questionbankwindow div.header a:link,