diff --git a/theme/formal_white/config.php b/theme/formal_white/config.php index 2e71288759e..11afab29ed0 100644 --- a/theme/formal_white/config.php +++ b/theme/formal_white/config.php @@ -255,4 +255,4 @@ $THEME->csspostprocess = 'formal_white_user_settings'; //////////////////////////////////////////////////// // Sets a custom render factory to use with the // theme, used when working with custom renderers. -//////////////////////////////////////////////////// +//////////////////////////////////////////////////// \ No newline at end of file diff --git a/theme/formal_white/db/install.php b/theme/formal_white/db/install.php new file mode 100644 index 00000000000..5efe9ca1faf --- /dev/null +++ b/theme/formal_white/db/install.php @@ -0,0 +1,67 @@ +. + +/** + * formal_white module upgrade code + * + * This file keeps track of upgrades to + * the theme plugin + * + * Sometimes, changes between versions involve + * alterations to database structures and other + * major things that may lose the effort they've put + * into customising and setting up your theme. + * + * The upgrade function in this file will attempt + * to perform all the necessary actions to upgrade + * your older installation to the current version. + * + * If there's something it cannot do itself, it + * will tell you what you need to do. + * + * The commands in here will all be database-neutral, + * using the methods of database_manager class + * + * Please do not forget to use upgrade_set_timeout() + * before any action that may take longer time to finish. + * + * @package theme + * @subpackage formal_white + * @copyright Mediatouch 2000 (http://mediatouch.it/) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +function xmldb_theme_formal_white_install() { + $currentsetting = get_config('theme_formal_white'); + + // Remove all the useless settings of the first pre-release + // Remove backgroundcolor + unset_config('backgroundcolor', 'theme_formal_white'); + // Remove regionwidth + unset_config('regionwidth', 'theme_formal_white'); + // Remove alwayslangmenu + unset_config('alwayslangmenu', 'theme_formal_white'); + + // Create a new config setting called lblockcolumnbgc and give it blockcolumnbgc's value. + set_config('lblockcolumnbgc', $currentsetting->blockcolumnbgc, 'theme_formal_white'); + // Remove blockcolumnbgc + unset_config('blockcolumnbgc', 'theme_formal_white'); + + return true; +} \ No newline at end of file diff --git a/theme/formal_white/lang/en/theme_formal_white.php b/theme/formal_white/lang/en/theme_formal_white.php index ed545afa006..ed5de001112 100644 --- a/theme/formal_white/lang/en/theme_formal_white.php +++ b/theme/formal_white/lang/en/theme_formal_white.php @@ -23,9 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['blockcolumnbgc'] = 'Blocks columns background colour'; -$string['blockcolumnbgcdesc'] = 'This sets the blocks columns background colour for the theme.'; -$string['blockcolumnwidth'] = 'Blocks colum width'; +$string['blockcolumnwidth'] = 'Blocks column width'; $string['blockcolumnwidthdesc'] = 'This sets the blocks column width for the theme. Using widths lower than 200px, the calendar block is not supposed to fit.'; $string['blockcontentbgc'] = 'Blocks content background colour'; $string['blockcontentbgcdesc'] = 'This sets the blocks content background colour for the theme.'; @@ -63,18 +61,22 @@ $string['customcss'] = 'Custom CSS'; $string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.'; $string['displaylogo'] = 'Pages header content'; $string['displaylogodesc'] = 'Choose whether display moodle logo or page heading text in the header.'; +$string['fontsizereference'] = 'Font size reference'; +$string['fontsizereferencedesc'] = 'This allows you to set the default font size for this theme. It is not recommended to set this higher than 13px as it is known to cause display problems with certain blocks.'; $string['footnote'] = 'Footnote'; $string['footnotedesc'] = 'The content from this textarea will be displayed in the footer of every page.'; $string['headerbgc'] = 'Header background colour'; $string['headerbgcdesc'] = 'This sets the blocks header background colour for the theme.'; $string['heading'] = 'Display page heading'; +$string['lblockcolumnbgc'] = 'Left column background colour'; +$string['lblockcolumnbgcdesc'] = 'This sets the left column background colour for the theme.'; $string['logo'] = 'logo'; $string['logodesc'] = 'Change the logo of this theme by entering the URL to a new one (i.e., http://www.somesite/animage.png). As a reference, the default logo is 300px wide by 80px high. A transparent .png will work best.
The chosen logo will be shown in each page of the site without any distinction between front page and other pages.'; $string['moodlelogo'] = 'Display moodle logo'; $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['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 color will be used.'; $string['region-side-post'] = 'Right'; -$string['region-side-pre'] = 'Left'; -$string['regionwidth'] = 'Column width'; -$string['regionwidthdesc'] = 'This sets the width of the two block regions that form the left and right columns.'; \ No newline at end of file +$string['region-side-pre'] = 'Left'; \ No newline at end of file diff --git a/theme/formal_white/layout/frontpage.php b/theme/formal_white/layout/frontpage.php index 69eb7d43cc7..35a82c3933c 100644 --- a/theme/formal_white/layout/frontpage.php +++ b/theme/formal_white/layout/frontpage.php @@ -168,7 +168,7 @@ if ($hasfooter) {
- +
theme->settings->footnote; ?>
@@ -180,7 +180,7 @@ if ($hasfooter) {
@@ -196,7 +196,7 @@ if ($hasfooter) {
-standard_end_of_body_html(); ?> diff --git a/theme/formal_white/layout/general.php b/theme/formal_white/layout/general.php index d93c7d0f7e0..4b020957de8 100644 --- a/theme/formal_white/layout/general.php +++ b/theme/formal_white/layout/general.php @@ -180,6 +180,7 @@ if ($hasfooter) { @@ -193,9 +194,8 @@ if ($hasfooter) { -
login_info(); @@ -207,9 +207,8 @@ if ($hasfooter) {
-standard_end_of_body_html(); ?> \ No newline at end of file diff --git a/theme/formal_white/lib.php b/theme/formal_white/lib.php index cbd5448a4d4..13ad0b50cdd 100644 --- a/theme/formal_white/lib.php +++ b/theme/formal_white/lib.php @@ -11,9 +11,17 @@ defined('MOODLE_INTERNAL') || die(); */ function formal_white_user_settings($css, $theme) { + // Set the font reference size + if (empty($theme->settings->fontsizereference)) { + $fontsizereference = '13'; // default + } else { + $fontsizereference = $theme->settings->fontsizereference; + } + $css = formal_white_set_fontsizereference($css, $fontsizereference); + // Set the page header background color if (empty($theme->settings->headerbgc)) { - $headerbgc = '#E3DFD4'; // default (o forse è meglio #FEF9F6?) + $headerbgc = '#E3DFD4'; // default } else { $headerbgc = $theme->settings->headerbgc; } @@ -21,29 +29,29 @@ function formal_white_user_settings($css, $theme) { // Set the block content background color if (empty($theme->settings->blockcontentbgc)) { - $blockcontentbgc = '#F6F6F6'; // default (o forse è meglio #FEF9F6?) + $blockcontentbgc = '#F6F6F6'; // default } else { $blockcontentbgc = $theme->settings->blockcontentbgc; } $css = formal_white_set_blockcontentbgc($css, $blockcontentbgc); - // Set the block column background color - if (empty($theme->settings->blockcolumnbgc)) { - $blockcolumnbgc = '#E3DFD4'; // default + // Set the left block column background color + if (empty($theme->settings->lblockcolumnbgc)) { + $lblockcolumnbgc = '#E3DFD4'; // default } else { - $blockcolumnbgc = $theme->settings->blockcolumnbgc; + $lblockcolumnbgc = $theme->settings->lblockcolumnbgc; } - $css = formal_white_set_blockcolumnbgc($css, $blockcolumnbgc); + $css = formal_white_set_lblockcolumnbgc($css, $lblockcolumnbgc); - // Set the logo image - if (!empty($theme->settings->logo)) { - $logo = $theme->settings->logo; + // Set the right block column background color + if (empty($theme->settings->rblockcolumnbgc)) { + $rblockcolumnbgc = $lblockcolumnbgc; // default } else { - $logo = null; + $rblockcolumnbgc = $theme->settings->rblockcolumnbgc; } - $css = formal_white_set_logo($css, $logo); + $css = formal_white_set_rblockcolumnbgc($css, $rblockcolumnbgc); - // set the width of the two blocks colums + // set the width of the two blocks columns if (!empty($theme->settings->blockcolumnwidth)) { $blockcolumnwidth = $theme->settings->blockcolumnwidth; } else { @@ -51,6 +59,14 @@ function formal_white_user_settings($css, $theme) { } $css = formal_white_set_blockcolumnwidth($css, $blockcolumnwidth); + // set the customcss + if (!empty($theme->settings->customcss)) { + $customcss = $theme->settings->customcss; + } else { + $customcss = null; + } + $css = formal_white_set_customcss($css, $customcss); + // Return the CSS return $css; } @@ -61,6 +77,12 @@ function formal_white_user_settings($css, $theme) { * Sets the link color variable in CSS * */ +function formal_white_set_fontsizereference($css, $fontsizereference) { + $tag = '[[setting:fontsizereference]]'; + $css = str_replace($tag, $fontsizereference.'px', $css); + return $css; +} + function formal_white_set_headerbgc($css, $headerbgc) { $tag = '[[setting:headerbgc]]'; $css = str_replace($tag, $headerbgc, $css); @@ -73,20 +95,15 @@ function formal_white_set_blockcontentbgc($css, $blockcontentbgc) { return $css; } -function formal_white_set_blockcolumnbgc($css, $blockcolumnbgc) { - $tag = '[[setting:blockcolumnbgc]]'; - $css = str_replace($tag, $blockcolumnbgc, $css); +function formal_white_set_lblockcolumnbgc($css, $lblockcolumnbgc) { + $tag = '[[setting:lblockcolumnbgc]]'; + $css = str_replace($tag, $lblockcolumnbgc, $css); return $css; } -function formal_white_set_logo($css, $logo) { - global $OUTPUT; - - $tag = '[[setting:logo]]'; - if (is_null($logo)) { - $logo = $OUTPUT->pix_url('logo', 'theme'); - } - $css = str_replace($tag, $logo, $css); +function formal_white_set_rblockcolumnbgc($css, $rblockcolumnbgc) { + $tag = '[[setting:rblockcolumnbgc]]'; + $css = str_replace($tag, $rblockcolumnbgc, $css); return $css; } @@ -101,4 +118,11 @@ function formal_white_set_blockcolumnwidth($css, $blockcolumnwidth) { $css = str_replace($tag, (2*$blockcolumnwidth).'px', $css); return $css; -} \ No newline at end of file +} + +function formal_white_set_customcss($css, $customcss) { + $tag = '[[setting:customcss]]'; + $css = str_replace($tag, $customcss, $css); + return $css; +} + diff --git a/theme/formal_white/pix/gradient_h.jpg b/theme/formal_white/pix/gradient_h.jpg index 74960fff1b0..13fb292b57d 100644 Binary files a/theme/formal_white/pix/gradient_h.jpg and b/theme/formal_white/pix/gradient_h.jpg differ diff --git a/theme/formal_white/pix/sprite.png b/theme/formal_white/pix/sprite.png deleted file mode 100644 index afd65e05aaa..00000000000 Binary files a/theme/formal_white/pix/sprite.png and /dev/null differ diff --git a/theme/formal_white/settings.php b/theme/formal_white/settings.php index b68002a9700..64826cbd575 100644 --- a/theme/formal_white/settings.php +++ b/theme/formal_white/settings.php @@ -7,6 +7,14 @@ defined('MOODLE_INTERNAL') || die; if ($ADMIN->fulltree) { + // font size reference + $name = 'theme_formal_white/fontsizereference'; + $title = get_string('fontsizereference','theme_formal_white'); + $description = get_string('fontsizereferencedesc', 'theme_formal_white'); + $default = '13'; + $choices = array(11=>'11px', 12=>'12px', 13=>'13px', 14=>'14px', 15=>'15px', 16=>'16px'); + $setting = new admin_setting_configselect($name, $title, $description, $default, $choices); + $settings->add($setting); // moodle 1.* like setting $name = 'theme_formal_white/noframe'; @@ -16,34 +24,7 @@ if ($ADMIN->fulltree) { $setting = new admin_setting_configcheckbox($name, $title, $description, $default); $settings->add($setting); - // page header background colour setting - $name = 'theme_formal_white/headerbgc'; - $title = get_string('headerbgc','theme_formal_white'); - $description = get_string('headerbgcdesc', 'theme_formal_white'); - $default = '#E3DFD4'; - $previewconfig = array('selector'=>'#page-header', 'style'=>'backgroundColor'); - $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); - $settings->add($setting); - - // Block background colour setting - $name = 'theme_formal_white/blockcontentbgc'; - $title = get_string('blockcontentbgc','theme_formal_white'); - $description = get_string('blockcontentbgcdesc', 'theme_formal_white'); - $default = '#F6F6F6'; - $previewconfig = array('selector'=>'.block .content', 'style'=>'backgroundColor'); - $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); - $settings->add($setting); - - // Block cloumns colour setting - $name = 'theme_formal_white/blockcolumnbgc'; - $title = get_string('blockcolumnbgc','theme_formal_white'); - $description = get_string('blockcolumnbgcdesc', 'theme_formal_white'); - $default = '#E3DFD4'; - $previewconfig = array('selector'=>'#page-content, #page-content #region-pre, #page-content #region-post-box', 'style'=>'backgroundColor'); - $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); - $settings->add($setting); - - // display logo or heading + // Display logo or heading $name = 'theme_formal_white/displaylogo'; $title = get_string('displaylogo','theme_formal_white'); $description = get_string('displaylogodesc', 'theme_formal_white'); @@ -60,6 +41,42 @@ if ($ADMIN->fulltree) { $setting = new admin_setting_configtext($name, $title, $description, $default, PARAM_URL); $settings->add($setting); + // page header background colour setting + $name = 'theme_formal_white/headerbgc'; + $title = get_string('headerbgc','theme_formal_white'); + $description = get_string('headerbgcdesc', 'theme_formal_white'); + $default = '#E3DFD4'; + $previewconfig = array('selector'=>'#page-header', 'style'=>'backgroundColor'); + $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); + $settings->add($setting); + + // Block content background colour setting + $name = 'theme_formal_white/blockcontentbgc'; + $title = get_string('blockcontentbgc','theme_formal_white'); + $description = get_string('blockcontentbgcdesc', 'theme_formal_white'); + $default = '#F6F6F6'; + $previewconfig = array('selector'=>'.block .content', 'style'=>'backgroundColor'); + $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); + $settings->add($setting); + + // Left column colour setting + $name = 'theme_formal_white/lblockcolumnbgc'; + $title = get_string('lblockcolumnbgc','theme_formal_white'); + $description = get_string('lblockcolumnbgcdesc', 'theme_formal_white'); + $default = '#E3DFD4'; + $previewconfig = array('selector'=>'#page-content, #page-content #region-pre, #page-content #region-post-box', 'style'=>'backgroundColor'); + $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); + $settings->add($setting); + + // Right column colour setting + $name = 'theme_formal_white/rblockcolumnbgc'; + $title = get_string('rblockcolumnbgc','theme_formal_white'); + $description = get_string('rblockcolumnbgcdesc', 'theme_formal_white'); + $default = ''; + $previewconfig = array('selector'=>'#page-content #region-post-box, #page-content #region-post', 'style'=>'backgroundColor'); + $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); + $settings->add($setting); + // Block region width $name = 'theme_formal_white/blockcolumnwidth'; $title = get_string('blockcolumnwidth','theme_formal_white'); diff --git a/theme/formal_white/style/calendar.css b/theme/formal_white/style/calendar.css index 58459f8886c..f696447f4de 100644 --- a/theme/formal_white/style/calendar.css +++ b/theme/formal_white/style/calendar.css @@ -6,14 +6,14 @@ /* la quadrettatura del calendario */ .path-calendar .calendartable th, -.path-calendar .calendartable td {border:1px [[setting:blockcolumnbgc]] solid;} +.path-calendar .calendartable td {border:1px [[setting:lblockcolumnbgc]] solid;} /* il rilievo del giorno corrente nel 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 */ -.path-calendar .maincalendar .eventlist .event {border: 1px [[setting:blockcolumnbgc]] solid;} +.path-calendar .maincalendar .eventlist .event {border: 1px [[setting:lblockcolumnbgc]] solid;} /* se c'è una duration... nel minicalendar */ .path-calendar .minicalendar .calendar_event_user, @@ -37,7 +37,7 @@ /* la quadrettatura del calendario */ .calendartable th, -.calendartable td {border:1px [[setting:blockcolumnbgc]] solid;} +.calendartable td {border:1px [[setting:lblockcolumnbgc]] solid;} /* il rilievo del giorno corrente nel calendario del blocco */ .calendartable .today {border:2px #444444 solid;} diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css index c6128d550a3..07915dc5f0f 100644 --- a/theme/formal_white/style/core.css +++ b/theme/formal_white/style/core.css @@ -14,12 +14,13 @@ .headingblock { border-bottom: 1px solid #ddd; - font-size: 1.3em; + font-size:130%; color: #333; } #notice { text-align: center; + padding:1em; } .noticebox, @@ -36,6 +37,9 @@ margin: 1em 0; } +label { + margin-right: 0.3em; +} .navbutton .singlebutton { margin: 0; } @@ -76,7 +80,13 @@ input[type="password"], textarea { width: auto; padding: 2px 0 2px 0; - margin: 5px 0 5px 0; + margin: 0.3em; +} + +.navbutton input[type="text"] { + width: auto; + padding: 0; + margin: 0 0.3em 0 0; } input[type="checkbox"], @@ -127,11 +137,11 @@ input[type="radio"] { .loginbox .forgetpass { margin: 1em 0 0; - font-size: 0.95em; + font-size:95%; } .loginbox.twocolumns { - width: 90%; + width:90%; margin-left: 5%; } @@ -299,7 +309,7 @@ padding: 0 .blog_entry .audience { color: #444; margin: 0 0 0.5em; - font-size: 0.9em; + font-size:90%; } .blog_entry .tags { @@ -408,12 +418,12 @@ padding: 0 } .form-label .form-shortname { - font-size: 0.8em; + font-size:80%; color: #777; } .form-description { - font-size: 0.95em; + font-size:95%; color: #444; } @@ -505,7 +515,7 @@ padding: 0 /** * Enrol - TODO: tidy up styles here */ -.userenrolment {font-size:90%;border:1px solid #E3DFD4;} +.userenrolment {font-size:100%;border:1px solid #E3DFD4;} .userenrolment tr.r0 {background-color:#F9F9F9;} .userenrolment tr.r1 {background-color:#F3F3F3;} .userenrolment td {border:1px solid #E9E9E9;border-top-color:#F6F6F6;border-right-color:#EEE;border-left-color:#F3F3F3;} @@ -513,15 +523,15 @@ padding: 0 .userenrolment td.c4 {border-right-color:#E3DFD4;} .userenrolment .col_userdetails {padding:3px;min-width:35%;} .userenrolment .col_role .roles {position:relative;} -.userenrolment .col_role .role {line-height:10px;font-size:10px;} +.userenrolment .col_role .role {line-height:10px;font-size:70%;} .userenrolment .col_role .role a img {height:8px;} .userenrolment .col_role .addrole {background-color:#DDD;border:1px outset #EEE;-moz-border-radius:5px;} .userenrolment .col_group {max-width:300px;} -.userenrolment .col_group .group {line-height:10px;font-size:10px;} +.userenrolment .col_group .group {line-height:10px;font-size:70%;} .userenrolment .col_group .group a img {height:8px;} .userenrolment .col_group .addgroup {background-color:#DDD;border:1px outset #EEE;-moz-border-radius:5px;} .userenrolment .col_enrol {max-width:300px;} -.userenrolment .col_enrol .enrolment {border:1px outset #E6E6E6;background-color:#EEE;line-height:10px;font-size:10px;-moz-border-radius:5px;} +.userenrolment .col_enrol .enrolment {border:1px outset #E6E6E6;background-color:#EEE;line-height:10px;font-size:70%;-moz-border-radius:5px;} .path-enrol .enrolusersbutton, .path-enrol .enrolcohortbutton {float:left;} .path-enrol .enrolusersbutton.instance1, @@ -534,3 +544,6 @@ padding: 0 * Redirect */ .pagelayout-redirect #content {text-align:center;margin-top:10%;margin-bottom:10%;} + +/* plugin compattable */ +.plugincompattable {font-size:90%;} diff --git a/theme/formal_white/style/course.css b/theme/formal_white/style/course.css index 59137b4af24..6da4da0d1d3 100644 --- a/theme/formal_white/style/course.css +++ b/theme/formal_white/style/course.css @@ -1,6 +1,6 @@ /** 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 #C6BDA8 solid;} +.course-content .header {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;border-top:1px #C6BDA8 solid;background-color:#E3DFD4;} .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;} @@ -10,25 +10,25 @@ /** Course **/ .coursebox {border:1px solid #DDD;border-color:#DDDDDD;} -.coursebox .info {margin:5px;font-size:1em;} +.coursebox .info {margin:5px;font-size:100%;} .coursebox .info .name {margin:3px 0;} -.coursebox .info .teachers {margin:0 1em;font-size:0.9em;} -.coursebox .cost {font-size:0.9em;padding-top:20px;} -.coursebox .summary {margin:5px;font-size:0.9em;} +.coursebox .info .teachers {margin:0 1em;font-size:90%;} +.coursebox .cost {font-size:90%;padding-top:20px;} +.coursebox .summary {margin:5px;font-size:90%;} -#page-course-recent h2.main {font-size:1.1em;} -#page-course-recent .user {font-size:0.75em;} -#page-course-recent .grade {font-style:italic;font-size:0.9em;} -#page-course-recent .forum-recent .reply .title {font-style:italic;font-size:0.9em;} -#page-course-recent .forum-recent .discussion .title {font-weight:bold;font-style:italic;font-size:0.9em;} +#page-course-recent h2.main {font-size:110%;} +#page-course-recent .user {font-size:75%;} +#page-course-recent .grade {font-style:italic;font-size:90%;} +#page-course-recent .forum-recent .reply .title {font-style:italic;font-size:90%;} +#page-course-recent .forum-recent .discussion .title {font-weight:bold;font-style:italic;font-size:90%;} -.path-course-view .availabilityinfo {font-size:0.85em;color:#aaa;} +.path-course-view .availabilityinfo {font-size:85%;color:#aaa;} .path-course-view .availabilityinfo strong {font-weight:normal;color:black;} .path-course-view .dimmed_text img {opacity:0.3;filter:alpha(opacity='30');} -.path-course-view .section {font-size:0.95em;line-height:1.2em;} +.path-course-view .section {line-height:1.2em;} .path-course-view .section .activity {padding:0.2em 0;} .path-course-view .section .activity a {line-height:1em;} -.path-course-view .section .weekdates {margin:0;font-weight:normal;font-size:1em;} +.path-course-view .section .weekdates {margin:0;font-weight:normal;font-size:100%;} .path-course-view .section .groupinglabel {color:#666666;} .path-course-view .section .left {font-weight:bold;} @@ -64,10 +64,10 @@ #page-admin-report .plugin, #page-course-report .plugin, -#page-course-import .plugin {margin-bottom:20px;margin-left:10%;margin-right:10%;border:1px solid #cecece;background-color:#fdfdfd;} +#page-course-import .plugin {margin-bottom:20px;margin-left:10%;margin-right:10%;border:1px solid #cecece;background-color:[[setting:blockcontentbgc]];} .path-course-view .unread {background:#9EBEFF;} -.path-course-view .completionprogress {font-size:0.80em; padding:8px 26px 5px 5px;} +.path-course-view .completionprogress {font-size:80%; padding:8px 26px 5px 5px;} #page-course-category .courseboxes, #page-course-index .courseboxes {padding:20px;} diff --git a/theme/formal_white/style/formal_white.css b/theme/formal_white/style/formal_white.css index 6a74e1ed5d9..fb89a13e70e 100644 --- a/theme/formal_white/style/formal_white.css +++ b/theme/formal_white/style/formal_white.css @@ -7,34 +7,36 @@ html, body { margin:0; padding:0; background-color:#EFEFEF; - font-size:13px; + font-size:[[setting:fontsizereference]]; } -a:link {text-decoration:none;} -a:visited {text-decoration:none;} -a:hover {text-decoration:underline;} +a:link {text-decoration:none;color:black;} +a:visited {text-decoration:none;color:black;} +a:hover {text-decoration:underline;color:black;} -h1 {font-size:1.4em;font-weight:bold;} -h2 {font-size:1.3em;} -h3 {font-size:1.2em;} +h1 {font-size:140%;font-weight:bold;} +h2 {font-size:130%;} +h3 {font-size:120%;} h4 {font-weight:bold;} -h2.main, h3.main, h4.main { - margin:0; - padding:0; - text-align: center; -} +h2.main, h3.main, h4.main {margin:0;padding:0;text-align: center;} -#headerlogo {margin:0.3em;float:left;top:1em;z-index:1;} -h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:2em;z-index:1;} +#headerlogo {margin:0.3em;float:left;top:1em;} +h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;} /* headermenu */ -.headermenu {float:right;top:1em;z-index:2;} +#page-header{line-height:0;} +/*#headerlogo img {margin:7px;}*/ +.headermenu {position:relative;line-height:1.7em;font-size:90%;margin:0.3em 0.3em 0 0;right:0.3em;margin-bottom:0.3em;} -#dock {background-color:#E3DFD4;border-right:1px #000 dashed;} +#dock {background-color:[[setting:blockcontentbgc]];border-right:1px #000 dashed;} +#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 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;padding-top:0.35em;padding-bottom:0.15em;background-image:url([[pix:theme|bg_bread]]);} +.navbar {width:auto;padding-top:0.35em;padding-bottom:0.15em;background-image:url([[pix:theme|bg_bread]]);background-color:#AB9D80;} .navbar li span {color:#E3DFD4;} .navbar li a:link, .navbar li a:visited {color:white;} @@ -42,12 +44,41 @@ h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:2em;z-index:1;} .navbutton {padding-right:0.5em;} .navbutton table td {padding:0;} +/*.block_navigation .block_tree li.type_category.contains_branch>p span { + padding-left: 20px; + background-image: url([[pix:theme|folderopen]]); + background-repeat: no-repeat; + background-position: 0 -1px; +} +.block_navigation .block_tree li.type_category.contains_branch.collapsed>p span { + padding-left: 20px; + background-image: url([[pix:theme|folderclose]]); + background-repeat: no-repeat; + background-position: 0 -1px; +}*/ + +.block_settings .block_tree .tree_item a:link, +.block_settings .block_tree .tree_item a:visited, +.block_settings .block_tree .tree_item a:active, +.block_navigation .block_tree .tree_item a:link, +.block_navigation .block_tree .tree_item a:visited, +.block_navigation .block_tree .tree_item a:active { + color:#000; +} + /* breadcrumb */ .breadcrumb {margin-left:0.8em;} /* generalbox */ .generalbox {border-color:#E3DFD4;} +/* generalbox */ +#page-admin-setting-manageauths .generalbox {border:none;} + +/* generalbox */ +#page-enrol-instances .generalbox {border:none;} +#page-enrol-instances .select.menujump {margin-left:0.5em;} + /* tables */ .editcourse th, .editcourse td, @@ -76,23 +107,31 @@ 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;} +table#defineroletable tr.rolecapheading {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;background-color:#E3DFD4;} /*table#defineroletable tr.rolecap {border-top:1px #F30 dashed;}*/ tr.rolecap {border-top:1px #F30 dashed;} tr.rolecapheading + tr.rolecap {border-top:none;} - /* course categories */ +/* course categories */ #page-admin-course-index .editcourse td div.singleselect {text-align:left;} - /* course */ -ul.topics .section span.commands {margin-left:2em;} /* distanza dei comandi dagli elementi del corso */ +/* course */ +/* ul.topics .section span.commands {float:right;} /* distanza dei comandi dagli elementi del corso */ +ul.topics .section span.commands {position:absolute;right:1em;} .mform fieldset {border:1px #DDD solid;} +.mform .fitem .fitemtitle {width:25%;} +.mform .fitem .fitemtitle label {padding-right:5px;} +.mform .fitem .felement {margin-left:26%;width:73%;} +/*.mform .fitem fieldset.felement {padding-left:0}*/ +.mform .fitem .fitemtitle .helplink img {margin-right:-5px;} +.mform .fsubmit {text-align:left} +table td.cell p {margin:0;} /* block */ .block {border:1px #C6BDA8 solid;margin-bottom:0.5em;} .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;} +.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 .commands {padding-left:0.3em;text-align:right;} .block .content {background-color:[[setting:blockcontentbgc]];} @@ -103,6 +142,9 @@ ul.topics .section span.commands {margin-left:2em;} /* distanza dei comandi dagl .pagelayout-report #page-header {float:left;} .pagelayout-report #page-content {overflow:hidden;} +/* notice */ +#notice div.buttons {margin-bottom:0;} + /* page-footer */ #page-footer {text-align:center;width:100%;padding:0;} .noframefooter {background-color:#FFF;clear: both;float: left;width:100%;} @@ -110,5 +152,12 @@ ul.topics .section span.commands {margin-left:2em;} /* distanza dei comandi dagl #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;} +/* js help messages */ +#helppopupbox .helpheading {margin-top:1em;} + +/* pre, code, tt */ +pre, code, tt { + font: 1em/1.3 monospace; +} /** Custom CSS **/ [[setting:customcss]] diff --git a/theme/formal_white/style/menu.css b/theme/formal_white/style/menu.css index 4a412a00846..d4da06ead8f 100644 --- a/theme/formal_white/style/menu.css +++ b/theme/formal_white/style/menu.css @@ -1,39 +1,128 @@ -/*#custommenu .yui3-menu ul {background-image:url([[pix:theme|custommenubg]]);background-repeat:repeat-x;background-color:#e1e1df;}*/ -#custommenu .yui3-menu {background-image:url([[pix:theme|custommenubg]]);background-repeat:repeat-x;background-color:#e1e1df;} - -.yui3-skin-sam .yui3-menu-content, -.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content, -.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label,.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content{ - border:0px none; -} - -/*.yui3-menu ul{ - background:url([[pix:theme|sprite]]) repeat-x 0 0; -}*/ - -.yui3-menu ul li ul{ - background:#fff; -} - -.yui3-menu ul li{ - border-right:1px solid #ccc; -} - -.yui3-menu ul li ul li{ - border-right:none; - /*border-bottom:1px dashed #ccc;*/ - padding:3px; -} - div.yui3-menu-content { border:none !important; } -ul.first-of-type li a { - border-top:none !important; - border-bottom:none !important; +/**************************************************************************************************/ + +#custommenu .yui3-menu { + background-image:url([[pix:theme|custommenubg]]); + background-repeat:repeat-x; + background-color:#e1e1df; } -ul.first-of-type li a:hover { - color:#003466; +/*YUI Reset */ +.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-content{ + background-position: -10000px -10000px; +} + +.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label{ + background-position: -10000px -10000px; +} + +.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-active, +.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-active .yui3-menuitem-content, +.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label-menuvisible{ + background-position: -10000px -10000px; +} + +.yui3-skin-sam #page .yui3-menu-label, +.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-label { + background-position: right center; +} + +.yui3-skin-sam #page .yui3-menubuttonnav .yui3-menu-label em { + background-position: right center; +} + +.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label .yui3-menu-toggle { + background-position: 3px center; +} + +.yui3-skin-sam #page .yui3-splitbuttonnav .yui3-menu-label-menuvisible .yui3-menu-toggle { + background-position: 0% 50%; +} + +.yui3-skin-sam #page .yui3-menu-label, +.yui3-skin-sam #page .yui3-menuitem-content { + color: #35251B; + font-weight: 400; +} + +.custom_menu_submenu .yui3-menu-label, +.custom_menu_submenu .yui3-menuitem-content { + color: #35251B !important; +} + +.yui3-skin-sam #page .yui3-menu-label.yui3-menu-label-active, +.yui3-skin-sam #page .yui3-menuitem-active .yui3-menuitem-content { + color: #DA5013; +} + +.yui3-skin-sam #page .yui3-menu-content, +.yui3-skin-sam #page .yui3-menu-content, +.yui3-skin-sam #page .yui3-menu .yui3-menu .yui3-menu-content, +.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menu-label, +.yui3-skin-sam #page .yui3-menu-horizontal .yui3-menuitem-content { + border: none; +} + +.yui3-skin-sam .yui3-menu-horizontal .yui3-menu-label, +.yui3-skin-sam .yui3-menu-horizontal .yui3-menuitem-content { + border-color:#808080; + border-style:solid; + border-width:0px 0; +} + +#page .custom_menu_submenu { + border: 2px solid #DA5013 !important; + background: #fff; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + -webkit-box-shadow: 0px 1px 3px #ccc; + -moz-box-shadow: 0px 1px 3px #ccc; + box-shadow: 0px 1px 3px #ccc; +} + +/* riga della voce di menu */ +.yui3-skin-sam .yui3-menu-content, +.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content { + border: 1px solid #808080; + font-size: 100%; + line-height: 1.5; + padding:3px 0; +} + +.yui3-menu ul li ul li, +.yui3-skin-sam .yui3-menu-content, +.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-content { + background-color:#E9E9E9; +} + +/* cancellazione della bordatura superiore alla lista delle voci di menu */ +.yui3-skin-sam .yui3-menu .yui3-menu { + border-top:none; + padding-left:-1px; + border-right:1px #CCC solid; + border-bottom:1px #CCC solid; + border-left:1px #CCC solid; +} + +/* color of selected item in FF */ +.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-menuvisible, +.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content, +.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-active, +.yui3-skin-sam .yui3-menu .yui3-menu .yui3-menu-label-menuvisible { + background-color:#FFF; +} + +/* separatore vertical fra i nomi dei menu */ +.yui3-skin-sam .yui3-menu-content ul.first-of-type li{ + border-right:1px solid #ccc; +} + +/* inibizione del bordo destro nelle voci di menu */ +.yui3-skin-sam .yui3-menu-content ul.first-of-type li.yui3-menuitem { + border-right:none; + /*background-color:#E9E9E9;*/ } \ No newline at end of file diff --git a/theme/formal_white/style/pagelayout.css b/theme/formal_white/style/pagelayout.css index fa39c3e46e4..8c771c004bb 100644 --- a/theme/formal_white/style/pagelayout.css +++ b/theme/formal_white/style/pagelayout.css @@ -48,7 +48,7 @@ /* -moz-border-radius:0px 0px 0px 6px; /* Firefox */ /* -webkit-border-radius:0px 0px 0px 6px; /* Safari, Chrome */ /* border-radius:0px 0px 0px 6px; /* CSS3 */ - background-color:[[setting:blockcolumnbgc]]; /* colore della colonna di sinistra */ + background-color:[[setting:lblockcolumnbgc]]; /* colore della colonna di sinistra */ float:none; } #page-content #region-main-box { @@ -61,7 +61,7 @@ /* -moz-border-radius:0px 0px 6px 0px; /* Firefox */ /* -webkit-border-radius:0px 0px 6px 0px; /* Safari, Chrome */ /* border-radius:0px 0px 6px 0px; /* CSS3 */ - background-color:[[setting:blockcolumnbgc]]; /* colore del fondo della parte occupata dai contenuti della colonna centrale e della colonna dx */ + background-color:[[setting:rblockcolumnbgc]]; /* colore della colonna di destra */ } #page-content #region-main { margin-left:[[setting:doubleblockcolumnwidth]];/*2*[[setting:blockcolumnwidth]]*/ @@ -70,7 +70,7 @@ #page-content #region-pre { left:[[setting:blockcolumnwidth]]; /*400-[[setting:blockcolumnwidth]]*/ width:[[setting:blockcolumnwidth]]; - background-color:[[setting:blockcolumnbgc]]; /* colore della colonna di sx */ + background-color:[[setting:lblockcolumnbgc]]; /* colore della colonna di sx */ } #page-content #region-post { width:[[setting:blockcolumnwidth]]; @@ -78,7 +78,7 @@ /* -moz-border-radius:0px 0px 6px 0px; /* Firefox */ /* -webkit-border-radius:0px 0px 6px 0px; /* Safari, Chrome */ /* border-radius:0px 0px 6px 0px; /* CSS3 */ - background-color:[[setting:blockcolumnbgc]]; /* colore del fondo della parte occupata dai contenuti della colonna centrale e della colonna dx */ + background-color:[[setting:rblockcolumnbgc]]; /* colore del fondo della parte occupata dai contenuti della colonna centrale e della colonna dx */ } #page-content .region-content { padding:0.6em 8px 0.1em 8px; /* definisco lo spazio sopra e sotto ai blocchi */ diff --git a/theme/formal_white/style/quiz.css b/theme/formal_white/style/quiz.css index 89c5cc37376..b743a8bde63 100644 --- a/theme/formal_white/style/quiz.css +++ b/theme/formal_white/style/quiz.css @@ -3,18 +3,18 @@ ***/ /* quiz */ -#page-mod-quiz-edit div.quizpage .pagecontent {background-color:[[setting:blockcolumnbgc]];} -.questionbankwindow h2 {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;border-top:1px #C6BDA8 solid;background-color:[[setting:blockcolumnbgc]];border-top:1px #C6BDA8 solid;} +#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 #C6BDA8 solid;background-color:#E3DFD4;border-top:1px #C6BDA8 solid;} #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, #page-mod-quiz-edit .questionbankwindow div.header a:visited {color:#0000EF} -#page-mod-quiz-edit div.container div.generalbox {background-color:[[setting:blockcolumnbgc]];padding:1.5em;} +#page-mod-quiz-edit div.container div.generalbox {background-color:[[setting:lblockcolumnbgc]];padding:1.5em;} #page-mod-quiz-edit div.questionbank .categoryquestionscontainer, #page-mod-quiz-edit div.questionbank .categorysortopotionscontainer, #page-mod-quiz-edit div.questionbank .categorypagingbarcontainer, #page-mod-quiz-edit div.questionbank .categoryselectallcontainer {padding:0 0 1.5em 0;} -#page-mod-quiz-edit div.questionbank .categorypagingbarcontainer {padding:1em;background-color:[[setting:blockcolumnbgc]];margin:0 -1.2em;border-top:1px [[setting:blockcolumnbgc]] solid;border-bottom:1px [[setting:blockcolumnbgc]] solid;} /* spaziatura sopra e sotto alla tabella con le domande da spostare */ +#page-mod-quiz-edit div.questionbank .categorypagingbarcontainer {padding:1em;background-color:[[setting:lblockcolumnbgc]];margin:0 -1.2em;border-top:1px [[setting:lblockcolumnbgc]] solid;border-bottom:1px [[setting:lblockcolumnbgc]] solid;} /* spaziatura sopra e sotto alla tabella con le domande da spostare */ #page-mod-quiz-edit div.questionbank .categoryquestionscontainer {margin:0 -1.2em -1em -1.2em;} /* tabella con le domande da spostare nel quiz*/ #page-mod-quiz-edit div.editq div.question div.content {background-color:[[setting:blockcontentbgc]];} /* la signola domanda nel modello della pagina*/ diff --git a/theme/formal_white/style/tabs.css b/theme/formal_white/style/tabs.css index 6597cfaf753..75267453781 100644 --- a/theme/formal_white/style/tabs.css +++ b/theme/formal_white/style/tabs.css @@ -30,6 +30,11 @@ width: 100%; bottom: -4px; } +.tabtree .tabrow0 li a:link, +.tabtree .tabrow0 li a:visited, +.tabtree .tabrow0 li a:active { + color:#000; +} .tabtree .tabrow0 li.here a { position:relative; z-index:102; @@ -39,7 +44,7 @@ padding-left:14px; padding-top:10px; background-repeat:no-repeat; - padding-bottom:3px; + padding-bottom:4px; /*to remove the border-bottom*/ margin-bottom:-1px; background-color:transparent; @@ -54,7 +59,7 @@ background-position:100% 0%; padding-right:14px; padding-top:10px; - padding-bottom:3px; + padding-bottom:4px; /*to remove the border-bottom*/ } .tabtree .tabrow0 li a:hover span { background-image:url([[pix:theme|tab/right_hover]]); @@ -81,6 +86,12 @@ .tabtree .tabrow1 li a span, .tabtree .tabrow1 li a:hover span { background-image:none !important; + padding: 0 0.3em; + text-decoration:none; +} + +.tabtree .tabrow1 li a:hover { + font-weight:bold; } .groupmanagementtable { diff --git a/theme/formal_white/version.php b/theme/formal_white/version.php new file mode 100644 index 00000000000..a0000e7d234 --- /dev/null +++ b/theme/formal_white/version.php @@ -0,0 +1,32 @@ +. + +/** + * Label module version info + * + * @package theme + * @subpackage formal_white + * @copyright Mediatouch 2000 (http://mediatouch.it/) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die; + +$plugin->version = 2011052000; // The current module version (Date: YYYYMMDDXX) +$plugin->component = 'theme_formal_white'; +$plugin->requires = 2010080300; // Requires this Moodle version +$plugin->maturity = MATURITY_STABLE; \ No newline at end of file