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 15 years ago
parent 1b662e342b 064fc26276
commit 5f6b191894
3 changed files with 22 additions and 18 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. 0
      main/inc/lib/debug.lib.php
  2. 24
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php
  3. 16
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js

0
main/inc/lib/debug.lib.php
Unescape View File

24
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php
Unescape View File

@ -425,8 +425,8 @@ $(document).ready(
<!--<fieldset class="boxSearch"> --><!-- comment these lines while integrating into dokeos -->
<legend><?php //echo LBL_SEARCH; ?></legend><!-- comment these lines while integrating into dokeos -->
<fieldset class="boxSearch">
<legend><?php echo LBL_SEARCH; ?></legend>
@ -435,8 +435,8 @@ $(document).ready(
<tr>
<td>
<!-- comment these lines while integrating into dokeos -->
<b><?php //echo LBL_SEARCH_NAME; ?></b> <br />
<!--<input type="text" class="input inputSearch" name="search_name" id="search_name" /> -->
<b><?php //echo LBL_SEARCH_NAME; ?></b> <br />
<input type="text" class="input inputSearch" name="search_name" id="search_name" />
</td>
</tr>
@ -462,20 +462,18 @@ $(document).ready(
}else
{
?>
<!-- comment these lines while integrating into dokeos -->
<!--<select class="input inputSearch" name="search_folder" id="search_folder"> -->
<select class="input inputSearch" name="search_folder" id="search_folder">
<?php
foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
{
//////////////
if(hideFolderName($k))
{
//shows only those permitted by Dokeos
?>
<!-- comment these lines while integrating into dokeos -->
<!--<option value="<?php //echo $v; ?>" <?php //echo (removeTrailingSlash(backslashToSlash(($folderInfo['path']))) == removeTrailingSlash(backslashToSlash(($v)))?' selected="selected"':''); ?>><?php echo hideFolderName(shortenFileName($k, 30)); // shows only those permitted by Dokeos
?></option> -->
<option value="<?php echo $v; ?>" <?php echo (removeTrailingSlash(backslashToSlash(($folderInfo['path']))) == removeTrailingSlash(backslashToSlash(($v)))?' selected="selected"':''); ?>><?php echo hideFolderName(shortenFileName($k, 30)); // shows only those permitted by Dokeos
?></option>
<?php
}
@ -502,7 +500,7 @@ $(document).ready(
<tr>
<td> <!-- comment these lines while integrating into dokeos -->
</td><td><!--add a col while integrating -->
<b><?php //echo LBL_SEARCH_RECURSIVELY; ?></b>&nbsp;&nbsp;
<b><?php // echo LBL_SEARCH_RECURSIVELY; ?></b>&nbsp;&nbsp;
<!--change for Dokeos recursively by default -->
<!-- <input type="radio" name="search_recursively" value="1" id="search_recursively_1" class="radio" <?php //echo (empty($_GET['search_recursively'])?'checked="checked"':''); ?> /> <?php //echo LBL_RECURSIVELY_YES; ?> -->
<!-- <input type="radio" name="search_recursively" value="0" id="search_recursively_0" class="radio" <?php //echo (!empty($_GET['search_recursively'])?'checked="checked"':''); ?> /> <?php //echo LBL_RECURSIVELY_NO; ?> -->
@ -521,11 +519,11 @@ $(document).ready(
<!--<input type="button" value="<?php // echo LBL_ACTION_CLOSE; ?>" onclick="return cancelSelectFile();" class="button"> -->
</span>
<span class="right" id="linkSearch">
<!-- <input type="button" value="<?php echo BTN_SEARCH; ?>" onclick="return search();" class="search_button"> -->
<input type="button" value="<?php echo BTN_SEARCH; ?>" onclick="return search();" class="search_button">
</span>
</p>
<!-- </fieldset> --><!-- comment these lines while integrating into dokeos -->
</fieldset>
</div>

16
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js
Unescape View File

@ -110,9 +110,10 @@ d=new Date();savEvtTime=d.getTime();savTO=setTimeout(function()
{isSupportedExt=true;break;}}
if(isSupportedExt)
{switch(files[num].cssClass)
{ case 'fileVideo':case 'fileMusic':
{ case 'fileVideo':
case 'fileMusic':
case 'fileFlash':
$('#playGround').html('<a id="playGround' + num + '" href="' + '../'+files[num].path + '"><div id="player">&nbsp;this is mine</div></a> '); $('#playGround' + num).html(''); $('#playGround' + num).media({ width: 255, height: 210, autoplay: true }); showThickBox($('#a' + num).get(0), appendQueryString('#TB_inline', 'height=250' + '&width=256' + '&inlineId=winPlay&modal=true')); break; //Juan Carlos Raña added '../'+ for preview video and flash on href="' + '../'+files[num].path +
$('#playGround').html('<a id="playGround' + num + '" href="' + '../'+files[num].path + '"><div id="player">&nbsp;this is mine</div></a> '); $('#playGround' + num).html(''); $('#playGround' + num).media({ width: 255, height: 210, autoplay: true }); showThickBox($('#a' + num).get(0), appendQueryString('#TB_inline', 'height=250' + '&width=256' + '&inlineId=winPlay&modal=true')); break; //Juan Carlos Raña added for Chamilo '../'+ for preview video and flash on href="' + '../'+files[num].path +
default:
showThickBox(linkElem, appendQueryString('../'+path, 'KeepThis=true&TB_iframe=true&height=' + thickbox.height + '&width=' + thickbox.width));}
}
@ -134,8 +135,9 @@ return false;};function getUrl(index,limitNeeded,viewNeeded,searchNeeded)
{excluded[excluded.length]='limit';queryStr+=(queryStr==''?'':'&')+'limit='+limit.options[limit.selectedIndex].value;}}
if(typeof(viewNeeded)=='boolean'&&viewNeeded)
{queryStr+=(queryStr==''?'':'&')+'view='+getView();excluded[excluded.length]='view';}
//hack for Chamilo change below var search_recursively=0 to var search_recursively=1
if(typeof(searchNeeded)=='boolean'&&searchNeeded&&searchRequired)
{var search_recursively=0;$('input[@name=search_recursively][@checked]').each(function()
{var search_recursively=1;$('input[@name=search_recursively][@checked]').each(function()
{search_recursively=this.value;});var searchFolder=document.getElementById('search_folder');queryStr+=(queryStr==''?'':'&')+'search=1&search_name='+$('#search_name').val()+'&search_recursively='+search_recursively+'&search_mtime_from='+$('#search_mtime_from').val()+'&search_mtime_to='+$('#search_mtime_to').val()+'&search_folder='+searchFolder.options[searchFolder.selectedIndex].value;excluded[excluded.length]='search';excluded[excluded.length]='search_recursively';excluded[excluded.length]='search_mtime_from';excluded[excluded.length]='search_mtime_to';excluded[excluded.length]='search_folder';excluded[excluded.length]='search_name';excluded[excluded.length]='search';}
return appendQueryString(appendQueryString(urls[index],queryString),queryStr,excluded);};function changeView()
{var url=getUrl('view',true,true);$('#rightCol').empty();ajaxStart('#rightCol');$('#rightCol').load(url,{},function(){ajaxStop('#rightCol img.ajaxLoadingImg');urls.present=getUrl('home',true,true);initAfterListingLoaded();});return true;};function goParentFolder()
@ -420,10 +422,14 @@ $('#folderFieldSet').css('display','');$('#fileFieldSet').css('display','none');
if(info.is_writable=='1')
{$('#fileWritable').html("<span class=\"flagYes\"> </span>");}else
{$('#fileWritable').html("<span class=\"flagNo\"> </span>");}
$('#folderFieldSet').css('display','none');$('#fileFieldSet').css('display','');if(typeof(selectFile)!='undefined'&&$('#fileList input[@type=checkbox][@checked]').length==1)
//hack for Chamilo replace this line below for insert/select in browse mode
//$('#folderFieldSet').css('display','none');$('#fileFieldSet').css('display','');if(typeof(selectFile)!='undefined'&&$('#fileList input[@type=checkbox][@checked]').length==1)
$('#folderFieldSet').css('display','none');$('#fileFieldSet').css('display','');if(typeof(selectFile)!='undefined'&&$('#fileList input[@type=checkbox][@checked]').length==1 || $('#rightCol dl.thumbnailListing input[@type=checkbox][@checked]').length==1)
{$('#selectCurrentUrl').unbind('click').click(function()
{selectFile(info.url);});$('#returnCurrentUrl').show();}else
{$('#returnCurrentUrl').hide();}}};function search()
{$('#returnCurrentUrl').hide();}}};
function search()
{searchRequired=true;var url=getUrl('view',true,true,true);$('#rightCol').empty();ajaxStart('#rightCol');$('#rightCol').load(url,{},function(){ajaxStop('#rightCol img.ajaxLoadingImg');initAfterListingLoaded();});return false;};function closeWinPlay()
{tb_remove();$('#playGround').empty();return false;};function closeWindow(msg)
{if(window.confirm(msg))

Write Preview
Loading…
Cancel
Save