***************
*** 122,125 ****
Note that the codes themselves are like little pictures - just turn your head to the left when looking at them
-
\ No newline at end of file
--- 121,123 ----
Index: lang/en_utf8/help/emoticons2.html
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/emoticons2.html,v
retrieving revision 1.1
diff -c -r1.1 emoticons2.html
*** lang/en_utf8/help/emoticons2.html 5 May 2008 13:31:11 -0000 1.1
--- lang/en_utf8/help/emoticons2.html 6 May 2008 03:59:53 -0000
***************
*** 1,5 ****
!
! Using Smilies (emoticons)
##emoticons_html##
--- 1,4 ----
! Using Smilies (emoticons)
##emoticons_html##
***************
*** 9,12 ****
To insert these icons in your text: just click the icon above, or type the associated text code directly in your text.
Note that the codes themselves are like little pictures - just turn your head to the left when looking at them
-
\ No newline at end of file
--- 8,10 ----
Index: lang/en_utf8/help/index.html
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/index.html,v
retrieving revision 1.10
diff -c -r1.10 index.html
*** lang/en_utf8/help/index.html 16 Aug 2007 10:26:09 -0000 1.10
--- lang/en_utf8/help/index.html 6 May 2008 03:59:53 -0000
***************
*** 77,84 ****
Writing
Formatting Text
Editing HTML format
! Editing Text format
Editing Markdown format
! Using the Richtext HTML editor
! Using Smilies (emoticons)
--- 77,84 ----
Writing
Formatting Text
Editing HTML format
! Editing Text format
Editing Markdown format
! Using the Richtext HTML editor
! Using Smilies (emoticons)
Index: lang/en_utf8/help/textformat.html
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/textformat.html,v
retrieving revision 1.4
diff -c -r1.4 textformat.html
*** lang/en_utf8/help/textformat.html 16 Aug 2007 10:25:52 -0000 1.4
--- lang/en_utf8/help/textformat.html 6 May 2008 03:59:53 -0000
***************
*** 22,28 ****
Your line breaks will be retained, and blank lines will start new paragraphs.
Smiley characters such as :-) will automatically become their graphical equivalents.
You can even embed HTML code if you want to and it will be retained.
! More info about Moodle auto-formatting
--- 22,28 ----
Your line breaks will be retained, and blank lines will start new paragraphs.
Smiley characters such as :-) will automatically become their graphical equivalents.
You can even embed HTML code if you want to and it will be retained.
! More info about Moodle auto-formatting
***************
*** 38,44 ****
Unlike the Moodle auto-format, no automatic formatting is performed.
More info about HTML in Moodle
! More info about the Richtext HTML editor
--- 38,44 ----
Unlike the Moodle auto-format, no automatic formatting is performed.
More info about HTML in Moodle
! More info about the Richtext HTML editor
Index: lib/javascript.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/javascript.php,v
retrieving revision 1.38
diff -c -r1.38 javascript.php
*** lib/javascript.php 2 May 2008 02:45:18 -0000 1.38
--- lib/javascript.php 6 May 2008 03:59:54 -0000
***************
*** 64,72 ****
--- 64,76 ----
inserttextform)) {
$insertfield = "opener.document.forms['$SESSION->inserttextform'].$SESSION->inserttextfield";
+ echo " if(!opener.document.forms['$SESSION->inserttextform']){";
} else {
$insertfield = "opener.document.forms['theform'].message";
+ echo " if(!opener.document.forms['theform']){";
}
+ echo " return;";
+ echo " }";
echo " text = ' ' + text + ' ';\n";
echo " if ( $insertfield.createTextRange && $insertfield.caretPos) {\n";
echo " var caretPos = $insertfield.caretPos;\n";
Index: lib/weblib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v
retrieving revision 1.1066
diff -c -r1.1066 weblib.php
*** lib/weblib.php 2 May 2008 16:11:30 -0000 1.1066
--- lib/weblib.php 6 May 2008 03:59:57 -0000
***************
*** 5862,5868 ****
$SESSION->inserttextform = $form;
$SESSION->inserttextfield = $field;
$imagetext = '
';
! $help = helpbutton('emoticons', get_string('helpemoticons'), 'moodle', true, true, '', true, $imagetext);
if (!$return){
echo $help;
} else {
--- 5862,5868 ----
$SESSION->inserttextform = $form;
$SESSION->inserttextfield = $field;
$imagetext = '';
! $help = helpbutton('emoticons2', get_string('helpemoticons'), 'moodle', true, true, '', true, $imagetext);
if (!$return){
echo $help;
} else {
Index: mod/data/field/textarea/field.class.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/data/field/textarea/field.class.php,v
retrieving revision 1.19
diff -c -r1.19 field.class.php
*** mod/data/field/textarea/field.class.php 26 Feb 2007 06:56:09 -0000 1.19
--- mod/data/field/textarea/field.class.php 6 May 2008 03:59:59 -0000
***************
*** 49,55 ****
if (can_use_richtext_editor()) {
// Show a rich text html editor.
$str .= $this->gen_textarea(true, $text);
! $str .= helpbutton("richtext", get_string("helprichtext"), 'moodle', true, true, '', true);
$str .= '';
} else {
--- 49,55 ----
if (can_use_richtext_editor()) {
// Show a rich text html editor.
$str .= $this->gen_textarea(true, $text);
! $str .= helpbutton("richtext2", get_string("helprichtext"), 'moodle', true, true, '', true);
$str .= '';
} else {
Index: user/message.html
===================================================================
RCS file: /cvsroot/moodle/moodle/user/message.html,v
retrieving revision 1.7
diff -c -r1.7 message.html
*** user/message.html 18 Jun 2007 19:21:24 -0000 1.7
--- user/message.html 6 May 2008 04:00:00 -0000
***************
*** 22,28 ****
helpbutton("questions", get_string("helpquestions"), "moodle", true, true);
echo "
";
if ($usehtmleditor) {
! helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
} else {
emoticonhelpbutton("theform", "message");
}
--- 22,28 ----
helpbutton("questions", get_string("helpquestions"), "moodle", true, true);
echo "
";
if ($usehtmleditor) {
! helpbutton("richtext2", get_string("helprichtext"), "moodle", true, true);
} else {
emoticonhelpbutton("theform", "message");
}