From 01db3e1e5d91d88e8be9e9fc6b4c2856ba6f7afa Mon Sep 17 00:00:00 2001 From: Arthur Portugal Date: Thu, 29 Oct 2009 12:30:22 -0500 Subject: [PATCH 1/3] Fixed the button to can add new event into of a session and inside of a group DT#5496 --- main/calendar/agenda.inc.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php index 6f582a366d..ae127c2cc5 100644 --- a/main/calendar/agenda.inc.php +++ b/main/calendar/agenda.inc.php @@ -643,7 +643,7 @@ function selectAll(cbList,bSelect,showwarning) msg_err3 = document.getElementById(\"err_end_date\"); msg_err4 = document.getElementById(\"err_title\"); - if (start_date > ends_date) { + /*if (start_date > ends_date) { msg_err1.style.display =\"block\"; msg_err1.innerHTML=\"".get_lang('EndDateCannotBeBeforeTheStartDate')."\"; msg_err2.innerHTML=\"\";msg_err3.innerHTML=\"\"; @@ -668,6 +668,26 @@ function selectAll(cbList,bSelect,showwarning) for (var i=0; i ends_date) { + msg_err1.style.display =\"block\"; + msg_err1.innerHTML=\"".get_lang('EndDateCannotBeBeforeTheStartDate')."\"; + msg_err2.innerHTML=\"\";msg_err3.innerHTML=\"\"; + } else if (checkDate(start_month,start_day,start_year) == false) { + msg_err2.style.display =\"block\"; + msg_err2.innerHTML=\"".get_lang('InvalidDate')."\"; + msg_err1.innerHTML=\"\";msg_err3.innerHTML=\"\"; + } else if (checkDate(ends_month,ends_day,ends_year) == false) { + msg_err3.style.display =\"block\"; + msg_err3.innerHTML=\"".get_lang('InvalidDate')."\"; + msg_err1.innerHTML=\"\";msg_err2.innerHTML=\"\"; + } else if (document.new_calendar_item.title.value == '') { + msg_err4.style.display =\"block\"; + msg_err4.innerHTML=\"".get_lang('FieldRequired')."\"; + msg_err1.innerHTML=\"\";msg_err2.innerHTML=\"\";msg_err3.innerHTML=\"\"; + } + else { + document.new_calendar_item.submit(); } } From 37f10614e4db7d0dec0afd41729172eefefb2785 Mon Sep 17 00:00:00 2001 From: Arthur Portugal Date: Thu, 29 Oct 2009 12:48:37 -0500 Subject: [PATCH 2/3] Fixed reset search in the sort headers into wiki search DT#5496 --- main/wiki/wiki.inc.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php index e71704287b..07e20e90d3 100644 --- a/main/wiki/wiki.inc.php +++ b/main/wiki/wiki.inc.php @@ -1983,8 +1983,7 @@ function display_wiki_search_results($search_term, $search_content=0) if (Database::num_rows($result) > 0) { $row = array (); - while ($obj = Database::fetch_object($result)) - { + while ($obj = Database::fetch_object($result)) { //get author $userinfo=Database::get_user_info_from_id($obj->user_id); @@ -2028,11 +2027,11 @@ function display_wiki_search_results($search_term, $search_content=0) $table = new SortableTableFromArrayConfig($rows,1,10,'SearchPages_table','','','ASC'); $table->set_additional_parameters(array('cidReq' =>$_GET['cidReq'],'action'=>$_GET['action'],'group_id'=>Security::remove_XSS($_GET['group_id']))); - $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;')); - $table->set_header(1,get_lang('Title'), true); - $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true); - $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true); - $table->set_header(4,get_lang('Actions'), true, array ('style' => 'width:100px;')); + $table->set_header(0,get_lang('Type'), false, array ('style' => 'width:30px;')); + $table->set_header(1,get_lang('Title'), false); + $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', false); + $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', false); + $table->set_header(4,get_lang('Actions'), false, array ('style' => 'width:100px;')); $table->display(); } From 6b32fb9a011c2f8a19e3b2208f4b92a7ebe644bc Mon Sep 17 00:00:00 2001 From: Isaac Flores Date: Thu, 29 Oct 2009 13:13:59 -0500 Subject: [PATCH 3/3] Improvements of glossary in several tools --- .../glossary/fck_glossary_automatic.js | 20 ++++++++++++++----- main/inc/lib/javascript/glossary.js | 17 ++++++++++------ main/newscorm/scorm_api.php | 13 +++++++++--- 3 files changed, 36 insertions(+), 14 deletions(-) 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 172930f30d..33e6274908 100755 --- a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js +++ b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js @@ -18,12 +18,14 @@ $(document).ready(function() { data_terms=datas.split("[|.|_|.|-|.|]"); for(i=0;i]('+specific_terms[1]+')',"g"); - new_html=my_text.replace(my_specific_terms,""+specific_terms[1]+""); + var real_term = specific_terms[1]; + var my_specific_terms = new RegExp('([^A-Za-z0-9/_\<>])'+specific_terms[1]+'[\ .,]{0,1}',"gi"); + new_html=my_text.replace(my_specific_terms,function(m){return replace_complete_char(m)}); $("body").html(new_html); my_text=$("body").html(); } - + + //mouse over event $("body .glossary-ajax").mouseover(function(){ random_id=Math.round(Math.random()*100); div_show_id="div_show_id"+random_id; @@ -46,14 +48,22 @@ $(document).ready(function() { } }); }); + + //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(); }); - - + + //Callback Helper + function replace_complete_char(m) { + var complete_term_pattern = new RegExp(real_term,"i"); + var tag = m.replace(complete_term_pattern," $&"); + return tag; + } + } }); diff --git a/main/inc/lib/javascript/glossary.js b/main/inc/lib/javascript/glossary.js index ce83b876ad..1270723feb 100644 --- a/main/inc/lib/javascript/glossary.js +++ b/main/inc/lib/javascript/glossary.js @@ -20,11 +20,11 @@ $(document).ready(function() { for(i=0;i])('+specific_terms[1]+')',"g"); - new_html=my_text.replace(my_specific_terms," "+specific_terms[1]+""); - $(".glossary-content").html(new_html); - my_text=$(".glossary-content").html(); - + var real_term = specific_terms[1]; + var my_specific_terms = new RegExp('([^A-Za-z0-9/_\<>])'+specific_terms[1]+'[\ .,]{0,1}',"gi"); + new_html=my_text.replace(my_specific_terms,function(m){return replace_complete_char(m)}); + $(".glossary-content").html(new_html); + my_text=$(".glossary-content").html(); } $(".glossary-content .glossary-ajax").mouseover(function(){ @@ -55,7 +55,12 @@ $(document).ready(function() { div_show_id=current_element.find("div").attr("id"); $("div#"+div_show_id).remove(); }); - + + function replace_complete_char(m) { + var complete_term_pattern = new RegExp(real_term,"i"); + var tag = m.replace(complete_term_pattern," $&"); + return tag; + } } diff --git a/main/newscorm/scorm_api.php b/main/newscorm/scorm_api.php index 2e6b62888c..43f5dcb1f5 100755 --- a/main/newscorm/scorm_api.php +++ b/main/newscorm/scorm_api.php @@ -1617,8 +1617,9 @@ function attach_glossary_into_scorm() { data_terms=datos.split("[|.|_|.|-|.|]"); for(i=0;i]('+specific_terms[1]+')',"g"); - new_html=my_text.replace(my_specific_terms," "+specific_terms[1]+""); + var real_term = specific_terms[1]; + var my_specific_terms = new RegExp('([^A-Za-z0-9/_\<>])'+specific_terms[1]+'[\ .,]{0,1}',"gi"); + new_html=my_text.replace(my_specific_terms,function(m){return replace_complete_char(m)}); $frame_content.html(new_html); my_text=$frame_content.html(); } @@ -1652,7 +1653,13 @@ function attach_glossary_into_scorm() { div_show_id=current_element.find("div").attr("id"); $("iframe").contents().find('body').find("div#"+div_show_id).remove(); }); - + + //Callback Helper + function replace_complete_char(m) { + var complete_term_pattern = new RegExp(real_term,"i"); + var tag = m.replace(complete_term_pattern," $&"); + return tag; + } }