# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: moodle/lang/en_utf8/resource.php
--- moodle/lang/en_utf8/resource.php Base (1.7.4.7)
+++ moodle/lang/en_utf8/resource.php Locally Modified (Based On 1.7.4.7)
@@ -54,7 +54,9 @@
 $string['fulltext'] = 'Full text';
 $string['htmlfragment'] = 'HTML fragment';
 $string['imspackageloaded'] = 'Package loaded';
-$string['keepnavigationvisible'] = 'Keep page navigation visible on the same page';
+$string['keepnavigationvisible'] = 'Show navigation';
+$string['keepnavigationvisiblewarning'] = 'Note: some media files may ignore \'Show navigation\' setting';
+
 $string['localfile'] = 'Local file';
 $string['localfilechoose'] = 'Choose a local file (CD-ROM)';
 $string['localfilehelp'] = 'Help displaying local files';
Index: moodle/mod/resource/type/file/resource.class.php
--- moodle/mod/resource/type/file/resource.class.php Base (1.71.2.26)
+++ moodle/mod/resource/type/file/resource.class.php Locally Modified (Based On 1.71.2.26)
@@ -265,7 +265,8 @@
 
             } else if ($mimetype == 'application/pdf' || $mimetype == 'application/x-pdf') {
                 $resourcetype = "pdf";
-                $embedded = true;
+                //no need embedded, html file types behave like unknown file type
+                
             } else if ($mimetype == "audio/x-pn-realaudio") {   // It's a realmedia file
                 $resourcetype = "rm";
                 $embedded = true;
@@ -691,13 +692,6 @@
                 echo get_string('clicktoopen', 'resource') . '<a href="' . $fullurl . '">' . format_string($resource->name) . '</a>';
                 echo '</div>';
 
-            } elseif ($resourcetype == 'pdf') {
-                echo '<div class="resourcepdf">';
-                echo '<object data="' . $fullurl . '" type="application/pdf">';
-                echo '<param name="src" value="' . $fullurl . '" />';
-                echo get_string('clicktoopen', 'resource') . '<a href="' . $fullurl . '">' . format_string($resource->name) . '</a>';
-                echo '</object>';
-                echo '</div>';
             }
 
             if (trim($resource->summary)) {
@@ -832,6 +826,8 @@
         $mform->disabledIf('framepage', 'forcedownload', 'checked');
         $mform->setAdvanced('framepage');
 
+        $mform->addElement('static','shownavigationwarning','','<i>'.get_string('keepnavigationvisiblewarning', 'resource').'</i>');
+
         foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
             if ($option == 'height' or $option == 'width') {
                 $mform->addElement('text', $option, get_string('new'.$option, 'resource'), array('size'=>'4'));