Changes for XHTML compatibility and other HTML code cleanup

diff --git a/mod/glossary/edit.html b/mod/glossary/edit.html
index b0bfe621343be2278181f471604df9dfd741c138..f5ede3a9658886fce5146a6b118e104671d0b659 100644 (file)
--- a/mod/glossary/edit.html
+++ b/mod/glossary/edit.html
@@ -16,15 +16,15 @@ if (isset($errors)) {
   <tr>
     <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(clean_text($newentry->concept)) ?>" /></td>
+          <td width="150" align="right"><b><?php echo get_string("concept","glossary") ?>:</b></td>
+          <td><input type="text" name="concept" size="30" value="<?php p(clean_text($newentry->concept)) ?>" alt="<?php print_string("concept","glossary") ?>" /></td>
         </tr>
         <tr>
-          <td align="right"><p><b><?php echo get_string("categories","glossary") ?>:</b></p></td>
+          <td align="right"><b><?php echo get_string("categories","glossary") ?>:</b></td>
           <td valign="top">
     <?php
         $categories = get_records("glossary_categories","glossaryid",$glossary->id,'name ASC');
-        echo "<select size=\"5\" name=\"categories[]\" multiple=\"yes\" />";
+        echo "<select size=\"5\" name=\"categories[]\" multiple=\"multiple\" >";
         echo "<option value=\"0\">" . get_string("notcategorised","glossary") . "</option>";
 
         if ( $categories ) {
@@ -45,12 +45,12 @@ if (isset($errors)) {
       </table></td>
     <td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="5">
         <tr>
-          <td valign="top" align="right"><p><b>
+          <td valign="top" align="right"><b>
             <?php
               echo get_string("aliases","glossary");
               echo ':<br />';
               helpbutton("aliases", strip_tags(get_string("aliases", "glossary")), "glossary");
-            ?></b></p>
+            ?></b>
           </td>
           <td valign="top">
              <textarea rows="2" name="aliases" cols="20"><?php p(clean_text($newentry->aliases)) ?></textarea>
@@ -71,7 +71,7 @@ if (isset($errors)) {
         } else {
             $selected = "";
         }
-        echo '<input type="checkbox" name="usedynalink" value="1" ' . $selected . ' onclick="return lockoptions(\'form\',\'usedynalink\', items)" /> ';
+        echo '<input type="checkbox" name="usedynalink" value="1" alt="' . get_string("entryusedynalink","glossary") . '" ' . $selected . ' onclick="return lockoptions(\'form\',\'usedynalink\', items)" /> ';
         echo '<font size="-1">';
         print_string("entryusedynalink","glossary");
         echo '</font>';
@@ -83,7 +83,7 @@ if (isset($errors)) {
         } else {
             $selected = "";
         }
-        echo '<input type="checkbox" name="casesensitive" value="1" ' . $selected . ' /> ';
+        echo '<input type="checkbox" name="casesensitive" value="1" alt="' . get_string("casesensitive","glossary") . '" ' . $selected . ' /> ';
         echo '<font size="-1">';
         print_string("casesensitive","glossary");
         echo '</font>';
@@ -96,7 +96,7 @@ if (isset($errors)) {
         } else {
             $selected = "";
         }
-        echo '<input type="checkbox" name="fullmatch" value="1" ' . $selected . ' /> ';
+        echo '<input type="checkbox" name="fullmatch" value="1" alt="' . get_string("fullmatch","glossary") . '" ' . $selected . ' /> ';
         echo '<font size="-1">';
         print_string("fullmatch","glossary");
         echo '</font>';
@@ -112,9 +112,9 @@ if (isset($errors)) {
 </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b>
+    <td align="right"><b>
      <?php print_string("definition", "glossary"); ?>:
-     </b></p></td>
+     </b></td>
     <td align="left" rowspan="2">
     <?php print_textarea($usehtmleditor, 25, 65, 630, 400, "text", $newentry->definition); ?>
     </td>
@@ -138,7 +138,7 @@ if (isset($errors)) {
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("formattexttype"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("formattexttype"); ?>:</b></td>
     <td>
     <?php
         if ($usehtmleditor) {   /// Trying this out for a while
@@ -156,12 +156,13 @@ if (isset($errors)) {
 </tr>
 
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("attachment", "glossary") ?>:<br />(<?php print_string("optional") ?>)&nbsp;</b></p></td>
+    <td align="right"><b><?php print_string("attachment", "glossary") ?>:<br />(<?php print_string("optional") ?>)&nbsp;</b></td>
     <td>
     <?php
        require_once($CFG->dirroot.'/lib/uploadlib.php');
        upload_print_form_fragment(1,array('attachment'),null,false,null,$course->maxbytes,0,false);
        helpbutton("attachment", get_string("attachment", "glossary"), "glossary");
+       echo '&nbsp;';
        print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes)));
     ?>
     </td>
@@ -181,7 +182,7 @@ if (isset($errors)) {
   <input type="hidden" name="id" value="<?php p($cm->id) ?>" />
   <input type="hidden" name="mode" value="<?php p($mode) ?>" />
   <input type="hidden" name="hook" value="<?php p($hook) ?>" />
-  <input type="hidden" name="confirm" value="1">
+  <input type="hidden" name="confirm" value="1" />
 
   <input type="submit" value="<?php print_string("savechanges") ?>" />
   <input type="reset" value="<?php print_string("revert") ?>" />

diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php
index 56dbbe7acca36b5be96030610ff3ff0efff69d7a..8dd69c7971e4309923d1cb6c9c762670a194e5fa 100644 (file)
--- a/mod/glossary/edit.php
+++ b/mod/glossary/edit.php
@@ -303,11 +303,14 @@ if ( (!$ineditperiod  || $USER->id != $newentry->userid) and !isteacher($course-
 /// Info box
 
     if ( $glossary->intro ) {
-        print_simple_box_start('center','70%');
+        echo '<table align="center" width="70%" border="0">';
+        echo '<tr><td align="center" class="glossaryintrobox">';
         echo format_text($glossary->intro);
         print_simple_box_end();
     }
 
+    echo '<br />';
+
 /// Tabbed browsing sections
 $tab = GLOSSARY_ADDENTRY_VIEW;
 include("tabs.html");

diff --git a/mod/glossary/export.php b/mod/glossary/export.php
index 6eb7895be56c7dd0eb9a36285d7526c7a78240fc..6b904e0e9815d9510b416db5e0aee2ae9dd52740 100644 (file)
--- a/mod/glossary/export.php
+++ b/mod/glossary/export.php
@@ -52,9 +52,12 @@
 /// Info box
 
     if ( $glossary->intro ) {
-        print_simple_box_start('center','70%');
+        echo '<table align="center" width="70%" border="0">';
+        echo '<tr><td align="center" class="glossaryintrobox">';
         echo format_text($glossary->intro);
         print_simple_box_end();
+
+        echo '<br />';
     }
 
 /// Tabbed browsing sections
@@ -72,5 +75,9 @@
     } else {
         $ffurl = "../../file.php?file=$ffurl";
     }
-    echo '<p><center><a href="' . $ffurl . '" target="_blank">' . get_string("exportedfile","glossary") .  '</a></center><p>'
+    echo '<p align="center"><a href="' . $ffurl . '" target="_blank">' . get_string("exportedfile","glossary") .  '</a></p>';
+    
+    echo '</center>';
+    glossary_print_tabbed_table_end();
+    print_footer();
 ?>

diff --git a/mod/glossary/filter.php b/mod/glossary/filter.php
index 77882c8e0babde04210e9097ed8f5565bb4c1242..e6b961ff6128f8891456bad13310ea8cf650f055 100644 (file)
--- a/mod/glossary/filter.php
+++ b/mod/glossary/filter.php
@@ -43,7 +43,7 @@
             $categories  = get_records_select("glossary_categories", "glossaryid IN ($glossaries) AND usedynalink != 0", "$cbylenght glossaryid","id,glossaryid, name $as concept, 1 $as casesensitive,$GLOSSARY_CONCEPT_IS_CATEGORY $as category, 1 $as fullmatch");
             if ( $entries and $categories ) {
                 $concepts = array_merge($entries, $categories);
-                usort($concepts,'glossary_sort_entries_by_lenght');
+                usort($concepts,'glossary_sort_entries_by_length');
             } elseif ( $categories ) {
                 $concepts = $categories;
             } elseif ( $entries ) {
@@ -108,6 +108,10 @@
                 }
             }
         }
+        /// <nolink> tags removed for XHTML compatibility
+        $text = str_replace('<nolink>', '', $text);
+        $text = str_replace('</nolink>', '', $text);
+
         return $text;
     }
     
@@ -197,7 +201,7 @@
         return $text;
     }
     
-    function glossary_sort_entries_by_lenght ( $entry0, $entry1 ) {
+    function glossary_sort_entries_by_length ( $entry0, $entry1 ) {
         if ( strlen(trim($entry0->concept)) < strlen(trim($entry1->concept)) ) {
             return 1;
         } elseif ( strlen(trim($entry0->concept)) > strlen(trim($entry1->concept)) ) {

diff --git a/mod/glossary/formats/continuous/continuous_format.php b/mod/glossary/formats/continuous/continuous_format.php
index 403b3ae4a7adae534f53eba5382fb1c3c6c6c958..72a53cefbbb9fe5566d60c9d0349ee9f1a2eb232 100644 (file)
--- a/mod/glossary/formats/continuous/continuous_format.php
+++ b/mod/glossary/formats/continuous/continuous_format.php
@@ -6,8 +6,8 @@ function glossary_show_entry_continuous($course, $cm, $glossary, $entry, $mode="
 
     $colour = $THEME->cellheading2;
 
-    echo "\n<table border=\"0\" width=\"95%\" cellspacing=\"0\" valign=\"top\" cellpadding=\"0\" align=\"center\">\n";
-    echo "<tr>\n";
+    echo "\n<table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"0\" align=\"center\">\n";
+    echo "<tr valign=\"top\">\n";
     echo "<td width=\"100%\" valign=\"top\"\n";
     glossary_print_entry_approval($cm, $entry, $mode);
     glossary_print_entry_attachment($entry,"html","right");

diff --git a/mod/glossary/formats/dictionary/dictionary_format.php b/mod/glossary/formats/dictionary/dictionary_format.php
index 1ce0b08035020a0136661943b3b2fe12472406f1..8281f7e55edbb36607554edba35e7dcae38d85b1 100644 (file)
--- a/mod/glossary/formats/dictionary/dictionary_format.php
+++ b/mod/glossary/formats/dictionary/dictionary_format.php
@@ -6,8 +6,8 @@ function glossary_show_entry_dictionary($course, $cm, $glossary, $entry, $mode="
 
     $colour = $THEME->cellheading2;
 
-    echo "\n<table border=\"0\" width=\"95%\" cellspacing=\"0\" valign=\"top\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">\n";
-    echo "<tr>\n";
+    echo "\n<table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">\n";
+    echo "<tr valign=\"top\">\n";
     echo "<td width=\"100%\" valign=\"top\" bgcolor=\"#FFFFFF\">\n";
     glossary_print_entry_approval($cm, $entry, $mode);
     glossary_print_entry_attachment($entry,"html","right");

diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
index 68e464e311eb4fee175e5290a087aa957a65b70e..ec59171608b040673114312c84e5bab48546c7ca 100644 (file)
--- a/mod/glossary/formats/encyclopedia/encyclopedia_format.php
+++ b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
@@ -8,9 +8,9 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
     $user = get_record("user", "id", $entry->userid);
     $strby = get_string("writtenby", "glossary");
 
-    echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" valign=\"top\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
+    echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
 
-    echo "\n<tr>";
+    echo "\n<tr valign=\"top\">";
     echo "\n<td bgcolor=\"$colour\" width=\"35\" valign=\"top\" class=\"forumpostpicture\">";
     $return = false;
     if ($entry) {

diff --git a/mod/glossary/formats/entrylist/entrylist_format.php b/mod/glossary/formats/entrylist/entrylist_format.php
index 40a3e640f380e4295b4250af19a77c66a421717d..7317f49ae1ebc3523d1d93df45d72d2ba87e9166 100644 (file)
--- a/mod/glossary/formats/entrylist/entrylist_format.php
+++ b/mod/glossary/formats/entrylist/entrylist_format.php
@@ -6,9 +6,9 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=""
     $colour = "#FFFFFF";
     $return = false;
 
-    echo "\n<table border=\"0\" cellspacing=\"0\" width=\"95%\" valign=\"top\" cellpadding=\"10\">";
+    echo "\n<table border=\"0\" cellspacing=\"0\" width=\"95%\" cellpadding=\"10\">";
 
-    echo "\n<tr>";
+    echo "\n<tr valign=\"top\">";
     echo "<td width=\"100%\" bgcolor=\"$colour\">";
     if ($entry) {
         glossary_print_entry_approval($cm, $entry, $mode);
@@ -42,8 +42,8 @@ function glossary_print_entry_entrylist($course, $cm, $glossary, $entry, $mode="
     //Take out autolinking in definitions un print view
     $entry->definition = '<nolink>'.$entry->definition.'</nolink>';
 
-    echo "\n<table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>\n";
-    echo "<tr>\n";
+    echo "\n<table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">\n";
+    echo "<tr valign=\"top\">\n";
     echo "<td width=\"100%\" valign=\"top\" bgcolor=\"#FFFFFF\">\n";
     echo "<b>";
     glossary_print_entry_concept($entry);

diff --git a/mod/glossary/formats/faq/faq_format.php b/mod/glossary/formats/faq/faq_format.php
index 2f1332cea00cc634f8c92c9cd0ccd3dd71cafb6c..4e0fc5d36bc181c76474cffa7abb9803147092c7 100644 (file)
--- a/mod/glossary/formats/faq/faq_format.php
+++ b/mod/glossary/formats/faq/faq_format.php
@@ -6,9 +6,9 @@ function glossary_show_entry_faq($course, $cm, $glossary, $entry, $mode="", $hoo
     if ( $entry ) {
         $colour = $THEME->cellheading2;
 
-        echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" valign=\"top\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
+        echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
 
-        echo '<tr>';
+        echo '<tr valign=\"top\">';
         echo "<td valign=\"top\" width=\"100%\" bgcolor=\"$colour\">";
         $entry->course = $course->id;
 

diff --git a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
index a1e25ad868f248cdf6293b7569b3d1462be51a12..e49276c745b674a07ace397dd99dae22f86d8ef2 100644 (file)
--- a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
+++ b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
@@ -8,9 +8,9 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo
     $user = get_record("user", "id", $entry->userid);
     $strby = get_string("writtenby", "glossary");
 
-    echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" valign=\"top\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
+    echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
 
-    echo "\n<tr>";
+    echo "\n<tr valign=\"top\">";
     echo "\n<td bgcolor=\"$colour\" width=\"35\" valign=\"top\" class=\"forumpostpicture\">";
     $return = false;
     if ($entry) {
@@ -35,7 +35,7 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo
 
         echo "</tr>";
 
-        echo "\n<tr>";
+        echo "\n<tr valign=\"top\">";
         echo "\n<td bgcolor=\"$colour\" width=\"35\" valign=\"top\" class=\"forumpostside\">&nbsp;</td>";
         echo "\n<td width=\"100%\" colspan=\"2\" bgcolor=\"$THEME->cellcontent\" class=\"forumpostmessage\">";
 

diff --git a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
index c8efaa7a5fa27e1ebf16742dcaa9d7cb273c566c..043e8ed1774bfb402170f6f8ddab19dbdd159a3f 100644 (file)
--- a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
+++ b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
@@ -5,9 +5,9 @@ function glossary_show_entry_fullwithoutauthor($course, $cm, $glossary, $entry,
 
     $colour = $THEME->cellheading2;
 
-    echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" valign=\"top\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
+    echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
 
-    echo "\n<tr>";
+    echo "\n<tr valign=\"top\">";
     $return = false;
     if ($entry) {
 
@@ -28,7 +28,7 @@ function glossary_show_entry_fullwithoutauthor($course, $cm, $glossary, $entry,
 
         echo "</tr>";
 
-        echo "\n<tr>";
+        echo "\n<tr valign=\"top\">";
         echo "\n<td width=\"100%\" colspan=\"2\" bgcolor=\"$THEME->cellcontent\" class=\"forumpostmessage\">";
 
         glossary_print_entry_definition($entry);

diff --git a/mod/glossary/import.html b/mod/glossary/import.html
index d1b90e4086349634a4d691437606473ebea8d86a..8c9204f9e3ef4789b6e05ba807ee11b56ebc55be 100644 (file)
--- a/mod/glossary/import.html
+++ b/mod/glossary/import.html
@@ -1,12 +1,13 @@
-<form method="POST" action="import.php" name="form" enctype="multipart/form-data">
+<form method="post" action="import.php" name="form" enctype="multipart/form-data">
 <table border="0" cellpadding="3" cellspacing="3" width="100%">
 <tr>
-    <td align="right" valign="top" width="30%"><p><b><?php print_string("filetoimport","glossary") ?>:</b></p></td>
+    <td align="right" valign="top" width="30%"><b><?php print_string("filetoimport","glossary") ?>:</b></td>
     <td width="70%">
     <?php 
        require_once($CFG->dirroot.'/lib/uploadlib.php');
        upload_print_form_fragment(1,array('file'),null,false,null,0,0);
        helpbutton("filetoimport", get_string("filetoimport", "glossary"), "glossary"); 
+       echo '&nbsp;';
        print_string("maxsize", "", display_size(get_max_upload_file_size())); 
     ?>
     </td>
@@ -15,15 +16,13 @@
     <td align="right" colspan="2">
     <table border="0" cellpadding="0" cellspacing="3" width="100%">
       <tr>
-        <td width="25%">
-        <p align="right"><?php p(get_string("destination","glossary")) ?>:</td>
+        <td width="25%" align="right"><?php print_string("destination","glossary") ?>:</td>
         <td width="25%"><select size="1" name="dest">
-        <option selected="selected" value="current"><?php p(get_string("currentglossary","glossary")) ?></option>
-        <option value="new"><?php p(get_string("newglossary","glossary")) ?></option>
+        <option selected="selected" value="current"><?php print_string("currentglossary","glossary") ?></option>
+        <option value="new"><?php print_string("newglossary","glossary") ?></option>
         </select> <?php helpbutton("destination", get_string("destination", "glossary"), "glossary") ?></td>
-        <td width="25%">
-        <p align="right"><?php p(get_string("importcategories","glossary")) ?>:</td>
-        <td width="25%"><input type="checkbox" name="catsincl" value="1" /> <?php helpbutton("importcategories", get_string("importcategories", "glossary"), "glossary") ?></td>
+        <td width="25%" align="right"><?php print_string("importcategories","glossary") ?>:</td>
+        <td width="25%"><input type="checkbox" name="catsincl" value="1" alt="<?php print_string("importcategories","glossary") ?>" /> <?php helpbutton("importcategories", get_string("importcategories", "glossary"), "glossary") ?></td>
       </tr>
     </table>
     </td>
@@ -32,8 +31,7 @@
     <td align="right" colspan="2">
     <table border="0" cellpadding="3" cellspacing="3" width="100%">
       <tr>
-        <td width="50%">
-        <p align="right"><input type="submit" value="<?php print_string("savechanges") ?>" /></td>
+        <td width="50%" align="right"><input type="submit" value="<?php print_string("savechanges") ?>" /></td>
         <td width="50%"><input type="reset" value="<?php print_string("revert") ?>" /></td>
       </tr>
     </table>

diff --git a/mod/glossary/import.php b/mod/glossary/import.php
index 8f8a42753ad8ffc88419d76843cc493e4631de4f..261eceafe2f2b1e37c4ddab4a1d9b0da8be099a6 100644 (file)
--- a/mod/glossary/import.php
+++ b/mod/glossary/import.php
@@ -55,9 +55,11 @@
 /// Info box
 
     if ( $glossary->intro ) {
-        print_simple_box_start('center','70%');
+        echo '<table align="center" width="70%" border="0">';
+        echo '<tr><td align="center" class="glossaryintrobox">';
         echo format_text($glossary->intro);
         print_simple_box_end();
+        echo '<br />';
     }
 
 /// Tabbed browsing sections
@@ -67,6 +69,7 @@
     if ( !$step ) {
         include("import.html");        
 
+        echo '</center>';
         glossary_print_tabbed_table_end();
         print_footer($course);
         exit;
@@ -79,6 +82,8 @@
     $um = new upload_manager('file',false,false,$course,false,0);
 
     if (!$um->preprocess_files()) {
+        echo '</center>';
+        glossary_print_tabbed_table_end();
         print_continue('import.php?id='.$id);
         print_footer();
         die();
@@ -146,6 +151,7 @@
                 // Include new glossary and return the new ID
                 if ( !$glossary->id = glossary_add_instance($glossary) ) {
                     notify("Error while trying to create the new glossary.");
+                    echo '</center>';
                     glossary_print_tabbed_table_end();
                     print_footer($course);
                     exit;
@@ -196,6 +202,7 @@
                 }
             } else {
                 notify("Error while trying to create the new glossary.");
+                echo '</center>';
                 glossary_print_tabbed_table_end();
                 print_footer($course);
                 exit;

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 63ee834cdcf9edbbb57fd81c41f887c7f4db835a..6ee7ab232db48a003325cbecd6ad6dedc144ef3b 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -799,7 +799,7 @@ function  glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $m
         echo '<table border="0" width="100%" align="center">';
         if ( $aliases ) {
             echo '<tr><td align="center"  valign="top"><font size="1">' .
-                  get_string("aliases","glossary") . ': ' . $aliases . '</td></tr>';
+                  get_string("aliases","glossary") . ': ' . $aliases . '</font></td></tr>';
         }
         if ($icons) {
             echo '<tr><td align="right" valign="top">'.  $icons . '</td></tr>';
@@ -1175,7 +1175,6 @@ $currentrow           = ( $currenttab - ( $currenttab % $tabsperrow) ) / $tabspe
 $numrows              = (int) ( $tabs / $tabsperrow ) + 1;
 
 ?>
-  <center>
   <table border="0" cellpadding="0" cellspacing="0" width="<?php p($tablewidth) ?>">
     <tr>
       <td width="100%">

diff --git a/mod/glossary/tabs.html b/mod/glossary/tabs.html
index d16fd524de9cc68a96a61e04eed09fc6b09b8948..fe02bec494b77ef2cd6c37cde175d1e5ddb14580 100644 (file)
--- a/mod/glossary/tabs.html
+++ b/mod/glossary/tabs.html
@@ -63,12 +63,12 @@
     }
 
 /// printing header of the current tab
-//    echo '<center>';
     glossary_print_tabbed_table_start($data, $tab, $glossary_tCFG);
  
     if (!isset($category)) {
         $category = "";
     }
+
     
     switch ($tab) {
         case GLOSSARY_CATEGORY_VIEW:

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 1ab77b0b3278006ef6b26e883ed45598e22211e6..4b3c2e307134b179535b84c5e3c0e938d803ea48 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -245,37 +245,37 @@
     }
     echo '</b></font></p>';
 
+
 /// Info box
     if ( $glossary->intro ) {
-        echo '<table align="center" width="70%" bgcolor="#FFFFFF" class="generaltab"><tr><td>';
+        echo '<table align="center" width="70%" border="0">';
+        echo '<tr><td align="center" class="glossaryintrobox">';
         echo format_text($glossary->intro);
         print_simple_box_end();
     }
 
 /// Search box
-    echo '<br />';
 
     echo '<form method="post" action="view.php">';
 
-    echo '<table align="center" width="70%" bgcolor="' . $THEME->cellheading .'" class="generalbox"><tr><td align="center">';
+    echo '<table align="center" width="70%" border="0">';
+    echo '<tr><td align="center" class="glossarysearchbox">';
     
-    echo '<p align="center">';
     echo '<input type="submit" value="'.$strsearch.'" name="searchbutton" /> ';
     if ($mode == 'search') {
-        echo '<input type="text" name="hook" size="20" value="'.$hook.'" /> ';
+        echo '<input type="text" name="hook" size="20" value="'.$hook.'" alt="'.$strsearch.'" /> ';
     } else {
-        echo '<input type="text" name="hook" size="20" value="" /> ';
+        echo '<input type="text" name="hook" size="20" value="" alt="'.$strsearch.'" /> ';
     }
     if ($fullsearch) {
         $fullsearchchecked = 'checked="checked"';
     } else {
         $fullsearchchecked = '';
     }
-    echo '<input type="checkbox" name="fullsearch" value="1" '.$fullsearchchecked.' />';
+    echo '<input type="checkbox" name="fullsearch" value="1" '.$fullsearchchecked.' alt="'.$strsearchindefinition.'" />';
     echo '<input type="hidden" name="mode" value="search" />';
     echo '<input type="hidden" name="id" value="'.$cm->id.'" />';
     echo $strsearchindefinition;
-    echo '</p>';
     print_simple_box_end();    
     
     echo '</form>';
@@ -331,7 +331,7 @@
                 if ( $printpivot )  {
                     $currentpivot = strtoupper($pivot);
 
-                    echo '<p>';
+                    echo '<div>';
                     echo '<table width="95%" border="0" class="generaltabselected" bgcolor="' . $THEME->cellheading2 . '">';
 
                     echo '<tr>';
@@ -348,7 +348,7 @@
                     }
 
                     echo "<strong> $pivottoshow</strong>" ;
-                    echo '</td></tr></table>';
+                    echo '</td></tr></table></div>';
 
                 }
             }