moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-46944-master-lti-iframe' of git://github.com/schmod/moodle

Browse source
This commit is contained in:
Damyon Wiese 2014-09-15 15:08:31 +08:00
commit db074792b9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/lti/view.php
View file

@ -130,10 +130,10 @@ if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
echo "</script>\n"; echo "</script>\n";
echo "<p>".get_string("basiclti_in_new_window", "lti")."</p>\n"; echo "<p>".get_string("basiclti_in_new_window", "lti")."</p>\n";
} else { } else {
// Request the launch content with an object tag // Request the launch content with an iframe tag.
echo '<object id="contentframe" height="600px" width="100%" type="text/html" data="launch.php?id='.$cm->id.'"></object>'; echo '<iframe id="contentframe" height="600px" width="100%" src="launch.php?id='.$cm->id.'"></iframe>';
//Output script to make the object tag be as large as possible // Output script to make the iframe be as large as possible.
$resize = ' $resize = '
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[