L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-16676 All references to the text.html and emoticons.html files need to be updated to point to text2.html and emoticons2.html

Browse Source
This commit is contained in:
tjhunt
2008-09-25 07:12:46 +00:00
parent 9971cc0ce1
commit 80f69dc0ee
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/uploaduser_form.php
+1 -1
View File
@@ -212,7 +212,7 @@ class admin_uploaduser_form2 extends moodleform {
$mform->addElement('htmleditor', 'description', get_string('userdescription'));
$mform->setType('description', PARAM_CLEAN);
$mform->setHelpButton('description', array('text', get_string('helptext')));
$mform->setHelpButton('description', array('text2', get_string('helptext')));
$mform->setAdvanced('description');
$mform->addElement('text', 'url', get_string('webpage'), 'maxlength="255" size="50"');
course/edit_form.php
+1 -1
View File
@@ -100,7 +100,7 @@ class course_edit_form extends moodleform {
$mform->setType('idnumber', PARAM_RAW);
$mform->addElement('htmleditor','summary', get_string('summary'), array('rows'=> '10', 'cols'=>'65'));
$mform->setHelpButton('summary', array('text', get_string('helptext')), true);
$mform->setHelpButton('summary', array('text2', get_string('helptext')), true);
$mform->setType('summary', PARAM_RAW);
$courseformats = get_list_of_plugins('course/format');
course/request_form.php
+1 -1
View File
@@ -17,7 +17,7 @@ class course_request_form extends moodleform {
$mform->addElement('htmleditor', 'summary', get_string('summary'), array('rows'=>'15', 'cols'=>'50'));
$mform->addRule('summary', get_string('missingsummary'), 'required', null, 'client');
$mform->setType('summary', PARAM_RAW);
$mform->setHelpButton('summary', array('text', get_string('helptext')));
$mform->setHelpButton('summary', array('text2', get_string('helptext')));
$mform->addElement('textarea', 'reason', get_string('courserequestreason'), array('rows'=>'15', 'cols'=>'50'));
lib/form/editorhelp.php
+3 -3
View File
@@ -16,13 +16,13 @@ for ($i=1; ; $i++){
$topics[$i] = helplink('questions', get_string('helpquestions'));
break;
case 'emoticons' :
$topics[$i] = helplink('emoticons', get_string('helpemoticons'));
$topics[$i] = helplink('emoticons2', get_string('helpemoticons'));
break;
case 'richtext' :
$topics[$i] = helplink('richtext', get_string('helprichtext'));
$topics[$i] = helplink('richtext2', get_string('helprichtext'));
break;
case 'text' :
$topics[$i] = helplink('text', get_string('helptext'));
$topics[$i] = helplink('text2', get_string('helptext'));
break;
default :
print_error('unknownhelp', '', '', $item);
lib/form/htmleditor.php
+2 -2
View File
@@ -47,11 +47,11 @@ class MoodleQuickForm_htmleditor extends MoodleQuickForm_textarea{
function setHelpButton($helpbuttonargs, $function='helpbutton'){
if (!$this->_canUseHtmlEditor){
if ('editorhelpbutton' == $function){
$key = array_search('richtext', $helpbuttonargs);
$key = array_search('richtext2', $helpbuttonargs);
if ($key !== FALSE){
array_splice($helpbuttonargs, $key, 1, array('text', 'emoticons'));
}
} elseif ('helpbutton' == $function && $helpbuttonargs[0] == 'richtext' && ((!isset($helpbuttonargs[2])) || $helpbuttonargs[2] == 'moodle')){
} elseif ('helpbutton' == $function && $helpbuttonargs[0] == 'richtext2' && ((!isset($helpbuttonargs[2])) || $helpbuttonargs[2] == 'moodle')){
//replace single 'richtext' help button with text and emoticon button when htmleditor off.
return $this->setHelpButton(array('text', 'emoticons'), 'editorhelpbutton');
}
user/editlib.php
+1 -1
View File
@@ -230,7 +230,7 @@ function useredit_shared_definition(&$mform) {
$mform->addElement('htmleditor', 'description', get_string('userdescription'));
$mform->setType('description', PARAM_CLEAN);
$mform->setHelpButton('description', array('text', get_string('helptext')));
$mform->setHelpButton('description', array('text2', get_string('helptext')));
if (!empty($CFG->gdversion)) {
$mform->addElement('header', 'moodle_picture', get_string('pictureof'));//TODO: Accessibility fix fieldset legend
user/profile/definelib.php
+1 -1
View File
@@ -32,7 +32,7 @@ class profile_define_base {
$form->setType('name', PARAM_MULTILANG);
$form->addElement('htmleditor', 'description', get_string('profiledescription', 'admin'));
$form->setHelpButton('description', array('text', get_string('helptext')));
$form->setHelpButton('description', array('text2', get_string('helptext')));
$form->addElement('selectyesno', 'required', get_string('profilerequired', 'admin'));