From 80fd00729b93f4e674ef966014eb2a033f179fb9 Mon Sep 17 00:00:00 2001
From: rwijaya <rwijaya@moodle.com>
Date: Wed, 13 Nov 2013 09:52:32 +0800
Subject: [PATCH] MDL-41797 external tools module: fix heading levels.

AMOS BEGIN
CPY [submissions, core_grades], [submissions, mod_lti]
AMOS END
---
 mod/lti/grade.php        | 3 ++-
 mod/lti/lang/en/lti.php  | 1 +
 mod/lti/mod_form.php     | 1 +
 mod/lti/request_tool.php | 3 +++
 mod/lti/return.php       | 6 +++++-
 mod/lti/view.php         | 2 +-
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mod/lti/grade.php b/mod/lti/grade.php
index 9ec342f1a8b..5dd66b90449 100644
--- a/mod/lti/grade.php
+++ b/mod/lti/grade.php
@@ -159,7 +159,8 @@ $PAGE->set_title(format_string($title , true));
 $PAGE->set_heading($course->fullname);
 
 echo $OUTPUT->header();
-echo $OUTPUT->heading($title );
+echo $OUTPUT->heading(format_string($lti->name, true, array('context' => $context)));
+echo $OUTPUT->heading(get_string('submissions', 'lti'), 3);
 
 echo $table;
 
diff --git a/mod/lti/lang/en/lti.php b/mod/lti/lang/en/lti.php
index 483292c8677..6034c0903ed 100644
--- a/mod/lti/lang/en/lti.php
+++ b/mod/lti/lang/en/lti.php
@@ -396,6 +396,7 @@ The only case in which this option should be selected is if the tool configurati
 For example, if all launches to the tool provider just take the user to a landing page instead of to a specific resource.';
 $string['size'] = 'Size parameters';
 $string['submission'] = 'Submission';
+$string['submissions'] = 'Submissions';
 $string['submissionsfor'] = 'Submissions for {$a}';
 $string['toggle_debug_data'] = 'Toggle Debug Data';
 $string['tool_config_not_found'] = 'Tool configuration not found for this URL.';
diff --git a/mod/lti/mod_form.php b/mod/lti/mod_form.php
index aa5a7281c50..35b5f61e39f 100644
--- a/mod/lti/mod_form.php
+++ b/mod/lti/mod_form.php
@@ -83,6 +83,7 @@ class mod_lti_mod_form extends moodleform_mod {
 
         $mform->addElement('checkbox', 'showtitlelaunch', '&nbsp;', ' ' . get_string('display_name', 'lti'));
         $mform->setAdvanced('showtitlelaunch');
+        $mform->setDefault('showtitlelaunch', true);
         $mform->addHelpButton('showtitlelaunch', 'display_name', 'lti');
 
         $mform->addElement('checkbox', 'showdescriptionlaunch', '&nbsp;', ' ' . get_string('display_description', 'lti'));
diff --git a/mod/lti/request_tool.php b/mod/lti/request_tool.php
index daf664c596a..ed3bb2ead68 100644
--- a/mod/lti/request_tool.php
+++ b/mod/lti/request_tool.php
@@ -32,6 +32,8 @@ $instanceid = required_param('instanceid', PARAM_INT);
 
 $lti = $DB->get_record('lti', array('id' => $instanceid));
 $course = $DB->get_record('course', array('id' => $lti->course));
+$cm = get_coursemodule_from_instance('lti', $lti->id, $lti->course, false, MUST_EXIST);
+$context = context_module::instance($cm->id);
 
 require_login($course);
 
@@ -49,6 +51,7 @@ $PAGE->set_heading($course->fullname);
 $PAGE->set_pagelayout('incourse');
 
 echo $OUTPUT->header();
+echo $OUTPUT->heading(format_string($lti->name, true, array('context' => $context)));
 
 //Add a tool type if one does not exist already
 if (!lti_get_tool_by_url_match($lti->toolurl, $lti->course, LTI_TOOL_STATE_ANY)) {
diff --git a/mod/lti/return.php b/mod/lti/return.php
index 1ad5b3c19a7..b0940bbff95 100644
--- a/mod/lti/return.php
+++ b/mod/lti/return.php
@@ -36,7 +36,10 @@ $unsigned = optional_param('unsigned', '0', PARAM_INT);
 
 $launchcontainer = optional_param('launch_container', LTI_LAUNCH_CONTAINER_WINDOW, PARAM_INT);
 
-$course = $DB->get_record('course', array('id' => $courseid));
+$course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
+$lti = $DB->get_record('lti', array('id' => $instanceid), '*', MUST_EXIST);
+$cm = get_coursemodule_from_instance('lti', $lti->id, $lti->course, false, MUST_EXIST);
+$context = context_module::instance($cm->id);
 
 require_login($course);
 
@@ -56,6 +59,7 @@ if (!empty($errormsg)) {
     }
 
     echo $OUTPUT->header();
+    echo $OUTPUT->heading(format_string($lti->name, true, array('context' => $context)));
 
     echo get_string('lti_launch_error', 'lti');
 
diff --git a/mod/lti/view.php b/mod/lti/view.php
index 289f0c0e3f5..6735bcd0dc1 100644
--- a/mod/lti/view.php
+++ b/mod/lti/view.php
@@ -107,7 +107,7 @@ echo $OUTPUT->header();
 
 if ($lti->showtitlelaunch) {
     // Print the main part of the page
-    echo $OUTPUT->heading(format_string($lti->name));
+    echo $OUTPUT->heading(format_string($lti->name, true, array('context' => $context)));
 }
 
 if ($lti->showdescriptionlaunch && $lti->intro) {