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

merge

Browse Source
skala
Juan Carlos Raña 16 years ago
parent 1649bad356 cccdcd0d4f
commit 35c2cd0f15
5 changed files with 63 additions and 22 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. 22
      main/calendar/agenda.inc.php
  2. 14
      main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js
  3. 11
      main/inc/lib/javascript/glossary.js
  4. 11
      main/newscorm/scorm_api.php
  5. 13
      main/wiki/wiki.inc.php

22
main/calendar/agenda.inc.php
Unescape View File

@ -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<cbList.length; i++)
cbList[i].selected = cbList[i].checked = bSelect;
document.new_calendar_item.submit();
}*/
if (start_date > 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();
}
}

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

@ -18,12 +18,14 @@ $(document).ready(function() {
data_terms=datas.split("[|.|_|.|-|.|]");
for(i=0;i<data_terms.length;i++) {
specific_terms=data_terms[i].split("__|__|");
var my_specific_terms = new RegExp('[^A-Za-z0-9/_\<>]('+specific_terms[1]+')',"g");
new_html=my_text.replace(my_specific_terms,"<span class=\"glossary-ajax\" style='color:blue' name=\"link"+specific_terms[0]+"\">"+specific_terms[1]+"</span>");
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,6 +48,8 @@ $(document).ready(function() {
}
});
});
//mouse out event
$("body .glossary-ajax").mouseout(function(){
var current_element,
current_element=$(this);
@ -53,6 +57,12 @@ $(document).ready(function() {
$("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," <span class=\"glossary-ajax\" style='color:blue' name=\"link"+specific_terms[0]+"\">$&</span>");
return tag;
}
}

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

@ -20,11 +20,11 @@ $(document).ready(function() {
for(i=0;i<data_terms.length;i++) {
specific_terms=data_terms[i].split("__|__|");
var my_specific_terms = new RegExp('([^A-Za-z0-9/_\<>])('+specific_terms[1]+')',"g");
new_html=my_text.replace(my_specific_terms," <span class=\"glossary-ajax\" style='color:blue' name=\"link"+specific_terms[0]+"\">"+specific_terms[1]+"</span>");
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(){
@ -56,6 +56,11 @@ $(document).ready(function() {
$("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," <span class=\"glossary-ajax\" style='color:blue' name=\"link"+specific_terms[0]+"\">$&</span>");
return tag;
}
}

11
main/newscorm/scorm_api.php
Unescape View File

@ -1617,8 +1617,9 @@ function attach_glossary_into_scorm() {
data_terms=datos.split("[|.|_|.|-|.|]");
for(i=0;i<data_terms.length;i++) {
specific_terms=data_terms[i].split("__|__|");
var my_specific_terms = new RegExp('[^A-Za-z0-9/_\<>]('+specific_terms[1]+')',"g");
new_html=my_text.replace(my_specific_terms," <span style='color:blue' class=\"glossary-ajax\" name=\"link"+specific_terms[0]+"\" >"+specific_terms[1]+"</span>");
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();
}
@ -1653,6 +1654,12 @@ function attach_glossary_into_scorm() {
$("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," <span class=\"glossary-ajax\" style='color:blue' name=\"link"+specific_terms[0]+"\">$&</span>");
return tag;
}
}

13
main/wiki/wiki.inc.php
Unescape View File

@ -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();
}

Write Preview
Loading…
Cancel
Save