mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution

Browse Source
This commit is contained in:
Sam Hemelryk 2011-08-29 12:13:40 +12:00
commit 1924a86afa
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
theme/formal_white/lang/en/theme_formal_white.php
View File

@ -56,7 +56,12 @@ $string['choosereadme'] = '
<p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.
</div>
</div>';
$string['creditstomoodleorg'] = 'Display credits to moodle.org';
$string['creditstomoodleorgdesc'] = 'Display the usual small moodle logo at the bottom of the page';
$string['configtitle'] = 'Formal white theme';
$string['ctmo_no'] = 'never'; // ctmo == credits to moodle org
$string['ctmo_onfrontpageonly'] = 'in the front page only'; // ctmo == credits to moodle org
$string['ctmo_ineverypage'] = 'in every page'; // ctmo == credits to moodle org
$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';

6
theme/formal_white/layout/frontpage.php
View File

@ -202,8 +202,10 @@ if ($hasfooter) {
} ?>
<div class="moodledocsleft">
<?php
//echo $OUTPUT->login_info();
//echo $OUTPUT->home_link();
echo $OUTPUT->login_info();
if ($PAGE->theme->settings->creditstomoodleorg) {
echo $OUTPUT->home_link();
}
echo $OUTPUT->standard_footer_html();
?>
</div>

23
theme/formal_white/layout/general.php
View File

@ -198,14 +198,29 @@ if ($hasfooter) {
} ?>
<div class="moodledocsleft">
<?php
//echo $OUTPUT->login_info();
echo $OUTPUT->login_info();
//echo $OUTPUT->home_link();
?>
<div class="moodledocs">
<?php echo page_doc_link(get_string('moodledocslink')); ?>
</div>
<?php
if ($PAGE->theme->settings->creditstomoodleorg == 2) {
// can not use $OUTPUT->home_link() here because whether $OUTPUT->page->pagetype != 'site-index'
// the output of the function is not the classic nice moodle logo $this->pix_url('moodlelogo')
?>
<div class="sitelink">
<a title="Moodle" href="http://moodle.org/">
<img style="width:100px;height:30px" src="<?php echo $this->pix_url('moodlelogo') ?>" alt="moodlelogo" />
</a>
</div>
<?php
}
?>
<?php
echo $OUTPUT->standard_footer_html();
?>
</div>
<div class="moodledocs">
<?php echo page_doc_link(get_string('moodledocslink')); ?>
</div>
</div> <!-- end of page-footer or page-footer_noframe -->
<?php //the waiting div has been closed
}

9
theme/formal_white/settings.php
View File

@ -58,6 +58,15 @@ if ($ADMIN->fulltree) {
$setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig);
$settings->add($setting);
// creditstomoodleorg: ctmo
$name = 'theme_formal_white/creditstomoodleorg';
$title = get_string('creditstomoodleorg','theme_formal_white');
$description = get_string('creditstomoodleorgdesc', 'theme_formal_white');
$default = '2';
$choices = array(2 => get_string('ctmo_ineverypage', 'theme_formal_white'), 1 => get_string('ctmo_onfrontpageonly', 'theme_formal_white'), 0 => get_string('ctmo_no', 'theme_formal_white'));
$setting = new admin_setting_configselect($name, $title, $description, $default, $choices);
$settings->add($setting);
// Block region width
$name = 'theme_formal_white/blockcolumnwidth';
$title = get_string('blockcolumnwidth','theme_formal_white');