MDL-7861, xhtml strict related changes for glossary

diff --git a/mod/glossary/comments.php b/mod/glossary/comments.php
index fb84530f1fd26e4d9c6b23744ba91a0e91516b3d..6af15e1cb0dbe0cd9a129fe6c57e628ba98820a6 100644 (file)
--- a/mod/glossary/comments.php
+++ b/mod/glossary/comments.php
@@ -49,9 +49,9 @@
 
 /// original glossary entry
 
-    echo "<center>";
+    echo "<div class=\"boxaligncenter\">";
     glossary_print_entry($course, $cm, $glossary, $entry, "", "", false);
-    echo "</center>";
+    echo "</div>";
 
 /// comments
 

diff --git a/mod/glossary/editcategories.html b/mod/glossary/editcategories.html
index fc55d27ac7efdb7f181ad4e4214facfade94f83d..f2b1afc779ee1bde9642d221b27ab2cefb55c8e8 100644 (file)
--- a/mod/glossary/editcategories.html
+++ b/mod/glossary/editcategories.html
@@ -2,8 +2,9 @@
     global $CFG;
     require_once("../../config.php");
 ?>
-<center>
+<div class="boxaligncenter">
 <form id="form" method="post" action="editcategories.php">
+<div>
 <table  class="generalbox" cellpadding="5">
 <tr valign="top">
     <td align="right"><b><?php echo get_string("name") ?>:</b></td>
@@ -42,5 +43,6 @@
 </td>
 </tr>
 </table>
+</div>
 </form>
-</center>
+</div>

diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index abcb642fa83d19b6ebd21131b5919c18ea87627f..ed303861e6cb2f6aeb549b4ba6f73b58eb0b47b4 100644 (file)
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -85,7 +85,7 @@
                 delete_records("glossary_categories","id", $hook);
 
                 print_simple_box_start("center","40%", "#FFBBBB");
-                echo "<center>" . get_string("categorydeleted","glossary") ."</center>";
+                echo "<div style=\"text-align:center\">" . get_string("categorydeleted","glossary") ."</div>";
                 echo "</center>";
                 print_simple_box_end();
                 print_footer($course);
@@ -97,7 +97,7 @@
                 echo "<p align=\"center\">" . get_string("delete"). " " . get_string("category","glossary") . "<font size=\"3\">";
 
                 print_simple_box_start("center","40%", "#FFBBBB");
-                echo "<center><b>".format_text($category->name)."</b><br/>";
+                echo "<div class=\"boxaligncenter\"><b>".format_text($category->name)."</b><br/>";
 
                 $num_entries = count_records("glossary_entries_categories","categoryid",$category->id);
                 if ( $num_entries ) {
@@ -123,7 +123,7 @@
                 $options = array ("id" => $id);
                 print_single_button("editcategories.php", $options, get_string("no") );
                 echo "</td></tr></table>";
-                echo "</center>";
+                echo "</div>";
                 print_simple_box_end();
             }
         }
@@ -136,7 +136,7 @@
                 echo "<p align=\"center\">" . get_string("add"). " " . get_string("category","glossary") . "<font size=\"3\">";
 
                 print_simple_box_start("center","40%", "#FFBBBB");
-                echo "<center>" . get_string("duplicatedcategory","glossary") ."</center>";
+                echo "<div style=\"text-align:center\">" . get_string("duplicatedcategory","glossary") ."</div>";
                 echo "</center>";
                 print_simple_box_end();
 

diff --git a/mod/glossary/exportentry.php b/mod/glossary/exportentry.php
index bc3e0c796271ed191bf964d909398304f94d2b84..d441ce9a1b1006e4b7077c60eb5f977247f9a529 100644 (file)
--- a/mod/glossary/exportentry.php
+++ b/mod/glossary/exportentry.php
@@ -47,12 +47,12 @@
         $entry = get_record('glossary_entries', 'id', $entry);
 
         if ( !$confirm ) {
-            echo '<center>';
+            echo '<div class="boxaligncenter">';
             $areyousure = get_string('areyousureexport','glossary');
-            notice_yesno ('<center><h2>'.format_string($entry->concept).'</h2><p align="center">'.$areyousure.'<br /><b>'.format_string($mainglossary->name).'</b>?',
+            notice_yesno ('<h2>'.format_string($entry->concept).'</h2><p align="center">'.$areyousure.'<br /><b>'.format_string($mainglossary->name).'</b>?',
                 'exportentry.php?id='.$id.'&amp;mode='.$mode.'&amp;hook='.$hook.'&amp;entry='.$entry->id.'&amp;confirm=1',
                 'view.php?id='.$cm->id.'&amp;mode='.$mode.'&amp;hook='.$hook);
-
+            echo '</div>';
         } else {
             if ( ! $mainglossary->allowduplicatedentries ) {
                 $dupentry = get_record('glossary_entries','glossaryid', $mainglossary->id, 'lower(concept)',moodle_strtolower(addslashes($entry->concept)));

diff --git a/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php b/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
index bc5a624fe605dabfeb4bfca79d060bbf0a96ddcb..96886b5bc5713ff32e592a986e8cfe9de1fbac7d 100755 (executable)
--- a/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
+++ b/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
@@ -98,9 +98,9 @@ function glossary_show_entry_TEMPLATE($course, $cm, $glossary, $entry, $mode='',
         echo '</tr>';
         echo "</table>\n";
     } else {    
-        echo '<center>';
+        echo '<div style="text-align:center">';
         print_string('noentry', 'glossary');
-        echo '</center>';
+        echo '</div>';
     }
 
     return $return;

diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
index 70f3f7c5d05ba5127efeb4eff77448b36a997a38..22e4fcd1db837fcda6fd039285c9702112ca03d6 100644 (file)
--- a/mod/glossary/formats/encyclopedia/encyclopedia_format.php
+++ b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
@@ -61,9 +61,9 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
         echo "</table>\n";
         
     } else {
-        echo '<center>';
+        echo '<div style="text-align:center">';
         print_string('noentry', 'glossary');
-        echo '</center>';
+        echo '</div>';
     }
     
     return $return;

diff --git a/mod/glossary/formats/entrylist/entrylist_format.php b/mod/glossary/formats/entrylist/entrylist_format.php
index 97094e55e35b0e79d762e4593a06feec030fc587..011748b93e4a31e577cfe13cd9a2464ea113566a 100644 (file)
--- a/mod/glossary/formats/entrylist/entrylist_format.php
+++ b/mod/glossary/formats/entrylist/entrylist_format.php
@@ -26,9 +26,9 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=''
         }
         echo '<br />';
     } else {
-        echo '<center>';
+        echo '<div style="text-align:center">';
         print_string('noentry', 'glossary');
-        echo '</center>';
+        echo '</div>';
     }
     echo '</td></tr>';
 

diff --git a/mod/glossary/formats/faq/faq_format.php b/mod/glossary/formats/faq/faq_format.php
index eefb5bd7a9b5f4ba3c61e2150138827a76819180..7069ca4d63eaada2f77716b58d4a04a629b84033 100644 (file)
--- a/mod/glossary/formats/faq/faq_format.php
+++ b/mod/glossary/formats/faq/faq_format.php
@@ -38,9 +38,9 @@ function glossary_show_entry_faq($course, $cm, $glossary, $entry, $mode="", $hoo
         echo '</td></tr></table>';
 
     } else {
-        echo '<center>';
+        echo '<div style="text-align:center">';
         print_string('noentry', 'glossary');
-        echo '</center>';
+        echo '</div>';
     }
     return $return;
 }

diff --git a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
index 263085259ea0ef70650f9980b9eac8585bce8962..545069257e69c31be7fea41ee824c2087924bfe4 100644 (file)
--- a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
+++ b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
@@ -52,9 +52,9 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo
         echo '</td></tr>';
         echo "</table>\n";
     } else {
-        echo '<center>';
+        echo '<div style="text-align:center">';
         print_string('noentry', 'glossary');
-        echo '</center>';
+        echo '</div>';
     }
     return $return;
 }

diff --git a/mod/glossary/import.php b/mod/glossary/import.php
index fbc6f9acb2065efc1d24cbbd0e8683b7458dd882..cbedf0b4d3600cd55ae54794394e06a29eccebca 100644 (file)
--- a/mod/glossary/import.php
+++ b/mod/glossary/import.php
@@ -358,10 +358,10 @@
 
         // rejected entries
         if ($rejections) {
-            echo '<center><table border="0" width="70%">';
+            echo '<div class="boxaligncenter"><table border="0" width="70%">';
             echo '<tr><td align="center" colspan="2" width="100%"><strong>' . get_string("rejectionrpt","glossary") . '</strong></tr>';
             echo $rejections;
-            echo '</table></center><p><hr width="75%">';
+            echo '</div></center><p><hr width="75%">';
         }
     } else {
         notify("Error while trying to read the file.");

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 6e825008fdb3dbe73c9c4102d900a11c006f441f..123a31209ab7c0eb26ca372225ba9f3eeadab60c 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1264,7 +1264,7 @@ function glossary_print_tabbed_table_end() {
 
 function glossary_print_approval_menu($cm, $glossary,$mode, $hook, $sortkey = '', $sortorder = '') {
     if ($glossary->showalphabet) {
-        echo '<center>' . get_string("explainalphabet","glossary") . '</center><br />';
+        echo '<div style="text-align:center">' . get_string("explainalphabet","glossary") . '</div><br />';
     }
     glossary_print_special_links($cm, $glossary, $mode, $hook);
 
@@ -1276,21 +1276,21 @@ function glossary_print_approval_menu($cm, $glossary,$mode, $hook, $sortkey = ''
 }
 
 function glossary_print_addentry_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') {
-    echo '<center>' . get_string("explainaddentry","glossary") . '</center><br />';
+    echo '<div style="text-align:center">' . get_string("explainaddentry","glossary") . '</div><br />';
 }
 
 function glossary_print_import_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') {
-    echo '<center>' . get_string("explainimport","glossary") . '</center><br />';
+    echo '<div style="text-align:center">' . get_string("explainimport","glossary") . '</div><br />';
 }
 
 function glossary_print_export_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') {
-    echo '<center>' . get_string("explainexport","glossary") . '</center><br />';
+    echo '<div style="text-align:center">' . get_string("explainexport","glossary") . '</div><br />';
 }
 
 function glossary_print_alphabet_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') {
     if ( $mode != 'date' ) {
         if ($glossary->showalphabet) {
-            echo '<center>' . get_string("explainalphabet","glossary") . '</center><br />';
+            echo '<div style="text-align:center">' . get_string("explainalphabet","glossary") . '</div><br />';
         }
 
         glossary_print_special_links($cm, $glossary, $mode, $hook);
@@ -1305,7 +1305,7 @@ function glossary_print_alphabet_menu($cm, $glossary, $mode, $hook, $sortkey='',
 
 function glossary_print_author_menu($cm, $glossary,$mode, $hook, $sortkey = '', $sortorder = '') {
     if ($glossary->showalphabet) {
-        echo '<center>' . get_string("explainalphabet","glossary") . '</center><br />';
+        echo '<div style="text-align:center">' . get_string("explainalphabet","glossary") . '</div><br />';
     }
 
     glossary_print_sorting_links($cm, $mode, $sortkey,$sortorder);
@@ -1530,7 +1530,7 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) {
     $strby = get_string('writtenby','glossary');
     $fullname = fullname($user, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id)));
 
-    echo '<center>';
+    echo '<div class="boxaligncenter">';
     echo '<table class="glossarycomment" cellspacing="0">';
     echo '<tr valign="top">';
     echo '<tr><td class="left picture">';
@@ -1566,7 +1566,7 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) {
     }
 
     echo '</div></td></tr>';
-    echo '</table></center>';
+    echo '</table></div>';
 
 }
 
@@ -1610,7 +1610,7 @@ function  glossary_print_entry_ratings($course, $entry, $ratings = NULL) {
 function glossary_print_dynaentry($courseid, $entries, $displayformat = -1) {
     global $USER,$CFG;
 
-    echo '<center>';
+    echo '<div class="boxaligncenter">';
     echo '<table class="glossarypopup" cellspacing="0"><tr>';
     echo '<td>';
     if ( $entries ) {
@@ -1653,7 +1653,7 @@ function glossary_print_dynaentry($courseid, $entries, $displayformat = -1) {
         }
     }
     echo '</td>';
-    echo '</tr></table></center>';
+    echo '</tr></table></div>';
 }
 
 function glossary_generate_export_file($glossary, $hook = "", $hook = 0) {
@@ -2002,7 +2002,7 @@ function glossary_get_paging_bar($totalcount, $page, $perpage, $baseurl, $maxpag
 
     //If there are results (more than 1 page)
     if ($totalcount > $perpage) {
-        $code .= "<center>";
+        $code .= "<div style=\"text-align:center\">";
         $code .= "<p>".get_string("page").":";
 
         $maxpage = (int)(($totalcount-1)/$perpage);
@@ -2097,7 +2097,7 @@ function glossary_get_paging_bar($totalcount, $page, $perpage, $baseurl, $maxpag
 
         //End html
         $code .= "</p>";
-        $code .= "</center>";
+        $code .= "</div>";
     }
 
     return $code;

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index e4e6160abc1c868be936f7dd30db7382d89806b2..d5f27abe5fd8c52a1e0706047d47f1e2d4bccc73 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -404,18 +404,18 @@
         }
     }
     if ( !$entriesshown ) {
-        print_simple_box('<center>' . get_string("noentries","glossary") . '</center>',"center","95%");
+        print_simple_box('<div style="text-align:center">' . get_string("noentries","glossary") . '</div>',"center","95%");
     }
 
 
     if ($ratingsmenuused) {
-        echo "<center><input type=\"submit\" value=\"".get_string("sendinratings", "glossary")."\" />";
+        echo "<div class=\"boxaligncenter\"><input type=\"submit\" value=\"".get_string("sendinratings", "glossary")."\" />";
         if ($glossary->scale < 0) {
             if ($scale = get_record("scale", "id", abs($glossary->scale))) {
                 print_scale_menu_helpbutton($course->id, $scale );
             }
         }
-        echo "</center>";
+        echo "</div>";
         echo "</form>";
     }