L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-39040-master' of git://github.com/abgreeve/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2013-06-12 10:21:45 +12:00
parent aae402010b f7a00e9dbf
commit e1e6c0dd4c
6 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/edit.php
+2
View File
@@ -252,6 +252,8 @@ echo $OUTPUT->header();
groups_print_activity_menu($cm, $CFG->wwwroot.'/mod/data/edit.php?d='.$data->id);
echo $OUTPUT->heading(format_string($data->name));
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
/// Print the tabs
$currenttab = 'add';
mod/data/export.php
+1
View File
@@ -87,6 +87,7 @@ if($mform->is_cancelled()) {
$url = new moodle_url('/mod/data/export.php', array('d' => $d));
groups_print_activity_menu($cm, $url);
echo $OUTPUT->heading(format_string($data->name));
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
// these are for the tab display
$currentgroup = groups_get_activity_group($cm);
mod/data/lib.php
+2
View File
@@ -1976,6 +1976,8 @@ function data_print_header($course, $cm, $data, $currenttab='') {
$currentgroup = groups_get_activity_group($cm);
$groupmode = groups_get_activity_groupmode($cm);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
// Print the tabs
if ($currenttab) {
mod/data/preset.php
+2
View File
@@ -103,6 +103,8 @@ if (!$form_export->is_submitted()) {
$currenttab = 'presets';
$currentgroup = groups_get_activity_group($cm);
$groupmode = groups_get_activity_groupmode($cm);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
include('tabs.php');
}
mod/data/templates.php
+2
View File
@@ -99,6 +99,8 @@ echo $OUTPUT->heading(format_string($data->name));
$currentgroup = groups_get_activity_group($cm);
$groupmode = groups_get_activity_groupmode($cm);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
/// Print the tabs.
$currenttab = 'templates';
include('tabs.php');
mod/data/view.php
+1 -1
View File
@@ -355,8 +355,8 @@
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');
}
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
/// Delete any requested records