From 23360b81dd8acd029a8752fc5f18df6e7d1f831e Mon Sep 17 00:00:00 2001 From: dongsheng Date: Wed, 7 May 2008 03:08:44 +0000 Subject: [PATCH] "MDL-13233, replace the uses of old files to new ones, see tracker" --- course/editsection.html | 4 ++-- lang/en_utf8/help/emoticons.html | 4 +--- lang/en_utf8/help/emoticons2.html | 4 +--- lang/en_utf8/help/index.html | 6 +++--- lang/en_utf8/help/textformat.html | 4 ++-- lib/javascript.php | 4 ++++ lib/weblib.php | 2 +- mod/data/field/textarea/field.class.php | 2 +- user/message.html | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/course/editsection.html b/course/editsection.html index 2618a8a92d..5a0b808507 100644 --- a/course/editsection.html +++ b/course/editsection.html @@ -7,9 +7,9 @@ "; if ($usehtmleditor) { - helpbutton("richtext", get_string("helprichtext"), "moodle", true, true); + helpbutton("richtext2", get_string("helprichtext"), "moodle", true, true); } else { - helpbutton("text", get_string("helptext"), "moodle", true, true); + helpbutton("text2", get_string("helptext"), "moodle", true, true); } ?>
diff --git a/lang/en_utf8/help/emoticons.html b/lang/en_utf8/help/emoticons.html index 3c6babd815..db97c4f238 100644 --- a/lang/en_utf8/help/emoticons.html +++ b/lang/en_utf8/help/emoticons.html @@ -1,5 +1,4 @@ - -

Using Smilies (emoticons)

@@ -122,4 +121,3 @@

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 diff --git a/lang/en_utf8/help/emoticons2.html b/lang/en_utf8/help/emoticons2.html index e0ccd6e7dd..1fe259b6b3 100644 --- a/lang/en_utf8/help/emoticons2.html +++ b/lang/en_utf8/help/emoticons2.html @@ -1,5 +1,4 @@ - -

Using Smilies (emoticons)

##emoticons_html##

@@ -9,4 +8,3 @@

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 diff --git a/lang/en_utf8/help/index.html b/lang/en_utf8/help/index.html index 18796e0d57..8cbfda20e4 100644 --- a/lang/en_utf8/help/index.html +++ b/lang/en_utf8/help/index.html @@ -77,8 +77,8 @@

Editing Markdown format

Using the Richtext HTML editor

Using Smilies (emoticons)

Using the Richtext HTML editor

Using Smilies (emoticons)

diff --git a/lang/en_utf8/help/textformat.html b/lang/en_utf8/help/textformat.html index 34ccdeb3ee..4d25150eac 100644 --- a/lang/en_utf8/help/textformat.html +++ b/lang/en_utf8/help/textformat.html @@ -22,7 +22,7 @@

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,7 +38,7 @@

Unlike the Moodle auto-format, no automatic formatting is performed.

More info about HTML in Moodle

More info about the Richtext HTML editor

diff --git a/lib/javascript.php b/lib/javascript.php index 76afcca691..9b7e6e4064 100644 --- a/lib/javascript.php +++ b/lib/javascript.php @@ -64,9 +64,13 @@ function inserttext(text) { 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"; diff --git a/lib/weblib.php b/lib/weblib.php index 39f9a34d36..c9ef750e9c 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -5862,7 +5862,7 @@ function emoticonhelpbutton($form, $field, $return = false) { $SESSION->inserttextform = $form; $SESSION->inserttextfield = $field; $imagetext = '

'; - $help = helpbutton('emoticons', get_string('helpemoticons'), 'moodle', true, true, '', true, $imagetext); + $help = helpbutton('emoticons2', get_string('helpemoticons'), 'moodle', true, true, '', true, $imagetext); if (!$return){ echo $help; } else { diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php index 92183f06a7..ebf6360f6f 100755 --- a/mod/data/field/textarea/field.class.php +++ b/mod/data/field/textarea/field.class.php @@ -49,7 +49,7 @@ class data_field_textarea extends data_field_base { 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 .= helpbutton("richtext2", get_string("helprichtext"), 'moodle', true, true, '', true); $str .= ''; } else { diff --git a/user/message.html b/user/message.html index ab51aa0da4..1343c81ae4 100644 --- a/user/message.html +++ b/user/message.html @@ -22,7 +22,7 @@ helpbutton("questions", get_string("helpquestions"), "moodle", true, true); echo "
"; if ($usehtmleditor) { - helpbutton("richtext", get_string("helprichtext"), "moodle", true, true); + helpbutton("richtext2", get_string("helprichtext"), "moodle", true, true); } else { emoticonhelpbutton("theform", "message"); } -- 2.39.5