MDL-72413 data: Use the common module for setting the header

moodle · Dec 13, 2021 · 535bbed · 535bbed
1 parent 054bff0
commit 535bbed
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 68 deletions.
diff --git a/mod/data/edit.php b/mod/data/edit.php
@@ -227,17 +227,6 @@
 
 echo $OUTPUT->header();
 
-if (!$PAGE->has_secondary_navigation()) {
-    echo $OUTPUT->heading(format_string($data->name), 2);
-}
-
-// Render the activity information.
-$cminfo = cm_info::create($cm);
-$completiondetails = \core_completion\cm_completion_details::get_instance($cminfo, $USER->id);
-$activitydates = \core\activity_dates::get_dates_for_module($cminfo, $USER->id);
-echo $OUTPUT->activity_information($cminfo, $completiondetails, $activitydates);
-
-echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
 groups_print_activity_menu($cm, $CFG->wwwroot.'/mod/data/edit.php?d='.$data->id);
 
 /// Print the browsing interface

diff --git a/mod/data/export.php b/mod/data/export.php
@@ -77,7 +77,6 @@
     $fields[]= data_get_field($fieldrecord, $data);
 }
 
-
 $mform = new mod_data_export_form(new moodle_url('/mod/data/export.php', ['d' => $data->id,
     'backto' => $redirectbackto]), $fields, $cm, $data);
 
@@ -118,17 +117,6 @@
 $PAGE->force_settings_menu(true);
 $PAGE->set_secondary_active_tab('modulepage');
 echo $OUTPUT->header();
-if (!$PAGE->has_secondary_navigation()) {
-    echo $OUTPUT->heading(format_string($data->name), 2);
-}
-
-// Render the activity information.
-$cminfo = cm_info::create($cm);
-$completiondetails = \core_completion\cm_completion_details::get_instance($cminfo, $USER->id);
-$activitydates = \core\activity_dates::get_dates_for_module($cminfo, $USER->id);
-echo $OUTPUT->activity_information($cminfo, $completiondetails, $activitydates);
-
-echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
 
 groups_print_activity_menu($cm, $url);
 

diff --git a/mod/data/import.php b/mod/data/import.php
@@ -80,6 +80,7 @@
 $PAGE->set_title($data->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_secondary_active_tab('modulepage');
+$PAGE->activityheader->disable();
 echo $OUTPUT->header();
 echo $OUTPUT->heading_with_help(get_string('uploadrecords', 'mod_data'), 'uploadrecords', 'mod_data');
 

diff --git a/mod/data/lib.php b/mod/data/lib.php
@@ -2321,18 +2321,6 @@ function data_print_header($course, $cm, $data, $currenttab='', string $actionba
     $PAGE->set_title($data->name);
     echo $OUTPUT->header();
 
-    if (!$PAGE->has_secondary_navigation()) {
-        echo $OUTPUT->heading(format_string($data->name), 2);
-    }
-
-    // Render the activity information.
-    $cminfo = cm_info::create($cm);
-    $completiondetails = \core_completion\cm_completion_details::get_instance($cminfo, $USER->id);
-    $activitydates = \core\activity_dates::get_dates_for_module($cminfo, $USER->id);
-    echo $OUTPUT->activity_information($cminfo, $completiondetails, $activitydates);
-
-    echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
-
     echo $actionbar;
 
     // Print any notices

diff --git a/mod/data/preset.php b/mod/data/preset.php
@@ -102,9 +102,6 @@
 }
 
 echo $OUTPUT->header();
-if (!$PAGE->has_secondary_navigation()) {
-    echo $OUTPUT->heading(format_string($data->name), 2);
-}
 
 if ($formdata = $formimportzip->get_data()) {
     $file = new stdClass;
@@ -184,14 +181,6 @@
     exit(0);
 }
 
-// Render the activity information.
-$cminfo = cm_info::create($cm);
-$completiondetails = \core_completion\cm_completion_details::get_instance($cminfo, $USER->id);
-$activitydates = \core\activity_dates::get_dates_for_module($cminfo, $USER->id);
-echo $OUTPUT->activity_information($cminfo, $completiondetails, $activitydates);
-
-echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
-
 if ($action === 'import') {
     echo $formimportzip->display();
 } else {

diff --git a/mod/data/templates.php b/mod/data/templates.php
@@ -104,17 +104,6 @@
 $PAGE->force_settings_menu(true);
 
 echo $OUTPUT->header();
-if (!$PAGE->has_secondary_navigation()) {
-    echo $OUTPUT->heading(format_string($data->name), 2);
-}
-
-// Render the activity information.
-$cminfo = cm_info::create($cm);
-$completiondetails = \core_completion\cm_completion_details::get_instance($cminfo, $USER->id);
-$activitydates = \core\activity_dates::get_dates_for_module($cminfo, $USER->id);
-
-echo $OUTPUT->activity_information($cminfo, $completiondetails, $activitydates);
-echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
 
 $actionbar = new \mod_data\output\action_bar($data->id, $url);
 echo $actionbar->get_templates_action_bar();

diff --git a/mod/data/view.php b/mod/data/view.php
@@ -261,21 +261,11 @@
 $canmanageentries = has_capability('mod/data:manageentries', $context);
 echo $OUTPUT->header();
 
-
 // Detect entries not approved yet and show hint instead of not found error.
 if ($record and !data_can_view_record($data, $record, $currentgroup, $canmanageentries)) {
     print_error('notapproved', 'data');
 }
 
-if (!$PAGE->has_secondary_navigation()) {
-    echo $OUTPUT->heading(format_string($data->name), 2);
-}
-
-// Render the activity information.
-$completiondetails = \core_completion\cm_completion_details::get_instance($cm, $USER->id);
-$activitydates = \core\activity_dates::get_dates_for_module($cm, $USER->id);
-echo $OUTPUT->activity_information($cm, $completiondetails, $activitydates);
-
 // Do we need to show a link to the RSS feed for the records?
 //this links has been Settings (database activity administration) block
 /*if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) {
@@ -289,7 +279,6 @@
     $options = new stdClass();
     $options->noclean = true;
 }
-echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
 
 $returnurl = $CFG->wwwroot . '/mod/data/view.php?d='.$data->id.'&amp;search='.s($search).'&amp;sort='.s($sort).'&amp;order='.s($order).'&amp;';
 groups_print_activity_menu($cm, $returnurl);