From a2d910b4b5d2c6f3950c816fa7eb19541cdac4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Thu, 5 Nov 2009 14:11:14 +0100 Subject: [PATCH 1/3] hide radio button recursively, now alltime is on --- .../editor/plugins/ajaxfilemanager/ajaxfilemanager.php | 4 +--- .../plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php index 708828a31a..88f86c4828 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php @@ -502,10 +502,8 @@ $(document).ready(    - /> + - - diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js index fa86d46786..8f8ff54429 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js @@ -140,8 +140,8 @@ return false;}; function getUrl(index,limitNeeded , viewNeeded, searchNeeded) } if(typeof(viewNeeded) == 'boolean' && viewNeeded) { queryStr += (queryStr == ''?'':'&') + 'view=' + getView(); excluded[excluded.length] = 'view';} -if(typeof(searchNeeded) == 'boolean' && searchNeeded && searchRequired) -{ var search_recursively = 0; $('input[@name=search_recursively][@checked]').each( function() +if(typeof(searchNeeded) == 'boolean' && searchNeeded && searchRequired) // Below a temporal hack for Dokeos, change var search_recursively from = 0 to = 1 while radio button is deactivated into ajaxfilemanager.php Now alltime is recursively +{ 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();});}; function goParentFolder() From f00055a19162323d2ba7054d7b33fce4ef006c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Thu, 5 Nov 2009 14:45:53 +0100 Subject: [PATCH 2/3] a temporal deactivation for pagination while is fixed --- .../ajaxfilemanager/_ajax_get_details_listing.php | 12 ++++++------ .../ajaxfilemanager/ajax_get_file_listing.php | 2 +- .../plugins/ajaxfilemanager/ajaxfilemanager.php | 2 +- .../plugins/ajaxfilemanager/inc/config.base.php | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/_ajax_get_details_listing.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/_ajax_get_details_listing.php index 65d4496af4..56c3c8f8b7 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/_ajax_get_details_listing.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/_ajax_get_details_listing.php @@ -7,7 +7,7 @@   - + @@ -25,7 +25,7 @@ $strClass = ($file['is_writable']?"left":" leftDisabled"); ///First step for hidden some type of Dokeos files and folders - //Juan Carlos Ra�a + //Juan Carlos Raña //hidden files and folders deleted by Dokeos. Hidde folders css, hotpotatoes, chat_files $deleted_by_dokeos_file=' DELETED '; // ' DELETED ' not '_DELETED_' because in $file['name'] _ is replaced with blank see class.manager.php @@ -52,7 +52,7 @@ $shared_folder='shared folder'; //'shared folder' not 'shared_folder' because in $file['name'] _ is replaced with blank see class.manager.php ///Second step: hiding as the case - //Juan Carlos Ra�a + //Juan Carlos Raña if((!ereg($deleted_by_dokeos_file, $file['name']) || !ereg($deleted_by_dokeos_folder, $file['path'])) && !ereg($css_folder_dokeos, $file['path']) && !ereg($hotpotatoes_folder_dokeos, $file['path']) && !ereg($chat_files_dokeos, $file['path']) && $show_doc_group==true && $file['name'][0]!='.') { @@ -62,11 +62,11 @@ ?>   /> -  " target="_blank">  +  " target="_blank">  " target="_blank"> - + docName" id="tdnd">" target="_blank">   - + setNextText(PAGINATION_NEXT); $pagination->setLastText(PAGINATION_LAST); $pagination->setLimit(!empty($_GET['limit'])?intval($_GET['limit']):CONFIG_DEFAULT_PAGINATION_LIMIT); - echo $pagination->getPaginationHTML(); + //echo $pagination->getPaginationHTML(); // temporal comment while is fixed pagination integration on Dokeos ///////Dokeos fix for count hidden folders $count_hideItem =0; diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php index 88f86c4828..c1388d6036 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php @@ -512,7 +512,7 @@ $(document).ready(

diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php index 711478ec1f..06e469147d 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php @@ -195,7 +195,7 @@ define('CONFIG_EDITOR_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['editor'])?secureFileName($_GET['editor']):'fckeditor')); // run mode fckeditor (Dokeos editor) define('CONFIG_THEME_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['theme'])?secureFileName($_GET['theme']):'default')); //change the theme to your custom theme rather than default define('CONFIG_DEFAULT_VIEW', (CONFIG_SYS_THUMBNAIL_VIEW_ENABLE?'thumbnail':'detail')); //thumbnail or detail - define('CONFIG_DEFAULT_PAGINATION_LIMIT', 10); + define('CONFIG_DEFAULT_PAGINATION_LIMIT', 10000); //change 10 by 10000 while pagination is deactivated on Dokeos define('CONFIG_LOAD_DOC_LATTER', false); //all documents will be loaded up after the template has been loaded to the client From bf795ea62446160e39c929855d0b8d5992c7b4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Thu, 5 Nov 2009 19:24:40 +0100 Subject: [PATCH 3/3] improve the visibility of mini breadcrumb --- .../editor/plugins/ajaxfilemanager/ajaxfilemanager.php | 7 ++++--- .../ajaxfilemanager/theme/default/css/fckeditor.css | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php index c1388d6036..cf36bf108e 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php @@ -214,7 +214,7 @@ $(document).ready(