From ea3cf669c8c287576ce9820abd452c2dfc8b051d Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 13 Jan 2010 12:19:59 -0500 Subject: [PATCH] Fixing glossary tool in LPs see CT#438 --- main/inc/lib/javascript/glossary.js | 8 +- main/newscorm/learnpath.class.php | 7 +- main/newscorm/lp_view.php | 9 +- main/newscorm/scorm_api.php | 232 ++++++++++++++++------------ 4 files changed, 152 insertions(+), 104 deletions(-) diff --git a/main/inc/lib/javascript/glossary.js b/main/inc/lib/javascript/glossary.js index 3ccbdab1cc..5d6a694747 100755 --- a/main/inc/lib/javascript/glossary.js +++ b/main/inc/lib/javascript/glossary.js @@ -54,8 +54,8 @@ $(document).ready(function() { div_show_id="div_show_id"+random_id; div_content_id="div_content_id"+random_id; $(this).append("
 
"); - $("div#"+div_show_id).attr("style","display:inline;float:left;position:absolute;background-color:#F5F6CE;border-bottom: 1px dashed #dddddd;border-right: 1px dashed #dddddd;border-left: 1px dashed #dddddd;border-top: 1px dashed #dddddd;color:#305582;margin-left:5px;margin-right:5px;"); - $("div#"+div_content_id).attr("style","background-color:#F5F6CE;color:#305582;margin-left:8px;margin-right:8px;margin-top:5px;margin-bottom:5px;"); + $("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;"); + $("div#"+div_content_id).attr("style","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]; @@ -83,4 +83,6 @@ $(document).ready(function() { }); }); -}); \ No newline at end of file +}); + + diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index f91a740b17..e6ec0bb4a7 100755 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -17,12 +17,17 @@ require_once '../inc/global.inc.php'; $htmlHeadXtra[] = ''; //jQuery +if (api_get_setting('show_glossary_in_documents') == 'ismanual' || api_get_setting('show_glossary_in_documents') == 'isautomatic' ) { + $htmlHeadXtra[] = ''; + $htmlHeadXtra[] = ''; +} + $htmlHeadXtra[] = ''; diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php index 403261ebea..6cfe6fae88 100755 --- a/main/newscorm/lp_view.php +++ b/main/newscorm/lp_view.php @@ -72,7 +72,12 @@ $my_style=$platform_theme; ----------------------------------------------------------- */ $htmlHeadXtra[] = ''; //jQuery -$htmlHeadXtra[] = ''; //jQuery + +if (api_get_setting('show_glossary_in_documents') == 'ismanual' || api_get_setting('show_glossary_in_documents') == 'isautomatic' ) { + $htmlHeadXtra[] = ''; + $htmlHeadXtra[] = ''; +} + $htmlHeadXtra[] = '