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

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).

Browse Source
This commit is contained in:
nicolasconnault
2007-04-05 05:51:12 +00:00
parent cf8133c457
commit a1b9b374b9
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/resource/type/file/resource.class.php
+12 -6
View File
@@ -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 '<a href="' . $fullurl . '">' . $fullurl . '</a>';
echo '</object>';
echo '</div>';
} else if ($resourcetype == "flash") {
} else if ($resourcetype == "flash") {
echo '<div class="resourcecontent resourceswf">';
echo '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">';
echo "<param name=\"movie\" value=\"$fullurl\" />";
@@ -540,6 +540,12 @@ function display() {
echo '<!--<![endif]-->';
echo '</object>';
echo '</div>';
} elseif ($resourcetype == 'pdf') {
echo '<div class="resourcepdf">';
echo '<object data="' . $fullurl . '" type="application/pdf">';
echo get_string('clicktoopen', 'resource') . '<a href="' . $fullurl . '">' . $resource->summary . '</a>';
echo '</object>';
echo '</div>';
}
if (trim($resource->summary)) {
theme/standard/styles_layout.css
+11
View File
@@ -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;
}