More changes for XHTML compatibility

diff --git a/mod/glossary/mod.html b/mod/glossary/mod.html
index ae849a2fa640d2c49f5441ab713cdbbb573a85c3..73571b2a3e333080a24e0f5173177b2c38cca5d4 100644 (file)
--- a/mod/glossary/mod.html
+++ b/mod/glossary/mod.html
@@ -70,13 +70,13 @@ if (!isset($form->assesstimefinish)) {
 <center>
 <table cellpadding="5">
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("name") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php print_string("name") ?>:</b></td>
+    <td align="left">
         <input type="text" name="name" size="30" value="<?php p($form->name) ?>" />
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("description") ?>:</b></p>
+    <td align="right"><b><?php print_string("description") ?>:</b><br />
      <font size="1">
      <?php
         helpbutton("description", get_string("description"), "glossary", true, true);
@@ -88,13 +88,13 @@ if (!isset($form->assesstimefinish)) {
      <br />
      </font>
     </td>
-    <td>
+    <td align="left">
         <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("entbypage", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("entbypage", "glossary") ?>:</b></td>
+    <td align="left">
                <input name="entbypage" type="text" size="2" value="<?php p($form->entbypage) ?>" /> <?php helpbutton("entbypage", get_string("entbypage", "glossary"), "glossary") ?>
     </td>
 </tr>
@@ -104,8 +104,8 @@ if (!isset($form->assesstimefinish)) {
 if (isadmin() ) {
 ?>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("isglobal", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("isglobal", "glossary") ?>:</b></td>
+    <td align="left">
 <?php
     $selected = "";
     if ( isset($form->globalglossary) ) {
@@ -127,8 +127,8 @@ $mainglossary = get_record("glossary","mainglossary",1,"course",$form->course);
 if (!$mainglossary or $mainglossary->id == $form->instance ) {
 ?>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("glossarytype", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("glossarytype", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="mainglossary">
   <option value="1" <?php
    if ( $form->mainglossary ) {
@@ -151,9 +151,9 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
 }
 ?>
 <tr valign="top">
-    <td align="right"><p><b><?php p(get_string("studentcanpost", "glossary")) ?>:</b><br />
-    <font size="1"><?php p(get_string("warningstudentcapost","glossary")) ?></font></p></td>
-    <td>
+    <td align="right"><b><?php p(get_string("studentcanpost", "glossary")) ?>:</b><br />
+    <font size="1"><?php p(get_string("warningstudentcapost","glossary")) ?></font></td>
+    <td align="left">
   <select size="1" name="studentcanpost">
   <option value="1" <?php
    if ( $form->studentcanpost ) {
@@ -170,8 +170,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("allowduplicatedentries", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("allowduplicatedentries", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="allowduplicatedentries">
   <option value="1" <?php
    if ( $form->allowduplicatedentries ) {
@@ -189,8 +189,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("allowcomments", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("allowcomments", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="allowcomments">
   <option value="1" <?php
    if ( $form->allowcomments ) {
@@ -208,8 +208,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("usedynalink", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("usedynalink", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="usedynalink">
   <option value="1" <?php
    if ( $form->usedynalink ) {
@@ -227,8 +227,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("defaultapproval", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("defaultapproval", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="defaultapproval">
   <option value="1" <?php
    if ( $form->defaultapproval ) {
@@ -250,8 +250,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
 </tr>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("displayformat", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("displayformat", "glossary") ?>:</b></td>
+    <td align="left">
     <?php
         //get and update available formats
         $recformats = glossary_get_available_formats();
@@ -277,8 +277,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("showspecial", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("showspecial", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="showspecial">
   <option value="1" <?php
    if ( $form->showspecial ) {
@@ -296,8 +296,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("showalphabet", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("showalphabet", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="showalphabet">
   <option value="1" <?php
    if ( $form->showalphabet ) {
@@ -315,8 +315,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("showall", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("showall", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="showall">
   <option value="1" <?php
    if ( $form->showall ) {
@@ -334,8 +334,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php echo get_string("editalways", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right"><b><?php echo get_string("editalways", "glossary") ?>:</b></td>
+    <td align="left">
   <select size="1" name="editalways">
   <option value="1" <?php
    if ( $form->editalways ) {
@@ -357,8 +357,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     if (isset($CFG->enablerssfeeds) && isset($CFG->glossary_enablerssfeeds) &&
         $CFG->enablerssfeeds && $CFG->glossary_enablerssfeeds) {
         echo "<tr valign=\"top\">";
-        echo "<td align=\"right\"><p><b>".get_string("rsstype").":</b></p></td>";
-        echo "<td>";
+        echo "<td align=\"right\"><b>".get_string("rsstype").":</b></td>";
+        echo "<td align=\"left\">";
         unset($choices);
         $choices[0] = get_string("none");
         $choices[1] = get_string("withauthor", "glossary");
@@ -369,8 +369,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
         echo "</tr>";
 
         echo "<tr valign=\"top\">";
-        echo "<td align=\"right\"><p><b>".get_string("rssarticles").":</b></p></td>";
-        echo "<td>";
+        echo "<td align=\"right\"><b>".get_string("rssarticles").":</b></td>";
+        echo "<td align=\"left\">";
         unset($choices);
         $choices[0] = "0";
         $choices[1] = "1";
@@ -392,8 +392,8 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
     }
 ?>
 <tr>
-    <td align="right" valign="top"><p><b><?php print_string("allowratings", "glossary") ?>:</b></p></td>
-    <td>
+    <td align="right" valign="top"><b><?php print_string("allowratings", "glossary") ?>:</b></td>
+    <td align="left">
         <?php 
             echo "<script type=\"text/javascript\">";
             echo "  var subitemstime = ['startday','startmonth','startyear','starthour', 'startminute',".
@@ -415,13 +415,20 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
             unset($options);
             $options[2] = get_string("ratingonlyteachers", "glossary", moodle_strtolower($course->teachers));
             $options[1] = get_string("ratingeveryone", "glossary");
+            
+            echo "\n\n<table cellpadding=\"5\" align=\"left\">";
+            echo "<tr><td align=\"right\" nowrap=\"nowrap\">";
             echo get_string("users").":";
+            echo "</td><td align=\"left\" nowrap=\"nowrap\">";
             choose_from_menu($options, "assessed", $form->assessed, "");
-            echo "<br />";
-
+            echo "</td></tr>";
+            echo "<tr><td align=\"right\" nowrap=\"nowrap\">";
             echo get_string("grade").":";
+            echo "</td><td align=\"left\" nowrap=\"nowrap\">";
             print_grade_menu($course->id, "scale", $form->scale, false);
-            echo "<br />";
+            echo "</td></tr></table>\n\n";
+
+            echo "<br clear=\"all\" />";
 
             echo "<input name=\"ratingtime\" type=\"checkbox\" value=\"1\" ";
             echo " onclick=\"return lockoptions('form','ratingtime', subitemstime)\" ";
@@ -432,16 +439,20 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
             echo " />";
 
             print_string("ratingtime", "glossary");
-            echo "<table align=\"left\"><tr><td align=\"right\" nowrap=\"nowrap\">";
+
+            echo "<table cellpadding=\"5\" align=\"left\"><tr><td align=\"right\" nowrap=\"nowrap\">";
             echo get_string("from").":";
+            echo "</td><td align=\"left\" nowrap=\"nowrap\">";
             print_date_selector("startday", "startmonth", "startyear", $form->assesstimestart);
             print_time_selector("starthour", "startminute", $form->assesstimestart);
-            echo "<br />";
+            echo "</td></tr>";
+            echo "<tr><td align=\"right\" nowrap=\"nowrap\">";
             echo get_string("to").":";
+            echo "</td><td align=\"left\" nowrap=\"nowrap\">";
             print_date_selector("finishday", "finishmonth", "finishyear", $form->assesstimefinish);
             print_time_selector("finishhour", "finishminute", $form->assesstimefinish);
-            echo "<br />";
             echo "</td></tr></table>";
+            
             echo "<input type=\"hidden\" name=\"hratingtime\" value=\"0\" />";
             echo "<input type=\"hidden\" name=\"hassessed\" value=\"0\" />";
             echo "<input type=\"hidden\" name=\"hscale\" value=\"0\" />";

diff --git a/mod/glossary/tabs.html b/mod/glossary/tabs.html
index 75fd1a5824954eb49b76166493b45f67a13ff6cd..73911f0b831b1320f9765c200cb0d6c67f0a2d59 100644 (file)
--- a/mod/glossary/tabs.html
+++ b/mod/glossary/tabs.html
@@ -62,7 +62,7 @@
     }
 
 /// printing header of the current tab
-    echo '<center>';
+//    echo '<center>';
     glossary_print_tabbed_table_start($data, $tab, $glossary_tCFG);
  
     if (!isset($category)) {

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 783f8848e3b09514c22cd0b14e7ecbb3ea7e587d..24999275658c75c59a8217998442ed0478ef90f8 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -259,10 +259,12 @@
 
 /// Search box
 //    echo '<p>';
+
+    echo '<form method="post" action="view.php">';
+
     echo '<table align="center" width="70%" bgcolor="' . $THEME->cellheading .'" class="generalbox"><tr><td align="center">';
     
     echo '<p align="center">';
-    echo '<form method="POST" action="view.php">';
     echo '<input type="submit" value="'.$strsearch.'" name="searchbutton" /> ';
     if ($mode == 'search') {
         echo '<input type="text" name="hook" size="20" value="'.$hook.'" /> ';
@@ -278,9 +280,10 @@
     echo '<input type="hidden" name="mode" value="search" />';
     echo '<input type="hidden" name="id" value="'.$cm->id.'" />';
     echo $strsearchindefinition;
-    echo '</form>';
     echo '</p>';
     print_simple_box_end();    
+    
+    echo '</form>';
 
     include("tabs.html");