diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 0a9b819523..3758ee9d62 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -231,17 +231,33 @@ function create_document_link($document_data, $show_as_icon = false) {
         }
         //target="'.$target.'"
         if ($filetype == 'file') {
-            return '<a href="'.$url.'" class="yoxviewLink" title="'.$tooltip_title_alt.'" target="yoxview" style="float:left" '.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;            
+			if(preg_match('/swf$/', urldecode($url)) || (preg_match('/wav$/', urldecode($url)) && api_get_setting('enable_nanogong') == 'true')){
+				$url = 'showinframesmin.php?'.api_get_cidreq().'&id='.$document_data['id'].$req_gid;
+				return '<a href="'.$url.'" class="yoxview" title="'.$tooltip_title_alt.'" target="yoxview" style="float:left" '.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
+			}else{			
+            	return '<a href="'.$url.'" class="yoxview" title="'.$tooltip_title_alt.'" target="yoxview" style="float:left" '.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
+			}          
         } else {
             return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" '.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html.$copy_to_myfiles.$open_in_new_window_link.$pdf_icon;
         }
         //end copy files to users myfiles
     } else {
+		//icons colum
         if(preg_match('/shared_folder/', urldecode($url)) && preg_match('/shared_folder$/', urldecode($url))==false && preg_match('/shared_folder_session_'.$current_session_id.'$/', urldecode($url))==false){
             return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.build_document_icon_tag($filetype, $path).Display::return_icon('shared.png', get_lang('ResourceShared'), array('hspace' => '5', 'align' => 'middle', 'height' => 22, 'width' => 22)).'</a>';
         } else {
-            return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.build_document_icon_tag($filetype, $path).'</a>';
-        }
+			if($filetype == 'file') {
+				if(preg_match('/swf$/', urldecode($url)) || (preg_match('/wav$/', urldecode($url)) && api_get_setting('enable_nanogong') == 'true')){
+					$url = 'showinframesmin.php?'.api_get_cidreq().'&id='.$document_data['id'].$req_gid;
+					return '<a href="'.$url.'" class="yoxview" title="'.$tooltip_title_alt.'" target="yoxview"'.$visibility_class.' style="float:left">'.build_document_icon_tag($filetype, $path).'</a>';
+				}else{			
+					return '<a href="'.$url.'" class="yoxview" title="'.$tooltip_title_alt.'" target="yoxview"'.$visibility_class.' style="float:left">'.build_document_icon_tag($filetype, $path).'</a>';
+				}          
+        	}
+			else {
+             	return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.build_document_icon_tag($filetype, $path).'</a>';
+			}
+		}
     }
 }
 
diff --git a/main/document/document.php b/main/document/document.php
index f267e092a1..8c63c3d3e2 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -72,7 +72,7 @@ $(document).ready( function() {
     $(".yoxview").yoxview({
 		lang: "'.$lang_yoxview.'",
 		flashVideoPlayerPath: "'.$mediaplayer_path.'",	  
-        skin: "top_menu",
+        renderMenu: "false",
         titleAttribute:"alt"   
     });
     for (i=0;i<$(".actions").length;i++) {
@@ -1100,9 +1100,9 @@ if (count($docs_and_folders) > 1) {
         $table->set_form_actions($form_action, 'path');        
     }    
 }
-echo '<div class="thumbnails yoxview">';
+//echo '<div class="thumbnails yoxview">';
 $table->display();
-echo '</div>';
+//echo '</div>';
 
 if (count($docs_and_folders) > 1) {
     if ($is_allowed_to_edit || $group_member_with_upload_rights) {
diff --git a/main/document/showinframesmin.php b/main/document/showinframesmin.php
new file mode 100644
index 0000000000..ffdd902e18
--- /dev/null
+++ b/main/document/showinframesmin.php
@@ -0,0 +1,163 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+/**
+ *	@author Juan Carlos Raņa Trabado (herodoto@telefonica.net)
+ *  
+ *	@package chamilo.document
+ */
+
+/*   INITIALIZATION */
+
+$language_file[] = 'document';
+require_once '../inc/global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'document.lib.php';
+require_once api_get_path(LIBRARY_PATH).'glossary.lib.php';
+require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
+
+// Protection
+api_protect_course_script();
+
+$noPHP_SELF = true;
+$header_file = Security::remove_XSS($_GET['file']);
+$document_id = intval($_GET['id']);
+
+$course_info = api_get_course_info();
+$course_code = api_get_course_id(); 
+
+if (empty($course_info)) {
+    api_not_allowed(true);
+}
+
+//Generate path 
+if (!$document_id) {
+    $document_id = DocumentManager::get_document_id($course_info, $header_file);
+}
+$document_data = DocumentManager::get_document_data_by_id($document_id, $course_code);
+
+if (empty($document_data)) {
+    api_not_allowed(true);
+}
+
+$header_file  = $document_data['path'];
+$name_to_show = cut($header_file, 80);
+
+$path_array = explode('/', str_replace('\\', '/', $header_file));
+$path_array = array_map('urldecode', $path_array);
+$header_file = implode('/', $path_array);
+
+$file = Security::remove_XSS(urldecode($document_data['path']));
+
+$file_root = $course_info['path'].'/document'.str_replace('%2F', '/', $file);
+$file_url_sys = api_get_path(SYS_COURSE_PATH).$file_root;
+$file_url_web = api_get_path(WEB_COURSE_PATH).$file_root;
+
+if (!file_exists($file_url_sys)) {
+    api_not_allowed(true);
+}
+
+if (is_dir($file_url_sys)) {
+    api_not_allowed(true);
+}
+
+//fix the screen when you try to access a protected course through the url
+$is_allowed_in_course = $_SESSION ['is_allowed_in_course'];
+
+if ($is_allowed_in_course == false) {
+    api_not_allowed(true);
+}
+
+//Check user visibility
+$is_visible = DocumentManager::is_visible_by_id($document_id, $course_info, api_get_session_id());
+if (!api_is_allowed_to_edit() && !$is_visible) {
+    api_not_allowed(true);
+}
+
+//TODO:clean all code
+
+/*	Main section */
+header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
+//header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+header('Last-Modified: Wed, 01 Jan 2100 00:00:00 GMT');
+header('Cache-Control: no-cache, must-revalidate');
+header('Pragma: no-cache');
+$browser_display_title = 'Documents - '.Security::remove_XSS($_GET['cidReq']).' - '.$file;
+
+
+$js_glossary_in_documents = '';
+if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
+    $js_glossary_in_documents = '	//	    $(document).ready(function() {
+                                    $.frameReady(function() {
+                                       //  $("<div>I am a div courses</div>").prependTo("body");
+                                      }, "top.mainFrame",
+                                      { load: [
+                                              {type:"script", id:"_fr1", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js"},
+                                            {type:"script", id:"_fr2", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js"},
+                                            {type:"script", id:"_fr3", src:"'.api_get_path(WEB_LIBRARY_PATH).'fckeditor/editor/plugins/glossary/fck_glossary_manual.js"}
+                                           ]
+                                      }
+                                      );
+                                    //});';
+} elseif (api_get_setting('show_glossary_in_documents') == 'isautomatic') {
+    $js_glossary_in_documents =	'//    $(document).ready(function() {
+                                      $.frameReady(function(){
+                                       //  $("<div>I am a div courses</div>").prependTo("body");
+
+                                      }, "top.mainFrame",
+                                      { load: [
+                                              {type:"script", id:"_fr1", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js"},
+                                            {type:"script", id:"_fr2", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js"},
+                                            {type:"script", id:"_fr3", src:"'.api_get_path(WEB_LIBRARY_PATH).'fckeditor/editor/plugins/glossary/fck_glossary_automatic.js"}
+                                           ]
+                                      }
+                                      );
+                                //   });';
+}
+
+$htmlHeadXtra[] = '<script type="text/javascript">
+<!--
+    var jQueryFrameReadyConfigPath = \''.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js\';
+-->
+</script>';
+$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.frameready.js"></script>';
+
+$htmlHeadXtra[] = '
+
+<script type="text/javascript">
+<!--
+    var updateContentHeight = function() {
+        //HeaderHeight = document.getElementById("header").offsetHeight;
+        //FooterHeight = document.getElementById("footer").offsetHeight;
+        //document.getElementById("mainFrame").style.height = ((docHeight-(parseInt(HeaderHeight)+parseInt(FooterHeight)))+60)+"px";
+        my_iframe = document.getElementById("mainFrame");
+        new_height = my_iframe.contentWindow.document.body.scrollHeight;
+        my_iframe.height = my_iframe.contentWindow.document.body.scrollHeight + "px";
+    };
+
+    // Fixes the content height of the frame
+    window.onload = function() {
+        updateContentHeight();
+        '.$js_glossary_in_documents.'
+    }
+-->
+</script>';
+
+////
+echo "<div align=\"center\">";
+$file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
+
+$pathinfo =pathinfo($header_file);
+if ($pathinfo['extension']=='wav' && api_get_setting('enable_nanogong') == 'true'){
+	echo '<div align="center">';
+		echo '<br/>';
+		echo '<applet id="applet" archive="../inc/lib/nanogong/nanogong.jar" code="gong.NanoGong" width="160" height="40" >';
+			echo '<param name="SoundFileURL" value="'.$file_url_web.'" />';
+			echo '<param name="ShowSaveButton" value="false" />';
+			echo '<param name="ShowTime" value="true" />';
+			echo '<param name="ShowRecordButton" value="false" />';
+		echo '</applet>';
+	echo '</div>';
+}
+else{
+	echo '<iframe border="0" frameborder="0" scrolling="no" style="width:90%; height:90%;"  id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 10000).'"></iframe>';
+}
\ No newline at end of file