| '.$OUTPUT->update_module_button($cm->id, $cm->modname).' | '; if ($PAGE->user_allowed_editing() && !empty($CFG->showblocksonmodpages)) { - $buttons .= '
| '.$OUTPUT->update_module_button($cm->id, $cm->modname).' | '; if ($PAGE->user_allowed_editing() && !empty($CFG->showblocksonmodpages)) { - $buttons .= '
$strareyousuredelete
"; $linkyes = 'deleteentry.php'; diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index a2bfa24269c..4a2dcae7460 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -73,7 +73,6 @@ $PAGE->navbar->add($strglossaries, new moodle_url($CFG->wwwroot.'/mod/glossary/i $PAGE->navbar->add(format_string($glossary->name), new moodle_url($CFG->wwwroot.'/mod/glossary/view.php', array('id'=>$cm->id,'tab'=>'GLOSSARY_CATEGORY_VIEW'))); $PAGE->navbar->add(get_string("categories","glossary")); $PAGE->set_title(format_string($glossary->name)); -$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'glossary')); echo $OUTPUT->header(); if ( $hook >0 ) { diff --git a/mod/glossary/export.php b/mod/glossary/export.php index bb1f46840e5..decac245fb4 100644 --- a/mod/glossary/export.php +++ b/mod/glossary/export.php @@ -52,7 +52,6 @@ $strexportentries = get_string('exportentriestoxml', 'glossary'); $PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/glossary/export.php', array('id'=>$cm->id))); $PAGE->navbar->add($strexportentries); $PAGE->set_title(format_string($glossary->name)); -$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'glossary')); echo $OUTPUT->header(); echo $OUTPUT->heading($strexportentries); diff --git a/mod/glossary/import.php b/mod/glossary/import.php index c93c54a5c01..9080713b45d 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -68,7 +68,6 @@ $strimportentries = get_string('importentriesfromxml', 'glossary'); $PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/glossary/import.php', array('id'=>$cm->id, 'mode'=>$mode, 'hook'=>$hook))); $PAGE->navbar->add($strimportentries); $PAGE->set_title(format_string($glossary->name)); -$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'glossary')); echo $OUTPUT->header(); echo $OUTPUT->heading($strimportentries); diff --git a/mod/glossary/view.php b/mod/glossary/view.php index 1467818fa7f..ca056867f3a 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -230,7 +230,6 @@ $strwaitingapproval = get_string('waitingapproval', 'glossary'); /// If we are in approval mode, prit special header $PAGE->set_title(format_string($glossary->name)); -$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'glossary')); $url = new moodle_url($CFG->wwwroot.'/mod/glossary/view.php', array('id'=>$cm->id)); if (isset($mode)) { $url->param('mode', $mode); diff --git a/mod/imscp/lib.php b/mod/imscp/lib.php index 1ab3519e0d5..25f5173b509 100644 --- a/mod/imscp/lib.php +++ b/mod/imscp/lib.php @@ -373,3 +373,54 @@ function imscp_pluginfile($course, $cminfo, $context, $filearea, $args, $forcedo return false; } } + +/** + * This function extends the global navigaiton for the site. + * It is important to note that you should not rely on PAGE objects within this + * body of code as there is no guarantee that during an AJAX request they are + * available + * + * @param navigation_node $navigation The imscp node within the global navigation + * @param stdClass $course The course object returned from the DB + * @param stdClass $module The module object returned from the DB + * @param stdClass $cm The course module isntance returned from the DB + */ +function imscp_extend_navigation($navigation, $course, $module, $cm) { + /** + * This is currently just a stub so that it can be easily expanded upon. + * When expanding just remove this comment and the line below and then add + * you content. + */ + $navigation->nodetype = navigation_node::NODETYPE_LEAF; +} + +/** + * This function extends the settings navigation block for the site. + * + * It is safe to rely on PAGE here as we will only ever be within the module + * context when this is called. + * + * @param settings_navigation $settings + * @param stdClass $module + */ +function imscp_extend_settings_navigation($settings, $module) { + global $PAGE, $CFG, $DB; + + // Load the imscp instance from the database + $imscp = $DB->get_record('imscp', array('id'=>$PAGE->cm->instance)); + // Add a imscp node to the settings navigation. + $imscpnavkey = $settings->add(get_string('imscpadministration', 'imscp')); + $imscpnav = $settings->get($imscpnavkey); + $imscpnav->forceopen = true; + + // If the user has the capability add an update this module link for the imscp instance + if (has_capability('moodle/course:manageactivities', $PAGE->cm->context)) { + $imscp = new moodle_imscp($CFG->wwwroot.'/course/mod.php', array('update'=>$PAGE->cm->id, 'return'=>true, 'sesskey'=>sesskey())); + $imscpnav->add(get_string('updatethis', '', get_string('modulename', 'imscp')), $imscp); + } + + // Check if any children have been added. If not remove the node to save on clutter. + if (count($imscpnav->children)<1) { + $settings->remove_child($imscpnavkey); + } +} \ No newline at end of file diff --git a/mod/imscp/view.php b/mod/imscp/view.php index 92f57e76860..4cb7f941382 100644 --- a/mod/imscp/view.php +++ b/mod/imscp/view.php @@ -67,7 +67,6 @@ $PAGE->requires->string_for_js('show', 'moodle'); $PAGE->set_title($course->shortname.': '.$imscp->name); $PAGE->set_heading($course->fullname); $PAGE->set_activity_record($imscp); -$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'imscp')); echo $OUTPUT->header(); // verify imsmanifest was parsed properly diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index 90ad679cd3f..e02d9601a9a 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -562,19 +562,14 @@ function lesson_menu_block_contents($cmid, $lesson) { */ function lesson_add_header_buttons($cm, $context, $extraeditbuttons=false, $lessonpageid=null) { global $CFG, $PAGE, $OUTPUT; - if (has_capability('mod/lesson:edit', $context)) { - $buttons = $OUTPUT->update_module_button($cm->id, 'lesson'); - if ($extraeditbuttons) { - if ($lessonpageid === null) { - print_error('invalidpageid', 'lesson'); - } - if (!empty($lessonpageid) && $lessonpageid != LESSON_EOL) { - $options = array('id'=>$cm->id, 'redirect'=>'navigation', 'pageid'=>$lessonpageid); - $buttonform = html_form::make_button($CFG->wwwroot.'/mod/lesson/lesson.php', $options, get_string('editpagecontent', 'lesson')); - $buttons .= $OUTPUT->button($buttonform); - } - $buttons = $OUTPUT->box($buttons, 'edit_buttons'); + if (has_capability('mod/lesson:edit', $context) && $extraeditbuttons) { + if ($lessonpageid === null) { + print_error('invalidpageid', 'lesson'); + } + if (!empty($lessonpageid) && $lessonpageid != LESSON_EOL) { + $options = array('id'=>$cm->id, 'redirect'=>'navigation', 'pageid'=>$lessonpageid); + $buttonform = html_form::make_button($CFG->wwwroot.'/mod/lesson/lesson.php', $options, get_string('editpagecontent', 'lesson')); + $PAGE->set_button($OUTPUT->button($buttonform)); } - $PAGE->set_button($buttons); } } \ No newline at end of file diff --git a/mod/page/lib.php b/mod/page/lib.php index 01fb5a68897..5507f00386c 100644 --- a/mod/page/lib.php +++ b/mod/page/lib.php @@ -378,3 +378,55 @@ function page_pluginfile($course, $cminfo, $context, $filearea, $args, $forcedow // finally send the file send_stored_file($file, 86400, 0, $forcedownload); } + + +/** + * This function extends the global navigaiton for the site. + * It is important to note that you should not rely on PAGE objects within this + * body of code as there is no guarantee that during an AJAX request they are + * available + * + * @param navigation_node $navigation The page node within the global navigation + * @param stdClass $course The course object returned from the DB + * @param stdClass $module The module object returned from the DB + * @param stdClass $cm The course module isntance returned from the DB + */ +function page_extend_navigation($navigation, $course, $module, $cm) { + /** + * This is currently just a stub so that it can be easily expanded upon. + * When expanding just remove this comment and the line below and then add + * you content. + */ + $navigation->nodetype = navigation_node::NODETYPE_LEAF; +} + +/** + * This function extends the settings navigation block for the site. + * + * It is safe to rely on PAGE here as we will only ever be within the module + * context when this is called. + * + * @param settings_navigation $settings + * @param stdClass $module + */ +function page_extend_settings_navigation($settings, $module) { + global $PAGE, $CFG, $DB; + + // Load the page instance from the database + $page = $DB->get_record('page', array('id'=>$PAGE->cm->instance)); + // Add a page node to the settings navigation. + $pagenavkey = $settings->add(get_string('pageadministration', 'page')); + $pagenav = $settings->get($pagenavkey); + $pagenav->forceopen = true; + + // If the user has the capability add an update this module link for the page instance + if (has_capability('moodle/course:manageactivities', $PAGE->cm->context)) { + $url = new moodle_url($CFG->wwwroot.'/course/mod.php', array('update'=>$PAGE->cm->id, 'return'=>true, 'sesskey'=>sesskey())); + $pagenav->add(get_string('updatethis', '', get_string('modulename', 'page')), $url); + } + + // Check if any children have been added. If not remove the node to save on clutter. + if (count($pagenav->children)<1) { + $settings->remove_child($pagenavkey); + } +} \ No newline at end of file diff --git a/mod/page/view.php b/mod/page/view.php index c0fd27976b2..e995639426f 100644 --- a/mod/page/view.php +++ b/mod/page/view.php @@ -70,7 +70,6 @@ if ($inpopup and $page->display == RESOURCELIB_DISPLAY_POPUP) { $PAGE->set_title($course->shortname.': '.$page->name); $PAGE->set_heading($course->fullname); $PAGE->set_activity_record($page); - $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'page')); echo $OUTPUT->header(); if (!empty($options['printheading'])) { diff --git a/mod/quiz/addrandom.php b/mod/quiz/addrandom.php index a1e6db45285..e477a4bf4be 100644 --- a/mod/quiz/addrandom.php +++ b/mod/quiz/addrandom.php @@ -76,13 +76,8 @@ if (! $course = $DB->get_record('course', array('id' => $quiz->course))) { require_capability('mod/quiz:manage', $contexts->lowest()); // Print basic page layout. -$strupdatemodule = ''; -if (has_capability('moodle/course:manageactivities', $contexts->lowest())) { - $strupdatemodule = $OUTPUT->update_module_button($cm->id, 'quiz'); -} $PAGE->navbar->add($streditingquiz); $PAGE->set_title($streditingquiz); -$PAGE->set_button($strupdatemodule); echo $OUTPUT->header(); if (!$quizname = $DB->get_field($cm->modname, 'name', array('id' => $cm->instance))) { diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index 9242b15db4c..1a88d0ebc9f 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -105,7 +105,6 @@ echo $OUTPUT->header(); } else { $PAGE->set_title(format_string($attemptobj->get_quiz_name())); - $PAGE->set_button($attemptobj->update_module_button()); echo $OUTPUT->header(); } echo ''; // for overlib diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php index 7209f507f03..4d8631a4cb2 100644 --- a/mod/quiz/attemptlib.php +++ b/mod/quiz/attemptlib.php @@ -315,21 +315,6 @@ class quiz { } // Bits of content ===================================================================== - /** - * @return string the HTML snipped that needs to be supplied to print_header_simple - * as the $button parameter. - */ - public function update_module_button() { - global $OUTPUT ; - if (has_capability('moodle/course:manageactivities', - get_context_instance(CONTEXT_COURSE, $this->course->id))) { - - - return $OUTPUT->update_module_button($this->cm->id, 'quiz'); - } else { - return ''; - } - } /** * @param string $title the name of this particular quiz page. diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php index 0f98ab10ae3..1b1576ba1bc 100644 --- a/mod/quiz/edit.php +++ b/mod/quiz/edit.php @@ -438,17 +438,13 @@ $questionbank->process_actions($thispageurl, $cm); $questionbankmanagement = ''. get_string('questionbankmanagement', 'quiz').' '; -$strupdatemodule = has_capability('moodle/course:manageactivities', - $contexts->lowest()) ? - $OUTPUT->update_module_button($cm->id, 'quiz') : - ""; $PAGE->navbar->add($pagetitle); $PAGE->requires->skip_link_to('questionbank', get_string('skipto', 'access', get_string('questionbank', 'question'))); $PAGE->requires->skip_link_to('quizcontentsblock', get_string('skipto', 'access', get_string('questionsinthisquiz', 'quiz'))); $PAGE->set_title($pagetitle); -$PAGE->set_button($questionbankmanagement.$strupdatemodule); +$PAGE->set_button($questionbankmanagement); echo $OUTPUT->header(); // Initialise the JavaScript. diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php index 52d6e921de0..dd75cf94774 100644 --- a/mod/quiz/report/default.php +++ b/mod/quiz/report/default.php @@ -28,7 +28,6 @@ class quiz_default_report { $strquiz = get_string("modulename", "quiz"); /// Print the page header $PAGE->set_title(format_string($quiz->name)); - $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'quiz')); echo $OUTPUT->header(); /// Print the tabs $currenttab = 'reports'; diff --git a/mod/quiz/review.php b/mod/quiz/review.php index bbc77a60862..015697d8760 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -99,7 +99,6 @@ } else { $attemptobj->navigation($strreviewtitle); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); - $PAGE->set_button($attemptobj->update_module_button()); echo $OUTPUT->header(); } echo ''; // for overlib diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php index 8780cb38be6..0f918e4ee49 100644 --- a/mod/quiz/summary.php +++ b/mod/quiz/summary.php @@ -59,7 +59,6 @@ if ($accessmanager->securewindow_required($attemptobj->is_preview_user())) { } else { $attemptobj->navigation($title); $PAGE->set_title(format_string($attemptobj->get_quiz_name())); - $PAGE->set_button($attemptobj->update_module_button()); echo $OUTPUT->header(); } diff --git a/mod/quiz/view.php b/mod/quiz/view.php index 14ac628a6ce..7cd5df7e9ea 100644 --- a/mod/quiz/view.php +++ b/mod/quiz/view.php @@ -72,18 +72,17 @@ // The code will be much nicer than this eventually. $title = $course->shortname . ': ' . format_string($quiz->name); - $buttons = '| '.$OUTPUT->update_module_button($cm->id, $cm->modname).' | '; if ($PAGE->user_allowed_editing() && !empty($CFG->showblocksonmodpages)) { - $buttons .= '