From: toyomoyo Date: Fri, 12 Jan 2007 06:57:33 +0000 (+0000) Subject: MDL-7861, xhtml strict related changes for glossary X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=36a2b6bdc3e6a57e92b3bd294b4e7e45b25fea0c;p=moodle.git MDL-7861, xhtml strict related changes for glossary --- diff --git a/mod/glossary/comments.php b/mod/glossary/comments.php index fb84530f1f..6af15e1cb0 100644 --- a/mod/glossary/comments.php +++ b/mod/glossary/comments.php @@ -49,9 +49,9 @@ /// original glossary entry - echo "
"; + echo "
"; glossary_print_entry($course, $cm, $glossary, $entry, "", "", false); - echo "
"; + echo ""; /// comments diff --git a/mod/glossary/editcategories.html b/mod/glossary/editcategories.html index fc55d27ac7..f2b1afc779 100644 --- a/mod/glossary/editcategories.html +++ b/mod/glossary/editcategories.html @@ -2,8 +2,9 @@ global $CFG; require_once("../../config.php"); ?> -
+
+
@@ -42,5 +43,6 @@
:
+
-
+ diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index abcb642fa8..ed303861e6 100644 --- 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 "
" . get_string("categorydeleted","glossary") ."
"; + echo "
" . get_string("categorydeleted","glossary") ."
"; echo ""; print_simple_box_end(); print_footer($course); @@ -97,7 +97,7 @@ echo "

" . get_string("delete"). " " . get_string("category","glossary") . ""; print_simple_box_start("center","40%", "#FFBBBB"); - echo "

".format_text($category->name)."
"; + echo "
".format_text($category->name)."
"; $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 ""; - echo "
"; + echo ""; print_simple_box_end(); } } @@ -136,7 +136,7 @@ echo "

" . get_string("add"). " " . get_string("category","glossary") . ""; print_simple_box_start("center","40%", "#FFBBBB"); - echo "

" . get_string("duplicatedcategory","glossary") ."
"; + echo "
" . get_string("duplicatedcategory","glossary") ."
"; echo ""; print_simple_box_end(); diff --git a/mod/glossary/exportentry.php b/mod/glossary/exportentry.php index bc3e0c7962..d441ce9a1b 100644 --- a/mod/glossary/exportentry.php +++ b/mod/glossary/exportentry.php @@ -47,12 +47,12 @@ $entry = get_record('glossary_entries', 'id', $entry); if ( !$confirm ) { - echo '
'; + echo '
'; $areyousure = get_string('areyousureexport','glossary'); - notice_yesno ('

'.format_string($entry->concept).'

'.$areyousure.'
'.format_string($mainglossary->name).'?', + notice_yesno ('

'.format_string($entry->concept).'

'.$areyousure.'
'.format_string($mainglossary->name).'?', 'exportentry.php?id='.$id.'&mode='.$mode.'&hook='.$hook.'&entry='.$entry->id.'&confirm=1', 'view.php?id='.$cm->id.'&mode='.$mode.'&hook='.$hook); - + echo '

'; } 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 bc5a624fe6..96886b5bc5 100755 --- 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 ''; echo "\n"; } else { - echo '
'; + echo '
'; print_string('noentry', 'glossary'); - echo '
'; + echo ''; } return $return; diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php index 70f3f7c5d0..22e4fcd1db 100644 --- 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 "\n"; } else { - echo '
'; + echo '
'; print_string('noentry', 'glossary'); - echo '
'; + echo ''; } return $return; diff --git a/mod/glossary/formats/entrylist/entrylist_format.php b/mod/glossary/formats/entrylist/entrylist_format.php index 97094e55e3..011748b93e 100644 --- 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 '
'; } else { - echo '
'; + echo '
'; print_string('noentry', 'glossary'); - echo '
'; + echo ''; } echo ''; diff --git a/mod/glossary/formats/faq/faq_format.php b/mod/glossary/formats/faq/faq_format.php index eefb5bd7a9..7069ca4d63 100644 --- 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 ''; } else { - echo '
'; + echo '
'; print_string('noentry', 'glossary'); - echo '
'; + echo ''; } return $return; } diff --git a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php index 263085259e..545069257e 100644 --- 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 ''; echo "\n"; } else { - echo '
'; + echo '
'; print_string('noentry', 'glossary'); - echo '
'; + echo ''; } return $return; } diff --git a/mod/glossary/import.php b/mod/glossary/import.php index fbc6f9acb2..cbedf0b4d3 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -358,10 +358,10 @@ // rejected entries if ($rejections) { - echo '
'; + echo '
'; echo ''; echo $rejections; - echo '
' . get_string("rejectionrpt","glossary") . '

'; + echo '

'; } } else { notify("Error while trying to read the file."); diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 6e825008fd..123a31209a 100644 --- 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 '
' . get_string("explainalphabet","glossary") . '

'; + echo '
' . get_string("explainalphabet","glossary") . '

'; } 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 '
' . get_string("explainaddentry","glossary") . '

'; + echo '
' . get_string("explainaddentry","glossary") . '

'; } function glossary_print_import_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') { - echo '
' . get_string("explainimport","glossary") . '

'; + echo '
' . get_string("explainimport","glossary") . '

'; } function glossary_print_export_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') { - echo '
' . get_string("explainexport","glossary") . '

'; + echo '
' . get_string("explainexport","glossary") . '

'; } function glossary_print_alphabet_menu($cm, $glossary, $mode, $hook, $sortkey='', $sortorder = '') { if ( $mode != 'date' ) { if ($glossary->showalphabet) { - echo '
' . get_string("explainalphabet","glossary") . '

'; + echo '
' . get_string("explainalphabet","glossary") . '

'; } 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 '
' . get_string("explainalphabet","glossary") . '

'; + echo '
' . get_string("explainalphabet","glossary") . '

'; } 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 '
'; + echo '
'; echo ''; echo ''; echo ''; - echo '
'; @@ -1566,7 +1566,7 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) { } echo '
'; + echo ''; } @@ -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 '
'; + echo '
'; echo ''; echo ''; - echo '
'; if ( $entries ) { @@ -1653,7 +1653,7 @@ function glossary_print_dynaentry($courseid, $entries, $displayformat = -1) { } } echo '
'; + echo ''; } 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 .= "
"; + $code .= "
"; $code .= "

".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 .= "

"; - $code .= "
"; + $code .= ""; } return $code; diff --git a/mod/glossary/view.php b/mod/glossary/view.php index e4e6160abc..d5f27abe5f 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -404,18 +404,18 @@ } } if ( !$entriesshown ) { - print_simple_box('
' . get_string("noentries","glossary") . '
',"center","95%"); + print_simple_box('
' . get_string("noentries","glossary") . '
',"center","95%"); } if ($ratingsmenuused) { - echo "
"; + echo "
"; if ($glossary->scale < 0) { if ($scale = get_record("scale", "id", abs($glossary->scale))) { print_scale_menu_helpbutton($course->id, $scale ); } } - echo "
"; + echo ""; echo ""; }