moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-32356_master' of git://github.com/kordan/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-04-16 12:00:55 +12:00
commit d8b09e5eb2
9 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
theme/formal_white/lang/en/theme_formal_white.php
View file

@ -27,6 +27,8 @@ $string['blockcolumnwidth'] = 'Blocks column width';
$string['blockcolumnwidthdesc'] = 'This sets the blocks column width for the theme. <strong>Using widths lower than 200px, the calendar block is not supposed to fit.</strong>'; $string['blockcolumnwidthdesc'] = 'This sets the blocks column width for the theme. <strong>Using widths lower than 200px, the calendar block is not supposed to fit.</strong>';
$string['blockcontentbgc'] = 'Blocks content background colour'; $string['blockcontentbgc'] = 'Blocks content background colour';
$string['blockcontentbgcdesc'] = 'This sets the blocks content background colour for the theme.'; $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['choosereadme'] = ' $string['choosereadme'] = '
<div class="clearfix"> <div class="clearfix">
<div class="theme_screenshot"> <div class="theme_screenshot">

14
theme/formal_white/lib.php
View file

@ -67,6 +67,14 @@ function formal_white_user_settings($css, $theme) {
} }
$css = formal_white_set_blockcolumnwidth($css, $blockcolumnwidth); $css = formal_white_set_blockcolumnwidth($css, $blockcolumnwidth);
// set blocks margin
if (!empty($theme->settings->blockpadding)) {
$blockpadding = $theme->settings->blockpadding;
} else {
$blockpadding = '8'; // default
}
$css = formal_white_set_blockpadding($css, $blockpadding);
// set the customcss // set the customcss
if (!empty($theme->settings->customcss)) { if (!empty($theme->settings->customcss)) {
$customcss = $theme->settings->customcss; $customcss = $theme->settings->customcss;
@ -145,6 +153,12 @@ function formal_white_set_blockcolumnwidth($css, $blockcolumnwidth) {
return $css; return $css;
} }
function formal_white_set_blockpadding($css, $blockpadding) {
$tag = '[[setting:blockpadding]]';
$css = str_replace($tag, $blockpadding.'px', $css);
return $css;
}
function formal_white_set_customcss($css, $customcss) { function formal_white_set_customcss($css, $customcss) {
$tag = '[[setting:customcss]]'; $tag = '[[setting:customcss]]';
$css = str_replace($tag, $customcss, $css); $css = str_replace($tag, $customcss, $css);

9
theme/formal_white/settings.php
View file

@ -85,6 +85,15 @@ if ($ADMIN->fulltree) {
$setting = new admin_setting_configselect($name, $title, $description, $default, $choices); $setting = new admin_setting_configselect($name, $title, $description, $default, $choices);
$settings->add($setting); $settings->add($setting);
// Block padding
$name = 'theme_formal_white/blockpadding';
$title = get_string('blockpadding','theme_formal_white');
$description = get_string('blockpaddingdesc', 'theme_formal_white');
$default = '8';
$choices = array(1=>'1px', 2=>'2px', 4=>'4px', 8=>'8px', 12=>'12px', 16=>'16px');
$setting = new admin_setting_configselect($name, $title, $description, $default, $choices);
$settings->add($setting);
// Block content background colour setting // Block content background colour setting
$name = 'theme_formal_white/blockcontentbgc'; $name = 'theme_formal_white/blockcontentbgc';
$title = get_string('blockcontentbgc','theme_formal_white'); $title = get_string('blockcontentbgc','theme_formal_white');

2
theme/formal_white/style/course.css
View file

@ -1,6 +1,6 @@
/** Course formats **/ /** Course formats **/
.course-content .section li.activity {margin:7px 0;} .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;background-color:#E3DFD4;} .course-content .header {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;border-top:1px solid #C6BDA8;background-color:#E3DFD4;}
.course-content h2.header {padding-left:1em;} .course-content h2.header {padding-left:1em;}
.course-content ul.weeks li.section {border:1px solid #DDD;} .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 {background-color:#FAFAFA;padding:5px 10px;}

16
theme/formal_white/style/formal_white.css
View file

@ -22,6 +22,8 @@ h4 {font-weight:bold;}
h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;} h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;}
h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;} h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;}
p {margin:0}
/* page-header */ /* page-header */
#page-header{line-height:0;overflow:hidden;} #page-header{line-height:0;overflow:hidden;}
@ -33,7 +35,7 @@ h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;}
/* headermenu */ /* headermenu */
.headermenu {position:absolute;text-align:right;line-height:1.7em;font-size:90%;margin:0.3em;right:[[setting:headermenuright]];top:15px;} .headermenu {position:absolute;text-align:right;line-height:1.7em;font-size:90%;margin:0.3em;right:[[setting:headermenuright]];top:15px;}
#dock {background-color:[[setting:blockcontentbgc]];border-right:1px #000 dashed;} #dock {background-color:[[setting:blockcontentbgc]];border-right:1px dashed #000;}
#dock .dockeditem_container {margin-top: 10px;} #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|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 h2 {display:block;padding-left:0.3em;margin-top:0;text-align:left;}
@ -131,7 +133,7 @@ h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;}
th.header, th.header,
.formtable tbody th, .formtable tbody th,
.generalbox th, .generalbox th,
.generaltable th.header {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;border-top:1px #C6BDA8 solid;background-color:#E3DFD4;} .generaltable th.header {background-image:url([[pix:theme|gradient_h]]);background-repeat:repeat-x;border-top:1px solid #C6BDA8;background-color:#E3DFD4;}
/*#modules, .compatibleblockstable {margin-left:auto; margin-right:auto;} waiting for MDL-26760*/ /*#modules, .compatibleblockstable {margin-left:auto; margin-right:auto;} waiting for MDL-26760*/
table.flexible .r0, table.generaltable .r0 {background-color: #F0F0F0;} table.flexible .r0, table.generaltable .r0 {background-color: #F0F0F0;}
table.flexible .r1, table.generaltable .r1 {background-color: #FAFAFA;} table.flexible .r1, table.generaltable .r1 {background-color: #FAFAFA;}
@ -143,8 +145,8 @@ table.groupmanagementtable tr,
table.groupmanagementtable td {border-width:0px;} table.groupmanagementtable td {border-width:0px;}
table.groupmanagementtable td#buttonscell {vertical-align:middle;text-align:center;} 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|gradient_h]]);background-repeat:repeat-x;background-color:#E3DFD4;}
/*table#defineroletable tr.rolecap {border-top:1px #F30 dashed;}*/ /*table#defineroletable tr.rolecap {border-top:1px dashed #F30;}*/
tr.rolecap {border-top:1px #F30 dashed;} tr.rolecap {border-top:1px dashed #F30;}
tr.rolecapheading + tr.rolecap {border-top:none;} tr.rolecapheading + tr.rolecap {border-top:none;}
/* course categories */ /* course categories */
@ -154,7 +156,7 @@ tr.rolecapheading + tr.rolecap {border-top:none;}
/* ul.topics .section span.commands {float:right;} /* distanza dei comandi dagli elementi del corso */ /* ul.topics .section span.commands {float:right;} /* distanza dei comandi dagli elementi del corso */
ul.topics .section span.commands {position:absolute;right:1em;} ul.topics .section span.commands {position:absolute;right:1em;}
.mform fieldset {border:1px #DDD solid;} .mform fieldset {border:1px solid #DDD;}
.mform .fitem .fitemtitle {width:25%;} .mform .fitem .fitemtitle {width:25%;}
.mform .fitem .fitemtitle label {padding-right:5px;} .mform .fitem .fitemtitle label {padding-right:5px;}
.mform .fitem .felement {margin-left:26%;width:73%;min-height: 0.8em;} .mform .fitem .felement {margin-left:26%;width:73%;min-height: 0.8em;}
@ -164,7 +166,7 @@ ul.topics .section span.commands {position:absolute;right:1em;}
table td.cell p {margin:0;} table td.cell p {margin:0;}
/* block */ /* block */
.block {border:1px #C6BDA8 solid;margin-bottom:0.5em;} .block {border:1px solid #C6BDA8;margin-bottom:[[setting:blockpadding]];}
.block .header h2 {margin:0;padding-left:0.3em;} .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|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 .header .title .commands {padding-left:0.3em;text-align:right;}
@ -183,7 +185,7 @@ table td.cell p {margin:0;}
/* page-footer */ /* page-footer */
#page-footer {text-align:center;width:100%;padding:0;} #page-footer {text-align:center;width:100%;padding:0;}
.noframefooter {background-color:#FFF;clear: both;float: left;width:100%;} .noframefooter {background-color:#FFF;clear: both;float: left;width:100%;}
#page-footer-content {text-align:center;border:7px #E3DFD4 double;margin:0;padding:0.5em;} #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 .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;background-color:#EFEFEF;padding:0.7em 0 0.8em 0;}

6
theme/formal_white/style/menu.css
View file

@ -103,9 +103,9 @@ div.yui3-menu-content {
.yui3-skin-sam .yui3-menu .yui3-menu { .yui3-skin-sam .yui3-menu .yui3-menu {
border-top:none; border-top:none;
padding-left:-1px; padding-left:-1px;
border-right:1px #CCC solid; border-right:1px solid #CCC;
border-bottom:1px #CCC solid; border-bottom:1px solid #CCC;
border-left:1px #CCC solid; border-left:1px solid #CCC;
} }
/* color of selected item in FF */ /* color of selected item in FF */

2
theme/formal_white/style/pagelayout.css
View file

@ -88,7 +88,7 @@
} }
#page-content .region-content { #page-content .region-content {
padding:0.6em 8px 0.1em 8px; /* definisco lo spazio sopra e sotto ai blocchi */ padding:[[setting:blockpadding]] [[setting:blockpadding]] 0 [[setting:blockpadding]];
} }
.pagelayout-report #page-content .region-content { .pagelayout-report #page-content .region-content {

2
theme/formal_white/style/quiz.css
View file

@ -3,7 +3,7 @@
**********************************************************/ **********************************************************/
#page-mod-quiz-edit div.quizpage .pagecontent {background-color:[[setting:lblockcolumnbgc]];} #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;} .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;}
#page-mod-quiz-edit .questionbankwindow div.header {background-color:transparent;} #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 .title {color:#000;}
#page-mod-quiz-edit .questionbankwindow div.header a:link, #page-mod-quiz-edit .questionbankwindow div.header a:link,

2
theme/formal_white/version.php
View file

@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die; defined('MOODLE_INTERNAL') || die;
$plugin->version = 2012011900; // The current module version (Date: YYYYMMDDXX) $plugin->version = 2012040302; // The current module version (Date: YYYYMMDDXX)
$plugin->requires = 2011081700; // Requires this Moodle version $plugin->requires = 2011081700; // Requires this Moodle version
$plugin->component = 'theme_formal_white'; $plugin->component = 'theme_formal_white';
$plugin->maturity = MATURITY_STABLE; $plugin->maturity = MATURITY_STABLE;