mod MDL-21169 Removed update this module button and ensured there was…

… a link in the settings block for it.
NoelDeMartin · Dec 23, 2009 · 92059c7 · 92059c7
1 parent 0a1f8f8
commit 92059c7
Show file tree

Hide file tree

Showing 53 changed files with 228 additions and 92 deletions.
diff --git a/lang/en_utf8/folder.php b/lang/en_utf8/folder.php
@@ -2,6 +2,7 @@
 
 $string['contentheader'] = 'Content';
 $string['foldercontent'] = 'Files and subfolders';
+$string['folderadministration'] = 'Folder administration';
 $string['modulename'] = 'Folder';
 $string['modulenameplural'] = 'Folders';
 $string['neverseen'] = 'Never seen';
diff --git a/lang/en_utf8/imscp.php b/lang/en_utf8/imscp.php
@@ -6,6 +6,7 @@
 $string['deploymenterror'] = 'Content package error!';
 $string['keepold'] = 'Archive packages';
 $string['keepoldexplain'] = 'How many packages should be archived?';
+$string['imscpadministration'] = 'IMSCP Administration';
 $string['modulename'] = 'IMS Content Package';
 $string['modulenameplural'] = 'IMS Content packages';
 $string['navigation'] = 'Navigation';

diff --git a/lang/en_utf8/page.php b/lang/en_utf8/page.php
@@ -13,6 +13,7 @@
 $string['legacyfilesdone'] = 'Finished';
 $string['modulename'] = 'Page';
 $string['modulenameplural'] = 'Pages';
+$string['pageadministration'] = 'Page administration';
 $string['popupheight'] = 'Popup height (in pixels)';
 $string['popupheightexplain'] = 'Specifies default height of popup windows.';
 $string['popupwidth'] = 'Popup width (in pixels)';

diff --git a/lang/en_utf8/url.php b/lang/en_utf8/url.php
@@ -33,3 +33,4 @@
 $string['printintro'] = 'Display URL description';
 $string['printintroexplain'] = 'Display URL description bellow content? Some display types may not display description even if enabled.';
 $string['rolesinparams'] = 'Include role names in parameters';
+$string['urladministration'] = 'URL administration';
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
@@ -186,7 +186,6 @@ function view_header($subpage='') {
 
         $PAGE->set_title($this->pagetitle);
         $PAGE->set_heading($this->course->fullname);
-        $PAGE->set_button($OUTPUT->update_module_button($this->cm->id, 'assignment'));
 
         echo $OUTPUT->header();
 
@@ -1126,7 +1125,6 @@ function display_submissions($message='') {
         add_to_log($course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->cm->id, $this->assignment->id, $this->cm->id);
         $PAGE->navbar->add($this->strsubmissions);
         $PAGE->set_title(format_string($this->assignment->name,true));
-        $PAGE->set_button( update_module_button($cm->id, $course->id, $this->strassignment));
         echo $OUTPUT->header();
 
         $course_context = get_context_instance(CONTEXT_COURSE, $course->id);

diff --git a/mod/chat/view.php b/mod/chat/view.php
@@ -72,18 +72,16 @@
 
     $title = $course->shortname . ': ' . format_string($chat->name);
 
-    $buttons = '<table><tr><td>'.$OUTPUT->update_module_button($cm->id, $cm->modname).'</td>';
     if ($PAGE->user_allowed_editing() && !empty($CFG->showblocksonmodpages)) {
-        $buttons .= '<td><form '.$CFG->frametarget.' method="get" action="view.php"><div>'.
+        $buttons = '<table><tr><td><form '.$CFG->frametarget.' method="get" action="view.php"><div>'.
                 '<input type="hidden" name="id" value="'.$cm->id.'" />'.
                 '<input type="hidden" name="edit" value="'.($PAGE->user_is_editing()?'off':'on').'" />'.
-                '<input type="submit" value="'.get_string($PAGE->user_is_editing()?'blockseditoff':'blocksediton').'" /></div></form></td>';
+                '<input type="submit" value="'.get_string($PAGE->user_is_editing()?'blockseditoff':'blocksediton').'" /></div></form></td></tr></table>';
+        $PAGE->set_button($buttons);
     }
-    $buttons .= '</tr></table>';
 
     $PAGE->set_title($title);
     $PAGE->set_heading($course->fullname);
-    $PAGE->set_button($buttons);
     echo $OUTPUT->header();
 
     /// Check to see if groups are being used here

diff --git a/mod/choice/report.php b/mod/choice/report.php
@@ -53,7 +53,6 @@
     if (!$download) {
         $PAGE->navbar->add($strresponses);
         $PAGE->set_title(format_string($choice->name).": $strresponses");
-        $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'choice'));
         echo $OUTPUT->header();
         /// Check to see if groups are being used in this choice
         $groupmode = groups_get_activity_groupmode($cm);

diff --git a/mod/choice/view.php b/mod/choice/view.php
@@ -43,7 +43,6 @@
     }
 
     $PAGE->set_title(format_string($choice->name));
-    $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'choice'));
     echo $OUTPUT->header();
 
 /// Submit any new data if there is any

diff --git a/mod/data/edit.php b/mod/data/edit.php
@@ -131,7 +131,6 @@
 }
 
 $PAGE->set_title($data->name);
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'data'));
 echo $OUTPUT->header();
 
 /// Check to see if groups are being used here

diff --git a/mod/data/export.php b/mod/data/export.php
@@ -83,7 +83,6 @@
 } elseif (!$formdata = (array) $mform->get_data()) {
     // build header to match the rest of the UI
     $PAGE->set_title($data->name);
-    $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'data'));
     echo $OUTPUT->header();
     echo $OUTPUT->heading(format_string($data->name));
 

diff --git a/mod/data/lib.php b/mod/data/lib.php
@@ -1984,7 +1984,6 @@ function data_print_header($course, $cm, $data, $currenttab='') {
     global $CFG, $displaynoticegood, $displaynoticebad, $OUTPUT, $PAGE;
 
     $PAGE->set_title($data->name);
-    $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'data'));
     echo $OUTPUT->header();
     echo $OUTPUT->heading(format_string($data->name));
 

diff --git a/mod/data/templates.php b/mod/data/templates.php
@@ -91,7 +91,6 @@
 $PAGE->navbar->add(get_string($mode,'data'));
 $PAGE->requires->js('mod/data/data.js');
 $PAGE->set_title($data->name);
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'data'));
 echo $OUTPUT->header();
 echo $OUTPUT->heading(format_string($data->name));
 

diff --git a/mod/data/view.php b/mod/data/view.php
@@ -282,22 +282,21 @@
     // The code will be much nicer than this eventually.
     $title = $course->shortname.': ' . format_string($data->name);
 
-    $buttons = '<table><tr><td>'.$OUTPUT->update_module_button($cm->id, $cm->modname).'</td>';
     if ($PAGE->user_allowed_editing() && !empty($CFG->showblocksonmodpages)) {
-        $buttons .= '<td><form '.$CFG->frametarget.' method="get" action="view.php"><div>'.
+        $buttons = '<table><tr><td><form '.$CFG->frametarget.' method="get" action="view.php"><div>'.
             '<input type="hidden" name="id" value="'.$cm->id.'" />'.
             '<input type="hidden" name="edit" value="'.($PAGE->user_is_editing()?'off':'on').'" />'.
-            '<input type="submit" value="'.get_string($PAGE->user_is_editing()?'blockseditoff':'blocksediton').'" /></div></form></td>';
+            '<input type="submit" value="'.get_string($PAGE->user_is_editing()?'blockseditoff':'blocksediton').'" /></div></form></td></tr></table>';
+        $PAGE->set_button($buttons);
     }
-    $buttons .= '</tr></table>';
 
     if ($mode == 'asearch') {
         $PAGE->navbar->add(get_string('search'));
     }
 
     $PAGE->set_title($title);
     $PAGE->set_heading($course->fullname);
-    $PAGE->set_button($buttons);
+
     echo $OUTPUT->header();
 
 /// Check to see if groups are being used here

diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
@@ -65,7 +65,6 @@
 
 $PAGE->navbar->add(get_string('analysis','feedback'));
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 /// print the tabs

diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
@@ -73,7 +73,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 /// print the tabs

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
@@ -127,7 +127,6 @@
 $PAGE->navbar->add(get_string('feedback:complete', 'feedback'));
 $PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/feedback/complete.php', array('id'=>$cm->id, 'gopage'=>$gopage, 'courseid'=>$course->id)));
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 //ishidden check.

diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
@@ -131,7 +131,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 //ishidden check. hidden feedbacks except feedbacks on mainsite are only accessible with related capabilities

diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
@@ -70,7 +70,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 /// Print the main part of the page

diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php
@@ -62,7 +62,6 @@
     $PAGE->navbar->add(format_string($feedback->name));
 
     $PAGE->set_title(format_string($feedback->name));
-    $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
     echo $OUTPUT->header();
 
     /// Print the main part of the page

diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
@@ -87,7 +87,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 /// print the tabs

diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
@@ -152,7 +152,6 @@
 }
 $PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/feedback/edit.php', array('id'=>$cm->id, 'do_show'=>$do_show)));
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 /// print the tabs

diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
@@ -170,7 +170,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 /// print the tabs
 include('tabs.php');

diff --git a/mod/feedback/import.php b/mod/feedback/import.php
@@ -88,7 +88,6 @@
     $PAGE->navbar->add(format_string($feedback->name));
 
     $PAGE->set_title(format_string($feedback->name));
-    $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
     echo $OUTPUT->header();
 
     /// Print the main part of the page

diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
@@ -77,7 +77,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 include('tabs.php');

diff --git a/mod/feedback/print.php b/mod/feedback/print.php
@@ -46,7 +46,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 /// Print the main part of the page

diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
@@ -71,7 +71,6 @@
 
 $PAGE->navbar->add(get_string('show_entries','feedback'));
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 include('tabs.php');

diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
@@ -72,7 +72,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 /// Print the main part of the page

diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
@@ -73,7 +73,6 @@
 $PAGE->navbar->add(format_string($feedback->name));
 
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 /// Print the main part of the page

diff --git a/mod/feedback/view.php b/mod/feedback/view.php
@@ -82,7 +82,6 @@
 
 $PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/feedback/view.php', array('id'=>$cm->id, 'do_show'=>'view')));
 $PAGE->set_title(format_string($feedback->name));
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'feedback'));
 echo $OUTPUT->header();
 
 //ishidden check.

diff --git a/mod/folder/lib.php b/mod/folder/lib.php
@@ -306,3 +306,54 @@ function folder_pluginfile($course, $cminfo, $context, $filearea, $args, $forced
     // 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 folder 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 folder_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 folder_extend_settings_navigation($settings, $module) {
+    global $PAGE, $CFG, $DB;
+
+    // Load the folder instance from the database
+    $folder = $DB->get_record('folder', array('id'=>$PAGE->cm->instance));
+    // Add a folder node to the settings navigation.
+    $foldernavkey = $settings->add(get_string('folderadministration', 'folder'));
+    $foldernav = $settings->get($foldernavkey);
+    $foldernav->forceopen = true;
+
+    // If the user has the capability add an update this module link for the folder 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()));
+        $foldernav->add(get_string('updatethis', '', get_string('modulename', 'folder')), $url);
+    }
+
+    // Check if any children have been added. If not remove the node to save on clutter.
+    if (count($foldernav->children)<1) {
+        $settings->remove_child($foldernavkey);
+    }
+}
diff --git a/mod/folder/view.php b/mod/folder/view.php
@@ -53,7 +53,6 @@
 $PAGE->set_title($course->shortname.': '.$folder->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_activity_record($folder);
-$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'folder'));
 echo $OUTPUT->header();
 
 echo $OUTPUT->heading(format_string($folder->name), 2);

diff --git a/mod/glossary/deleteentry.php b/mod/glossary/deleteentry.php
@@ -103,7 +103,6 @@
 
 } else {        // the operation has not been confirmed yet so ask the user to do so
     $PAGE->set_title(format_string($glossary->name));
-    $PAGE->set_button($OUTPUT->update_module_button($cm->id, 'glossary'));
     echo $OUTPUT->header();
     $areyousure = "<b>".format_string($entry->concept)."</b><p>$strareyousuredelete</p>";
     $linkyes    = 'deleteentry.php';

diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
@@ -73,7 +73,6 @@
 $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
@@ -52,7 +52,6 @@
 $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
@@ -68,7 +68,6 @@
 $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
@@ -230,7 +230,6 @@
 
 /// 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);