Solved some inconsistencies when using the HTML editor and the

format menu!!

Merged from MOODLE_14_STABLE

diff --git a/mod/glossary/edit.html b/mod/glossary/edit.html
index f3aa2812a4fcc5d9a5526f57cc233acdf49a4560..90ebba9c5ffe6c07125e20c541100fdbe0f448b8 100644 (file)
--- a/mod/glossary/edit.html
+++ b/mod/glossary/edit.html
@@ -1,6 +1,5 @@
-<center>
-<form name="form" method="post" <?php p($onsubmit) ?> action="edit.php" enctype="multipart/form-data">
-<table class=generalbox cellpadding=5 bgcolor="<?php p($THEME->cellheading)?>">
+<form name="form" method="post" action="edit.php" enctype="multipart/form-data">
+<table border="0" cellpadding="5">
 <?php
 if (isset($errors)) {
 ?>
@@ -15,7 +14,7 @@ if (isset($errors)) {
 <td colspan=2>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tr>
-    <td valign="top"><table border="0" width="100%" border="0" cellspacing="0" cellpadding="5">
+    <td valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="5">
         <tr>
           <td width="150" align=right><p><b><?php echo get_string("concept","glossary") ?>:</b></p></td>
           <td><input type="text" name="concept" size=30 value="<?php p($newentry->concept) ?>"></td>
@@ -111,38 +110,50 @@ if (isset($errors)) {
 </table>
 </td>
 </tr>
+<tr valign="top">
+    <td align=right><p><b>
+     <?php print_string("definition", "glossary"); ?>:
+     </b></p></td>
+    <td align="left" rowspan="2">
+    <?php print_textarea($usehtmleditor, 25, 65, 630, 400, "text", $newentry->definition); ?>
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right" valign="center" nowrap>
 
-<tr valign=top>
-    <td align=right><p><b><?php echo get_string("definition","glossary") ?>:</b></p>
-    <font size="1">
+    <font SIZE="1">
      <?php
         helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
         echo "<br />";
         if ($usehtmleditor) {
            helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
         } else {
-           emoticonhelpbutton("form", "description");
+           emoticonhelpbutton("form", "text");
         }
       ?>
-      <br />
-    </font>
+     <br />
+     </font>
+
     </td>
+</tr>
+<tr valign=top>
+    <td align=right><p><b><?php print_string("formattexttype"); ?>:</b></p></td>
     <td>
     <?php
-       print_textarea($usehtmleditor, 20, 60, 680, 400, "text", $newentry->definition);
-
-       echo "<p align=right>";
-       helpbutton("textformat", get_string("helpformatting"));
-       print_string("formattexttype");
-       echo ":&nbsp;";
-       if (!isset($newentry->format)) {
-           $newentry->format = $defaultformat;
-       }
-       choose_from_menu(format_text_menu(), "format", $newentry->format, "");
-       echo "</p>";
-    ?>
+        if ($usehtmleditor) {   /// Trying this out for a while
+            print_string('formathtml');
+            echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'">';
+        } else {
+            if (!isset($newentry->format)) {
+                $newentry->format = $defaultformat;
+            }
+            choose_from_menu(format_text_menu(), "format", $newentry->format, "");
+        }
+        helpbutton("textformat", get_string("helpformatting"));
+     ?>
     </td>
 </tr>
+
 <tr valign=top>
     <td align=right><p><b><?php print_string("attachment", "glossary") ?>:<br />(<?php print_string("optional") ?>)&nbsp;</b></p></td>
     <td>
@@ -177,8 +188,4 @@ if (isset($errors)) {
 </td>
 </tr>
 </table>
-</center>
-
-
 </form>
-

diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php
index 4287ed300e1b3fc3468cc9acb89a62cca6964004..532d19d684ef59acc8b5e78008d7b4e3a7f1d2e5 100644 (file)
--- a/mod/glossary/edit.php
+++ b/mod/glossary/edit.php
@@ -66,10 +66,8 @@ if ( $confirm ) {
 
         if ($usehtmleditor = can_use_richtext_editor()) {
             $defaultformat = FORMAT_HTML;
-            $onsubmit = "onsubmit=\"copyrichtext(form.text);\"";
         } else {
             $defaultformat = FORMAT_MOODLE;
-            $onsubmit = "";
         }
 
         print_header_simple(strip_tags("$glossary->name"), "",
@@ -240,10 +238,8 @@ $stredit = get_string("edit");
 
 if ($usehtmleditor = can_use_richtext_editor()) {
     $defaultformat = FORMAT_HTML;
-    $onsubmit = "onsubmit=\"copyrichtext(form.text);\"";
 } else {
     $defaultformat = FORMAT_MOODLE;
-    $onsubmit = "";
 }
 
 print_header_simple(strip_tags("$glossary->name"), "",