diff --git a/main/document/showinframes.php b/main/document/showinframes.php
index d5dcb4f00d..7a53a4fd53 100644
--- a/main/document/showinframes.php
+++ b/main/document/showinframes.php
@@ -164,9 +164,11 @@ if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
 
                                       }, "top.mainFrame",
                                       { load: [
-                                              {type:"script", id:"_fr1", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.min.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"}
+                                                {type:"script", id:"_fr1", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.min.js"},
+                                                {type:"script", id:"_fr4", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.min.js"},
+                                                {type:"stylesheet", id:"_fr5", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.css"},                                                    
+                                                {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"}
                                            ]
                                       }
                                       );
@@ -231,9 +233,6 @@ if ($show_web_odf) {
     $execute_iframe = false;
 }
 
-
-
-
 $is_freemind_available = $pathinfo['extension']=='mm' && api_get_setting('enable_freemind') == 'true';
 if ($is_freemind_available){
     $execute_iframe = false;
@@ -270,10 +269,8 @@ if (!$jplayer_supported && $execute_iframe) {
     </script>';
 }
 
-
 Display::display_header('');
 
-
 echo '<div align="center">';
 
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
@@ -299,31 +296,24 @@ if ($jplayer_supported) {
     echo '</div>';     
 }
 
-
 if ($is_freemind_available) { 
-
-	?>
-	
+	?>	
 	<script type="text/javascript" src="<?php echo api_get_path(WEB_LIBRARY_PATH) ?>swfobject/swfobject.js"></script>
 	<style type="text/css">
 		#flashcontent {
 			height: 500px;
 			padding-top:10px;
 		}
-	</style>
-	<script type="text/javascript">
-	function giveFocus() 
-		{ 
-		  document.visorFreeMind.focus();  
-		}
-	</script>
-	
+	</style>		
 	<div id="flashcontent" onmouseover="giveFocus();">
 		 Flash plugin or Javascript are turned off.
 		 Activate both  and reload to view the mindmap
-	</div>
-		
-	<script type="text/javascript">
+	</div>		
+	<script>
+        function giveFocus() { 
+		  document.visorFreeMind.focus();  
+		}
+        
 		document.onload=giveFocus;
 		// <![CDATA[
 		// for allowing using http://.....?mindmap.mm mode
@@ -367,10 +357,8 @@ if ($is_freemind_available) {
 		
 		fo.write("flashcontent");
 		// ]]>
-	</script>
-	
+	</script>	
 	<?php
-
 }
 
 
@@ -430,4 +418,4 @@ if ($is_nanogong_available) {
 if ($execute_iframe) {
     echo '<iframe id="mainFrame" name="mainFrame" border="0" frameborder="0" scrolling="no" style="width:100%;" height="600" src="'.$file_url_web.'&amp;rand='.mt_rand(1, 10000).'" height="500"></iframe>';
 }
-Display::display_footer();
+Display::display_footer();
\ No newline at end of file
diff --git a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
index 46d29dabe2..5eea1b0d9f 100644
--- a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
+++ b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
@@ -1,104 +1,138 @@
 /**
-
-Makes posible to load glossary items from the Glossary Tool
-This library will be loaded in:
-
-document/showinframes.php
-newscorm/lp_view.php
-newscorm/scorm_api.php
-
-
+* Makes posible to load glossary items from the Glossary Tool
+*   This library will be loaded in:
+*
+*    document/showinframes.php
+*    newscorm/lp_view.php
+*    newscorm/scorm_api.php
+*    
 */
 
 /*$(document).ready(function() {
     $(window).load(function() {
 	*/	
-     my_protocol = location.protocol;
-	 my_pathname=location.pathname;
-	 work_path = my_pathname.substr(0,my_pathname.indexOf('/courses/'));
-	 
-     $.ajax({
+    my_protocol = location.protocol;
+    my_pathname=location.pathname;
+    work_path = my_pathname.substr(0,my_pathname.indexOf('/courses/'));
+
+    $.ajax({
         contentType: "application/x-www-form-urlencoded",
         beforeSend: function(content_object) {},
         type: "POST",
         url: my_protocol+"//"+location.host+work_path+"/main/glossary/glossary_ajax_request.php",
         data: "glossary_data=true",
         success: function(datas) {
-			  if (datas.length==0) {
-			  	return false;
-			  }
-			  // glossary terms 
-              data_terms=datas.split("[|.|_|.|-|.|]");
-                var complex_array = new Array();
-                var cp_complex_array = new Array();
-                for(i=0;i<data_terms.length;i++) {
-                    specific_terms=data_terms[i].split("__|__|");
-                    var real_term = specific_terms[1]; // glossary term 
-                    var real_code = specific_terms[0]; // glossary id
-                    complex_array[real_code] = real_term;
-                    cp_complex_array[real_code] = real_term;
-                }
-                
-                complex_array.reverse();
-                
-                for (var my_index in complex_array) {
-                    n = complex_array[my_index];
-                    if (n == null) {
-                        n = '';
-                    } else {
-                        for (var cp_my_index in cp_complex_array) {
-                            cp_data = cp_complex_array[cp_my_index];
-                            if (cp_data == null) {
-                                cp_data = '';
-                            } else {
-                                if (cp_data == n) {
-                                    my_index = cp_my_index;
-                                }
+            if (datas.length==0) {
+                return false;
+            }
+            // glossary terms 
+            data_terms=datas.split("[|.|_|.|-|.|]");
+            var complex_array = new Array();
+            var cp_complex_array = new Array();
+            for(i=0;i<data_terms.length;i++) {
+                specific_terms=data_terms[i].split("__|__|");
+                var real_term = specific_terms[1]; // glossary term 
+                var real_code = specific_terms[0]; // glossary id
+                complex_array[real_code] = real_term;
+                cp_complex_array[real_code] = real_term;
+            }
+
+            complex_array.reverse();
+
+            for (var my_index in complex_array) {
+                n = complex_array[my_index];
+                if (n == null) {
+                    n = '';
+                } else {
+                    for (var cp_my_index in cp_complex_array) {
+                        cp_data = cp_complex_array[cp_my_index];
+                        if (cp_data == null) {
+                            cp_data = '';
+                        } else {
+                            if (cp_data == n) {
+                                my_index = cp_my_index;
                             }
                         }
-						//alert(n + ' ' + my_index);
-                        $('body').removeHighlight().highlight(n,my_index) 
-                    }                   
-                }
-             
-              var complex_array = new Array();
-              
-			  //mouse over event
-				$("body .glossary-ajax").mouseover(function(){
-	          	random_id=Math.round(Math.random()*100);
-	            div_show_id="div_show_id"+random_id;
-	            div_content_id="div_content_id"+random_id;
-	             $(this).append("<div id="+div_show_id+" ><div id="+div_content_id+">&nbsp;</div></div>");
-	             $("div#"+div_show_id).attr("style","z-index:99;display:inline;float:left;position:absolute;background-color:#F2F2F2;border-bottom: 1px solid #2E2E2E;border-right: 1px solid #2E2E2E;border-left: 1px solid #2E2E2E;border-top: 1px solid #2E2E2E;color:#305582;margin-left:5px;margin-right:5px;");
-	             $("div#"+div_content_id).attr("style","z-index:99;background-color:#F2F2F2;color:#0B3861;margin-left:8px;margin-right:8px;margin-top:5px;margin-bottom:5px;");
-	                notebook_id=$(this).attr("name");
-	                data_notebook=notebook_id.split("link");
-				
-	                my_glossary_id=data_notebook[1];
-	                $.ajax({
-	                    contentType: "application/x-www-form-urlencoded",
-	                    beforeSend: function(content_object) {
-	                    $("div#"+div_content_id).html("<img src='../../../../../../../main/inc/lib/javascript/indicator.gif' />"); },
-	                    type: "POST",
-	                    url: "../../../../../../../main/glossary/glossary_ajax_request.php",
-	                    data: "glossary_id="+my_glossary_id,
-	                    success: function(datas) {
-	                        $("div#"+div_content_id).html(datas);
-	                    }
-	                });
-	          });
-			  
-			  //mouse out event
-	          $("body .glossary-ajax").mouseout(function(){
-		            var current_element,
-		            current_element=$(this);
-		            div_show_id=current_element.find("div").attr("id");
-		            $("div#"+div_show_id).remove();
-	          });
-         
-				}
+                    }
+                    //alert(n + ' ' + my_index);
+                    $('body').removeHighlight().highlight(n,my_index) 
+                }                   
+            }
 
+            var complex_array = new Array();
+
+            //mouse over event
+            //$("body .glossary-ajax").mouseover(function(){
+            //
+            //mouse on click
+            $("body").on("click", ".glossary-ajax", function(e) {
+                random_id = Math.round(Math.random()*100);
+                
+                //div_show_id = "div_show_id"+random_id;
+                //div_content_id = "div_content_id"+random_id;
+                div_show_id = "div_show_id";
+                div_content_id = "div_content_id";
+                
+                $(this).append("<div id="+div_show_id+"><div id="+div_content_id+">&nbsp;</div></div>");
+                
+                //$("div#"+div_show_id).attr("style","z-index:99;display:inline;float:left;position:absolute;background-color:#F2F2F2;border-bottom: 1px solid #2E2E2E;border-right: 1px solid #2E2E2E;border-left: 1px solid #2E2E2E;border-top: 1px solid #2E2E2E;color:#305582;margin-left:5px;margin-right:5px;");
+                //$("div#"+div_content_id).attr("style","z-index:99;background-color:#F2F2F2;color:#0B3861;margin-left:8px;margin-right:8px;margin-top:5px;margin-bottom:5px;");
+                
+                //my_position = $(this).position();
+                
+                var $target = $(this);
+                
+                //alert(my_position.left +' + '+ my_position.top +' +' + $(this).offset().left);
+                
+                $("#"+div_show_id).dialog("destroy");
+                $("#"+div_show_id).dialog({
+                    autoOpen: false,
+                    width: 600,
+                    height: 200,
+                    position:  { my: 'left top', at: 'right top', of: $target },
+                    close: function(){
+                         $("div#"+div_show_id).remove();
+                         $("div#"+div_content_id).remove();
+                    }
+                });
+                
+                notebook_id = $(this).attr("name");
+                data_notebook = notebook_id.split("link");
+                my_glossary_id = data_notebook[1];
+                
+                $.ajax({
+                    contentType: "application/x-www-form-urlencoded",
+                    beforeSend: function(content_object) {
+                        $("div#"+div_content_id).html("<img src='../../../../../../../main/inc/lib/javascript/indicator.gif' />");
+                    },
+                    type: "POST",
+                    url: "../../../../../../../main/glossary/glossary_ajax_request.php",
+                    data: "glossary_id="+my_glossary_id,
+                    success: function(datas) {
+                        $("div#"+div_content_id).html(datas);                        
+                    }
+                });                
+                $("#"+div_show_id).dialog("open");
             });
+
+            //mouse out event
+            /*$("body .glossary-ajax").mouseout(function(){
+                var current_element = $(this);
+                div_show_id=current_element.find("div").attr("id");
+                $("div#"+div_show_id).remove();
+            });*/
+            
+            //mouse click
+            
+            /*$("body").on("click", ".glossary-ajax", function(){
+                var current_element = $(this);
+                div_show_id=current_element.find("div").attr("id");
+                $("div#"+div_show_id).remove();
+            });*/
+            
+        }
+
+    });
 /*			
         });
 });*/