chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ckeditor - fix glossary plugin manual/automatic see BT#8968

Browse Source
1.10.x
Julio Montoya 10 years ago
parent e1be094ad0
commit d0f400f425
5 changed files with 173 additions and 226 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      main/document/showinframes.php
  2. 48
      main/inc/lib/javascript/ckeditor/plugins/glossary/fck_glossary_automatic.js
  3. 36
      main/inc/lib/javascript/ckeditor/plugins/glossary/fck_glossary_manual.js
  4. 8
      main/inc/lib/javascript/glossary.js
  5. 7
      main/newscorm/scorm_api.php

18
main/document/showinframes.php
Unescape View File

@ -164,7 +164,7 @@ if ($is_courseAdmin) {
$js_glossary_in_documents = '';
if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
$js_glossary_in_documents = ' // $(document).ready(function() {
$js_glossary_in_documents = '
$.frameReady(function() {
// $("<div>I am a div courses</div>").prependTo("body");
}, "top.mainFrame",
@ -175,25 +175,21 @@ if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
{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).'javascript/ckeditor/plugins/glossary/fck_glossary_manual.js"}
]
}
);
//});';
});';
} elseif (api_get_setting('show_glossary_in_documents') == 'isautomatic') {
$js_glossary_in_documents = '// $(document).ready(function() {
$js_glossary_in_documents = '
$.frameReady(function(){
// $("<div>I am a div courses</div>").prependTo("body");
}, "top.mainFrame",
{ load: [
{
load: [
{ 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"}
{ type:"script", id:"_fr3", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/ckeditor/plugins/glossary/fck_glossary_automatic.js"}
]
}
);
// });';
});';
}
$web_odf_supported_files = DocumentManager::get_web_odf_extension_list();

48
main/inc/lib/javascript/ckeditor/plugins/glossary/fck_glossary_automatic.js
Unescape View File

@ -1,5 +1,5 @@
/**
* Makes posible to load glossary items from the Glossary Tool
* Makes possible to load glossary items from the Glossary Tool
* This library will be loaded in:
*
* document/showinframes.php
@ -8,18 +8,19 @@
*
*/
/*$(document).ready(function() {
$(window).load(function() {
*/
my_protocol = location.protocol;
my_pathname=location.pathname;
work_path = my_pathname.substr(0,my_pathname.indexOf('/courses/'));
var ajaxRequestUrl = my_protocol+"//"+location.host+work_path+"/main/glossary/glossary_ajax_request.php";
var imageSource = my_protocol+"//"+location.host+work_path+"/main/inc/lib/javascript/indicator.gif";
var indicatorImage ='<img src="' + imageSource + '" />';
$.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",
url: ajaxRequestUrl,
data: "glossary_data=true",
success: function(datas) {
if (datas.length==0) {
@ -54,30 +55,18 @@
}
}
}
//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;");
var $target = $(this);
$("#"+div_show_id).dialog("destroy");
@ -99,37 +88,16 @@
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(content_object) {
$("div#"+div_content_id).html("<img src='../../../../../../../main/inc/lib/javascript/indicator.gif' />");
$("div#"+div_content_id).html(indicatorImage);
},
type: "POST",
url: "../../../../../../../main/glossary/glossary_ajax_request.php",
url: ajaxRequestUrl,
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();
});*/
}
});
/*
});
});*/

36
main/inc/lib/javascript/ckeditor/plugins/glossary/fck_glossary_manual.js
Unescape View File

@ -1,6 +1,5 @@
/**
Makes posible to load glossary items from the Glossary Tool
Makes possible to load glossary items from the Glossary Tool
This library will be loaded in:
document/showinframes.php
@ -8,20 +7,17 @@ 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/'));
var ajaxRequestUrl = my_protocol+"//"+location.host+work_path+"/main/glossary/glossary_ajax_request.php";
var imageSource = my_protocol+"//"+location.host+work_path+"/main/inc/lib/javascript/indicator.gif";
var indicatorImage ='<img src="' + imageSource + '" />';
//$("body .glossary").mouseover(function(){
$("body").on("click", ".glossary", function() {
is_glossary_name = $(this).html();
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";
@ -40,19 +36,14 @@ newscorm/scorm_api.php
$("div#"+div_content_id).remove();
}
});
/* $("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;");*/
var indicator =
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(result) {
$("div#"+div_content_id).html("<img src='../../../../../../../main/inc/lib/javascript/indicator.gif' />");
$("div#"+div_content_id).html(indicatorImage);
},
type: "POST",
url: "../../../../../../../main/glossary/glossary_ajax_request.php",
url: ajaxRequestUrl,
data: "glossary_name="+is_glossary_name,
success: function(data) {
$("div#"+div_content_id).html(data);
@ -60,14 +51,3 @@ newscorm/scorm_api.php
}
});
});
/*
$("body .glossary").mouseout(function(){
current_element=$(this);
div_show_id=current_element.find("div").attr("id");
$("div#"+div_show_id).remove();
});
*/
// });
//});

8
main/inc/lib/javascript/glossary.js
Unescape View File

@ -4,12 +4,14 @@ $(document).ready(function() {
my_protocol = location.protocol;
my_pathname=location.pathname;
work_path = my_pathname.substr(0,my_pathname.indexOf('/courses/'));
var ajaxRequestUrl = my_protocol+"//"+location.host+work_path+"/main/glossary/glossary_ajax_request.php";
$.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",
url: ajaxRequestUrl,
data: "glossary_data=true",
success: function(datas) {
if (datas.length==0) {
@ -64,19 +66,19 @@ $(document).ready(function() {
$("div#"+div_content_id).html("<img src='../../../../main/inc/lib/javascript/indicator.gif' />");
},
type: "POST",
url: "../../../../main/glossary/glossary_ajax_request.php",
url: ajaxRequestUrl,
data: "glossary_id="+my_glossary_id,
success: function(datas) {
$("div#"+div_content_id).html(datas);
}
});
});
$("#highlight-plugin .glossary-ajax").mouseout(function(){
var current_element = $(this);
div_show_id=current_element.find("div").attr("id");
$("div#"+div_show_id).remove();
});
//helpers
}
});
});

7
main/newscorm/scorm_api.php
Unescape View File

@ -1972,6 +1972,7 @@ function attach_glossary_into_scorm(type) {
my_protocol = location.protocol;
my_pathname=location.pathname;
work_path = my_pathname.substr(0,my_pathname.indexOf('/courses/'));
var ajaxRequestUrl = '<?php echo api_get_path(WEB_CODE_PATH).'glossary/glossary_ajax_request.php'; ?>';
if (type == 'automatic') {
$.ajax({
@ -1979,7 +1980,7 @@ function attach_glossary_into_scorm(type) {
beforeSend: function(object) {
},
type: "POST",
url: my_protocol+"//"+location.host+work_path+"/main/glossary/glossary_ajax_request.php",
url: ajaxRequestUrl,
data: "glossary_data=true",
success: function(datas) {
if (datas.length==0) {
@ -2059,7 +2060,7 @@ function attach_glossary_into_scorm(type) {
$.ajax({
contentType: "application/x-www-form-urlencoded",
type: "POST",
url: "<?php echo api_get_path(WEB_PATH); ?>main/glossary/glossary_ajax_request.php",
url: ajaxRequestUrl,
data: "glossary_id="+my_glossary_id,
success: function(data) {
show_description.html(data);
@ -2106,7 +2107,7 @@ function attach_glossary_into_scorm(type) {
$.ajax({
contentType: "application/x-www-form-urlencoded",
type: "POST",
url: "<?php echo api_get_path(WEB_PATH); ?>main/glossary/glossary_ajax_request.php",
url: ajaxRequestUrl,
data: "glossary_name="+is_glossary_name,
success: function(data) {
show_description.html(data);

Write Preview
Loading…
Cancel
Save