From: moodler Date: Tue, 13 May 2003 07:51:26 +0000 (+0000) Subject: Images are not put in a frame, but embedded in a normal page X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ac4f6d455fcc6877499462162c8e51b880ca484a;p=moodle.git Images are not put in a frame, but embedded in a normal page --- diff --git a/mod/resource/view.php b/mod/resource/view.php index 2c5e12771c..0e7df75b8c 100644 --- a/mod/resource/view.php +++ b/mod/resource/view.php @@ -78,28 +78,39 @@ $fullurl = "$CFG->wwwroot/file.php?file=/$course->id/$resource->reference"; } + $embedded = false; - if ($frameset == "top") { + if (mimeinfo("icon", $fullurl) == "image.gif") { // It's an image + $embedded = true; + $resourceimage = true; + } else { + $resourceimage = false; + } + + // (could check for more embeddable media here...) + + if ($frameset == "top" or $embedded) { print_header("$course->shortname: $resource->name", "$course->fullname", "$navigation framename\" HREF=\"$fullurl\">$resource->name", "", "", true, update_module_button($cm->id, $course->id, $strresource), navmenu($course, $cm)); echo "
".text_to_html($resource->summary, true, false)."
"; - } else if ($frameset == "image") { - print_header(); - echo "
"; + add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id"); + } + + if ($embedded) { // Display resource embedded in page + if ($resourceimage) { + echo "
"; + echo "
"; + echo "
"; + } print_footer($course); - } else { - add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id"); + } else { // Display resource in a frame of it's own. echo "$course->shortname: $resource->name\n"; echo ""; echo "id&frameset=top\">"; - if (mimeinfo("icon", $fullurl) == "image.gif") { - echo "id&frameset=image\">"; - } else { - echo ""; - } + echo ""; echo ""; } break;