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

Fixing glossary in lp_view see BT#4391

Browse Source
skala
Julio Montoya 13 years ago
parent b9b45d4330
commit 41030371eb
5 changed files with 106 additions and 66 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. 2
      main/document/showinframes.php
  2. 7
      main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
  3. 25
      main/newscorm/lp_ajax_initialize.php
  4. 12
      main/newscorm/lp_view.php
  5. 126
      main/newscorm/scorm_api.php

2
main/document/showinframes.php
Unescape View File

@ -152,7 +152,7 @@ if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
{ 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:"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_manual.js"}
]

7
main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
Unescape View File

@ -105,10 +105,11 @@
url: "../../../../../../../main/glossary/glossary_ajax_request.php",
data: "glossary_id="+my_glossary_id,
success: function(datas) {
$("div#"+div_content_id).html(datas);
$("div#"+div_content_id).html(datas);
$("#"+div_show_id).dialog("open");
}
});
$("#"+div_show_id).dialog("open");
});
});
//mouse out event

25
main/newscorm/lp_ajax_initialize.php
Unescape View File

@ -57,7 +57,7 @@ function initialize_item($lp_id, $user_id, $view_id, $next_item) {
$mylp = new learnpath($code,$lp_id,$user_id);
} else {
if ($debug > 1) { error_log('////Reusing session lp', 0); }
$mylp = & $oLP;
$mylp = $oLP;
}
}
$mylp->set_current_item($next_item);
@ -108,18 +108,23 @@ function initialize_item($lp_id, $user_id, $view_id, $next_item) {
$myistring = substr($myistring, 1);
}
// Obtention des donnees d'objectifs
$phpobjectives = array();
$mycoursedb = Database::get_course_table(TABLE_LP_IV_OBJECTIVE);
$course_id = api_get_course_int_id();
$mylp_iv_id = $mylpi->db_item_view_id;
$sql = "SELECT objective_id, status, score_raw, score_max, score_min
FROM ".$mycoursedb."
WHERE lp_iv_id = ".$mylp_iv_id." AND c_id = $course_id
ORDER BY id ASC;";
$res = Database::query($sql);
while ($row = Database::fetch_row($res)) {
$phpobjectives[] = $row;
}
$phpobjectives = array();
if (!empty($mylp_iv_id)) {
$sql = "SELECT objective_id, status, score_raw, score_max, score_min
FROM ".$mycoursedb."
WHERE lp_iv_id = ".$mylp_iv_id." AND c_id = $course_id
ORDER BY id ASC;";
$res = Database::query($sql);
while ($row = Database::fetch_row($res)) {
$phpobjectives[] = $row;
}
}
$myobjectives = json_encode($phpobjectives);
$return .=
"olms.score=".$myscore.";" .

12
main/newscorm/lp_view.php
Unescape View File

@ -448,8 +448,10 @@ if (Database::num_rows($res_media) > 0) {
}, "top.content_name",
{ load: [
{type:"script", id:"_fr1", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.min.js"},
{type:"script", id:"_fr2", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"},
{type:"script", id:"_fr3", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>fckeditor/editor/plugins/glossary/fck_glossary_manual.js"}
{type:"script", id:"_fr4", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.min.js"},
{type:"stylesheet", id:"_fr5", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.css"},
{type:"script", id:"_fr2", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"}
] }
);
<?php
@ -460,8 +462,10 @@ if (Database::num_rows($res_media) > 0) {
}, "top.content_name",
{ load: [
{type:"script", id:"_fr1", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.min.js"},
{type:"script", id:"_fr2", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"},
{type:"script", id:"_fr3", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>fckeditor/editor/plugins/glossary/fck_glossary_automatic.js"}
{type:"script", id:"_fr4", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.min.js"},
{type:"stylesheet", id:"_fr5", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.css"},
{type:"script", id:"_fr2", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"}
] }
);
<?php

126
main/newscorm/scorm_api.php
Unescape View File

@ -1810,73 +1810,103 @@ function attach_glossary_into_scorm(type) {
}
var complex_array = new Array();
//mouse over event
$("iframe").contents().find("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>");
$("iframe").contents().find("div#"+div_show_id).attr("style","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;");
$("iframe").contents().find("div#"+div_content_id).attr("style","background-color:#F2F2F2;color:#0B3861;margin-left:8px;margin-right:8px;margin-top:5px;margin-bottom:5px;");
//$("iframe").contents().find("body .glossary-ajax").on("click", ".glossary-ajax", function() {
$("iframe").contents().find("body").on("click", ".glossary-ajax", function() {
div_show_id="div_show_id";
div_content_id="div_content_id";
$("iframe").contents().find("body").append('<div id="div_show_id"><div id="div_content_id">&nbsp;</div></div>');
show_dialog = $("iframe").contents().find("div#"+div_show_id);
show_description = $("iframe").contents().find("div#"+div_content_id);
var $target = $(this);
if ($("#learning_path_left_zone").is(':visible') ) {
var extra_left = $("#learning_path_left_zone").width() + 20;
} else {
var extra_left = 0;
}
//$("#"+div_show_id).dialog("destroy");
show_dialog.dialog({
autoOpen: false,
width: 600,
height: 200,
position: { my: 'left top', at: 'right top', of: $target, offset: extra_left+", 0"},
close: function(){
show_dialog.remove();
show_description.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) {
$("iframe").contents().find("div#"+div_content_id).html("<img src='<?php echo api_get_path(WEB_PATH); ?>main/inc/lib/javascript/indicator.gif' />"); },
type: "POST",
url: "<?php echo api_get_path(WEB_PATH); ?>/main/glossary/glossary_ajax_request.php",
url: "<?php echo api_get_path(WEB_PATH); ?>main/glossary/glossary_ajax_request.php",
data: "glossary_id="+my_glossary_id,
success: function(data) {
$("iframe").contents().find("div#"+div_content_id).html(data);
show_description.html(data);
show_dialog.dialog("open");
}
});
});
});
//mouse out event
$("iframe").contents().find("body .glossary-ajax").mouseout(function(){
var current_element,
current_element=$(this);
div_show_id=current_element.find("div").attr("id");
$("iframe").contents().find("div#"+div_show_id).remove();
});
}
}
});
} else {
if ('manual') {
$("iframe").contents().find("body .glossary").mouseover(function(){
//$("iframe").contents().find("body .glossary").mouseover(function(){
$("iframe").contents().find("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;
//Fixes bug "No result found" message #3620
//$(this).append("<div id="+div_show_id+" ><div id="+div_content_id+">&nbsp;</div></div>");
$("iframe").contents().find("div#"+div_show_id).attr("style","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;");
$("iframe").contents().find("div#"+div_content_id).attr("style","background-color:#F2F2F2;color:#0B3861;margin-left:8px;margin-right:8px;margin-top:5px;margin-bottom:5px;");
div_show_id="div_show_id";
div_content_id="div_content_id";
$("iframe").contents().find("body").append('<div id="div_show_id"><div id="div_content_id">&nbsp;</div></div>');
show_dialog = $("iframe").contents().find("div#"+div_show_id);
show_description = $("iframe").contents().find("div#"+div_content_id);
var $target = $(this);
if ($("#learning_path_left_zone").is(':visible') ) {
var extra_left = $("#learning_path_left_zone").width() + 20;
} else {
var extra_left = 0;
}
//$("#"+div_show_id).dialog("destroy");
show_dialog.dialog({
autoOpen: false,
width: 600,
height: 200,
position: { my: 'left top', at: 'right top', of: $target, offset: extra_left+", 0"},
close: function(){
show_dialog.remove();
show_description.remove();
}
});
//$("iframe").contents().find("div#"+div_show_id).attr("style","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;");
//$("iframe").contents().find("div#"+div_content_id).attr("style","background-color:#F2F2F2;color:#0B3861;margin-left:8px;margin-right:8px;margin-top:5px;margin-bottom:5px;");
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(objeto) {
$("iframe").contents().find("<img src='<?php echo api_get_path(WEB_PATH); ?>main/inc/lib/javascript/indicator.gif' />"); },
contentType: "application/x-www-form-urlencoded",
type: "POST",
url: "<?php echo api_get_path(WEB_PATH); ?>/main/glossary/glossary_ajax_request.php",
url: "<?php echo api_get_path(WEB_PATH); ?>main/glossary/glossary_ajax_request.php",
data: "glossary_name="+is_glossary_name,
success: function(data) {
$("iframe").contents().find("div#"+div_content_id).html(data);
success: function(data) {
show_description.html(data);
show_dialog.dialog("open");
}
});
});
$("iframe").contents().find("body .glossary").mouseout(function(){
current_element=$(this);
div_show_id=current_element.find("div").attr("id");
$("iframe").contents().find("div#"+div_show_id).remove();
});
});
});
}
}
}
}
Write Preview
Loading…
Cancel
Save