From 15d5885f840a5f33c5ee8d65c40784ce7b6144d3 Mon Sep 17 00:00:00 2001
From: AL Rachels <drachels@drachels.com>
Date: Fri, 19 Apr 2013 15:15:04 +0800
Subject: [PATCH 1/2] MDL-39040 - mod_data: Database description available in
 add entry tab.

---
 mod/data/edit.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mod/data/edit.php b/mod/data/edit.php
index 96a9f6599b0..43e429ba27e 100644
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -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';

From f7a00e9dbf13d1947b3b162ed53245707bef816b Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Fri, 19 Apr 2013 15:16:27 +0800
Subject: [PATCH 2/2] MDL-39040 - mod_data: Database description available in
 single view tab.

---
 mod/data/export.php    | 1 +
 mod/data/lib.php       | 2 ++
 mod/data/preset.php    | 2 ++
 mod/data/templates.php | 2 ++
 mod/data/view.php      | 2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mod/data/export.php b/mod/data/export.php
index cbbb75d09f7..0bb604cc9e4 100644
--- a/mod/data/export.php
+++ b/mod/data/export.php
@@ -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);
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 653f251fd5d..77c455fd2a5 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1977,6 +1977,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) {
diff --git a/mod/data/preset.php b/mod/data/preset.php
index 1a366abdc8b..673d43ab50b 100644
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -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');
 }
 
diff --git a/mod/data/templates.php b/mod/data/templates.php
index c551e03a10c..e7b09b66f57 100644
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -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');
diff --git a/mod/data/view.php b/mod/data/view.php
index d901d92ebfd..1b8b2787524 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -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