Index: temp_moodle_dev/moodle/mod/glossary/edit.php =================================================================== diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 --- temp_moodle_dev/moodle/mod/glossary/edit.php (.../edit.php) (revision 5251d2a62e0e78377219456d6bba613eb2d1fd26) +++ temp_moodle_dev/moodle/mod/glossary/edit.php (.../edit.php) (revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6) @@ -190,9 +190,11 @@ $stredit = empty($e) ? get_string('addentry', 'glossary') : get_string("edit"); $navigation = build_navigation($stredit, $cm); + //we pass a new parameter to the function so it won't we printed if is_lams=1 print_header_simple(format_string($glossary->name), "", $navigation, "", - "", true, "", navmenu($course, $cm)); + "", true, "", navmenu($course, $cm),false,'',false,$cm->is_lams); + print_heading(format_string($glossary->name)); /// Info box @@ -214,6 +216,7 @@ ///glossary_print_tabbed_table_end(); -print_footer($course); +//we pass a new parameter to the function so it won't we printed if is_lams=1 +print_footer($course,null, false,$glossary->is_lams); ?> Index: temp_moodle_dev/moodle/mod/glossary/editcategories.php =================================================================== diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 --- temp_moodle_dev/moodle/mod/glossary/editcategories.php (.../editcategories.php) (revision 5251d2a62e0e78377219456d6bba613eb2d1fd26) +++ temp_moodle_dev/moodle/mod/glossary/editcategories.php (.../editcategories.php) (revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6) @@ -53,11 +53,9 @@ $navlinks[] = array('name' => get_string("categories","glossary"), 'link' => '', 'type' => 'title'); $navigation = build_navigation($navlinks); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_header_simple(format_string($glossary->name), "", $navigation,"", "", true, update_module_button($cm->id, $course->id, $strglossary),navmenu($course, $cm),false,'',false,$cm->is_lams); - print_header_simple(format_string($glossary->name), "", $navigation, - "", "", true, update_module_button($cm->id, $course->id, $strglossary), - navmenu($course, $cm)); - if ( $hook >0 ) { if ( $action == "edit" ) { @@ -79,7 +77,8 @@ $name = $category->name; $usedynalink = $category->usedynalink; require "editcategories.html"; - print_footer(); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer(null,null, false,$glossary->is_lams); die; } @@ -92,7 +91,8 @@ echo "
" . get_string("categorydeleted","glossary") ."
"; echo ""; print_simple_box_end(); - print_footer($course); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer($course,null, false,$glossary->is_lams); add_to_log($course->id, "glossary", "delete category", "editcategories.php?id=$cm->id", $hook,$cm->id); @@ -173,7 +173,8 @@ } if ( $action ) { - print_footer(); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer(null,null, false,$glossary->is_lams); die; } @@ -247,4 +248,5 @@ - +is_lams); ?> Index: temp_moodle_dev/moodle/mod/glossary/export.php =================================================================== diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 --- temp_moodle_dev/moodle/mod/glossary/export.php (.../export.php) (revision 5251d2a62e0e78377219456d6bba613eb2d1fd26) +++ temp_moodle_dev/moodle/mod/glossary/export.php (.../export.php) (revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6) @@ -38,9 +38,10 @@ $strexportentries = get_string('exportentries', 'glossary'); $navigation = build_navigation('', $cm); + //we pass a new parameter to the function so it won't we printed if is_lams=1 print_header_simple(format_string($glossary->name), "",$navigation, "", "", true, update_module_button($cm->id, $course->id, $strglossary), - navmenu($course, $cm)); + navmenu($course, $cm),false,'',false,$cm->is_lams); print_heading($strexportentries); @@ -58,5 +59,6 @@ is_lams); ?> Index: temp_moodle_dev/moodle/mod/glossary/import.php =================================================================== diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 --- temp_moodle_dev/moodle/mod/glossary/import.php (.../import.php) (revision 5251d2a62e0e78377219456d6bba613eb2d1fd26) +++ temp_moodle_dev/moodle/mod/glossary/import.php (.../import.php) (revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6) @@ -46,9 +46,10 @@ $strimportentries = get_string('importentriesfromxml', 'glossary'); $navigation = build_navigation($strimportentries, $cm); + //we pass a new parameter to the function so it won't we printed if is_lams=1 print_header_simple(format_string($glossary->name), "", $navigation, "", "", true, update_module_button($cm->id, $course->id, $strglossary), - navmenu($course, $cm)); + navmenu($course, $cm),false,'',false,$cm->is_lams); print_heading($strimportentries); @@ -57,7 +58,8 @@ include("import.html"); print_box_end(); - print_footer($course); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer($course,null, false,$glossary->is_lams);; exit; } @@ -72,7 +74,8 @@ print_continue('import.php?id='.$id); print_box_end(); - print_footer(); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer($course,null, false,$glossary->is_lams); die(); } @@ -135,7 +138,8 @@ notify("Error while trying to create the new glossary."); echo ''; glossary_print_tabbed_table_end(); - print_footer($course); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer($course,null, false,$glossary->is_lams); exit; } else { //The instance has been created, so lets do course_modules @@ -185,7 +189,8 @@ } } else { notify("Error while trying to create the new glossary."); - print_footer($course); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer($course,null, false,$glossary->is_lams); exit; } } @@ -365,6 +370,7 @@ } /// Finish the page - print_footer($course); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer($course,null, false,$glossary->is_lams); ?> Index: temp_moodle_dev/moodle/mod/glossary/print.php =================================================================== diff -u -r5251d2a62e0e78377219456d6bba613eb2d1fd26 -rae465e5a7d3f73c6a9a65042c15fb2915be164e6 --- temp_moodle_dev/moodle/mod/glossary/print.php (.../print.php) (revision 5251d2a62e0e78377219456d6bba613eb2d1fd26) +++ temp_moodle_dev/moodle/mod/glossary/print.php (.../print.php) (revision ae465e5a7d3f73c6a9a65042c15fb2915be164e6) @@ -180,6 +180,6 @@ glossary_print_entry($course, $cm, $glossary, $entry, $mode, $hook,1,$displayformat,false,true); } } - - print_footer('empty'); + //we pass a new parameter to the function so it won't we printed if is_lams=1 + print_footer('empty',null, false,$glossary->is_lams); ?>