Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict...
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 00:13:40 +0000 (12:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 00:13:40 +0000 (12:13 +1200)
1  2 
theme/formal_white/lang/en/theme_formal_white.php
theme/formal_white/layout/frontpage.php
theme/formal_white/layout/general.php
theme/formal_white/settings.php

Simple merge
@@@ -58,12 -50,12 +58,21 @@@ if ($ADMIN->fulltree) 
      $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig);
      $settings->add($setting);
  
 -    $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'));
+     // 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');
 +    $description = get_string('blockcolumnwidthdesc', 'theme_formal_white');
 +    $default = '200';
 +    $choices = array(150=>'150px', 170=>'170px', 200=>'200px', 240=>'240px', 290=>'290px', 350=>'350px', 420=>'420px');
      $setting = new admin_setting_configselect($name, $title, $description, $default, $choices);
      $settings->add($setting);