From a1b9b374b98d2ff163c2484679e7617f0824fa66 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Thu, 5 Apr 2007 05:51:12 +0000 Subject: [PATCH] MDL-9198: Embedded PDF now works fine in FF 1.5, FF 2, IE5, IE6, IE7 and Opera, and degrades beautifully in non-supported browsers (or when plugin is missing). --- mod/resource/type/file/resource.class.php | 18 ++++++++++++------ theme/standard/styles_layout.css | 11 +++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php index 4dc4049b67..368b32abda 100644 --- a/mod/resource/type/file/resource.class.php +++ b/mod/resource/type/file/resource.class.php @@ -216,7 +216,6 @@ function display() { $formatoptions->noclean = true; if ($resource->options == "frame") { // TODO nicolasconnault 14-03-07: This option should be renamed "embed" - if (in_array($mimetype, array('image/gif','image/jpeg','image/png'))) { // It's an image $resourcetype = "image"; $embedded = true; @@ -243,7 +242,10 @@ function display() { } else if ($mimetype == "text/html") { // It's a web page $resourcetype = "html"; - } + } else if ($mimetype == 'application/pdf' || $mimetype = 'application/x-pdf') { + $resourcetype = "pdf"; + $embedded = true; + } } $isteamspeak = (stripos($resource->reference, 'teamspeak://') === 0); @@ -325,7 +327,6 @@ function display() { /// Check whether this is supposed to be a popup, but was called directly - if ($resource->popup and !$inpopup) { /// Make a page and a pop-up window print_header($pagetitle, $course->fullname, "$this->navigation ".format_string($resource->name), "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm)); @@ -385,6 +386,7 @@ function display() { /// If we are in a frameset, just print the top of it if (!empty( $frameset ) and ($frameset == "top") ) { + print_header($pagetitle, $course->fullname, "$this->navigation ".format_string($resource->name), "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "parent")); $options = new object(); @@ -401,7 +403,6 @@ function display() { /// Display the actual resource - if ($embedded) { // Display resource embedded in page $strdirectlink = get_string("directlink", "resource"); @@ -518,8 +519,7 @@ function display() { echo '' . $fullurl . ''; echo ''; echo ''; - } else if ($resourcetype == "flash") { - + } else if ($resourcetype == "flash") { echo '
'; echo ''; echo ""; @@ -540,6 +540,12 @@ function display() { echo ''; echo ''; echo '
'; + } elseif ($resourcetype == 'pdf') { + echo '
'; + echo ''; + echo get_string('clicktoopen', 'resource') . '' . $resource->summary . ''; + echo ''; + echo '
'; } if (trim($resource->summary)) { diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index e7719f8c54..34d679beb1 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -3174,11 +3174,22 @@ body#question-preview .quemodname, body#question-preview .controls { margin:20px; } +#mod-resource-view .resourcepdf { + width: 100%; + padding-top: 15px; + text-align: center + } + .resourcecontent object { height:480px; width:600px; } +.resourcepdf object{ + height: 800px; + width: 800px; +} + .mod-resource .modified { text-align:center; } -- 2.39.5