diff --git a/mod/data/edit.php b/mod/data/edit.php index d22b2062ffc..95604e3ad28 100644 --- a/mod/data/edit.php +++ b/mod/data/edit.php @@ -227,17 +227,6 @@ if ($datarecord = data_submitted() and confirm_sesskey()) { 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 index 259ae0a7c0d..2112015185f 100644 --- a/mod/data/export.php +++ b/mod/data/export.php @@ -77,7 +77,6 @@ foreach ($fieldrecords as $fieldrecord) { $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->set_heading($course->fullname); $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 index e35facf7ca8..4f651dde8e2 100644 --- a/mod/data/import.php +++ b/mod/data/import.php @@ -80,6 +80,7 @@ $PAGE->navbar->add(get_string('add', 'data')); $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 index 3ab1be0e744..d7506510aa6 100644 --- 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 index 6b77d6a0d15..08e5d277d3f 100644 --- a/mod/data/preset.php +++ b/mod/data/preset.php @@ -102,9 +102,6 @@ if ($formimportzip->is_cancelled()) { } 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 @@ if (in_array($action, ['confirmdelete', 'delete', 'finishimport'])) { 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 index 39d38a91341..926f99ae7b7 100644 --- a/mod/data/templates.php +++ b/mod/data/templates.php @@ -104,17 +104,6 @@ $PAGE->set_pagelayout('admin'); $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 index 87ba7852a57..4c0f60937b3 100644 --- a/mod/data/view.php +++ b/mod/data/view.php @@ -261,21 +261,11 @@ $groupmode = groups_get_activity_groupmode($cm); $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 @@ if ($data->intro and empty($page) and empty($record) and $mode != 'single') { $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.'&search='.s($search).'&sort='.s($sort).'&order='.s($order).'&'; groups_print_activity_menu($cm, $returnurl);