]> git.mjollnir.org Git - moodle.git/commitdiff
projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c1ec736)
"MDL-13233, replace the uses of old files to new ones, see tracker"
authordongsheng <dongsheng>
Wed, 7 May 2008 03:08:44 +0000 (03:08 +0000)
committerdongsheng <dongsheng>
Wed, 7 May 2008 03:08:44 +0000 (03:08 +0000)
course/editsection.html patch | blob | history
lang/en_utf8/help/emoticons.html patch | blob | history
lang/en_utf8/help/emoticons2.html patch | blob | history
lang/en_utf8/help/index.html patch | blob | history
lang/en_utf8/help/textformat.html patch | blob | history
lib/javascript.php patch | blob | history
lib/weblib.php patch | blob | history
mod/data/field/textarea/field.class.php patch | blob | history
user/message.html patch | blob | history

diff --git a/course/editsection.html b/course/editsection.html
index 2618a8a92df9d51ec20d00ec2dfddf28039ce960..5a0b808507af227a9d4f8e96e7a642ddc2bfe14d 100644 (file)
--- a/course/editsection.html
+++ b/course/editsection.html
@@ -7,9 +7,9 @@
      <?php helpbutton("summaries", get_string("helpsummaries"), "moodle", true, true);
         echo "<br />";
         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);   
         } 
      ?>
       <br />
diff --git a/lang/en_utf8/help/emoticons.html b/lang/en_utf8/help/emoticons.html
index 3c6babd815fd9a33c392235a787d306eff34c370..db97c4f238854eb8f6ff4293a30e3a5f08da4d62 100644 (file)
--- a/lang/en_utf8/help/emoticons.html
+++ b/lang/en_utf8/help/emoticons.html
@@ -1,5 +1,4 @@
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"></head><body><h1>Using Smilies (emoticons)</h1>
+<h1>Using Smilies (emoticons)</h1>
 
 <table align="center" border="1">
   <tbody><tr valign="top">
@@ -122,4 +121,3 @@
 
 <p>Note that the codes themselves are like little pictures - just turn your head to the left when looking at them</p>
 
-</body></html>
\ No newline at end of file
diff --git a/lang/en_utf8/help/emoticons2.html b/lang/en_utf8/help/emoticons2.html
index e0ccd6e7dd3ca8cfe819da4fda9c1058dc0da43d..1fe259b6b3e2adc735dcaca96681883cdf9df4bd 100644 (file)
--- a/lang/en_utf8/help/emoticons2.html
+++ b/lang/en_utf8/help/emoticons2.html
@@ -1,5 +1,4 @@
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"></head><body><h1>Using Smilies (emoticons)</h1>
+<h1>Using Smilies (emoticons)</h1>
 <div id="emoticons">##emoticons_html##</div>
 <div style="clear: both;"></div>
 
@@ -9,4 +8,3 @@
 <p>To insert these icons in your text: just click the icon above, or type the associated text code directly in your text.</p>
 
 <p>Note that the codes themselves are like little pictures - just turn your head to the left when looking at them</p>
-</body></html>
\ No newline at end of file
diff --git a/lang/en_utf8/help/index.html b/lang/en_utf8/help/index.html
index 18796e0d57a766e26467ebc2561d42c747c4dd3e..8cbfda20e4552f9bcf7ef0de771e111731b2e525 100644 (file)
--- a/lang/en_utf8/help/index.html
+++ b/lang/en_utf8/help/index.html
@@ -77,8 +77,8 @@
   <li><a href="help.php?file=writing.html">Writing</a></li>
   <li><a href="help.php?file=textformat.html">Formatting Text</a></li>
   <li><a href="help.php?file=html.html">Editing HTML format</a></li>
-  <li><a href="help.php?file=text.html">Editing Text format</a></li>
+  <li><a href="help.php?file=text2.html">Editing Text format</a></li>
   <li><a href="help.php?file=markdown.html">Editing Markdown format</a></li>
-  <li><a href="help.php?file=richtext.html">Using the Richtext HTML editor</a></li>
-  <li><a href="help.php?file=emoticons.html">Using Smilies (emoticons)</a></li>
+  <li><a href="help.php?file=richtext2.html">Using the Richtext HTML editor</a></li>
+  <li><a href="help.php?file=emoticons2.html">Using Smilies (emoticons)</a></li>
 </ul>
diff --git a/lang/en_utf8/help/textformat.html b/lang/en_utf8/help/textformat.html
index 34ccdeb3ee6b9ef72405ae7c415db2ec62ebacd8..4d25150eac14c72e83995a6c2460a6bd02eb7f8f 100644 (file)
--- a/lang/en_utf8/help/textformat.html
+++ b/lang/en_utf8/help/textformat.html
@@ -22,7 +22,7 @@
 <p>Your line breaks will be retained, and blank lines will start new paragraphs.</p>
 <p>Smiley characters such as :-) will automatically become their graphical equivalents.</p>
 <p>You can even embed HTML code if you want to and it will be retained.</p>
-<p class="moreinfo"><a href="help.php?file=text.html">More info about Moodle auto-formatting</a></p>
+<p class="moreinfo"><a href="help.php?file=text2.html">More info about Moodle auto-formatting</a></p>
 </ul>
 
 
@@ -38,7 +38,7 @@
 
 <p>Unlike the Moodle auto-format, no automatic formatting is performed.</p>
 <p class="moreinfo"><a href="help.php?file=html.html">More info about HTML in Moodle</a></p>
-<p class="moreinfo"><a href="help.php?file=richtext.html">More info about the Richtext HTML editor</a></p>
+<p class="moreinfo"><a href="help.php?file=richtext2.html">More info about the Richtext HTML editor</a></p>
 </div>
 
 
diff --git a/lib/javascript.php b/lib/javascript.php
index 76afcca6915c3f5b0acb1142634dc9f89476cc82..9b7e6e4064da89d03d535f1517d2f2235031953b 100644 (file)
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -64,9 +64,13 @@ function inserttext(text) {
 <?php
     if (!empty($SESSION->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 39f9a34d367ad1d3c64aa2940e78555a602fafc1..c9ef750e9c6567122b30627d73467c5acfcee32f 100644 (file)
--- 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 = '<img src="' . $CFG->pixpath . '/s/smiley.gif" alt="" class="emoticon" style="margin-left:3px; padding-right:1px;width:15px;height:15px;" />';
-    $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 92183f06a767f3e0c2e13fbfa213c840c461feb8..ebf6360f6f246a3cafa16e7c2148bd526edcd9ea 100755 (executable)
--- 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 .= '<input type="hidden" name="field_' . $this->field->id . '_content1' . '" value="' . FORMAT_HTML . '" />';
 
         } else {
diff --git a/user/message.html b/user/message.html
index ab51aa0da4e737756854075a842d08930877daef..1343c81ae4e9827b6c906d79c9bd9c1b96a8d325 100644 (file)
--- a/user/message.html
+++ b/user/message.html
@@ -22,7 +22,7 @@
         helpbutton("questions", get_string("helpquestions"), "moodle", true, true);
         echo "<br />";
         if ($usehtmleditor) {
-           helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+           helpbutton("richtext2", get_string("helprichtext"), "moodle", true, true);
         } else {
            emoticonhelpbutton("theform", "message");
         }
Unnamed repository; edit this file to name it for gitweb.