Changeset 2007

Timestamp:

02/11/10 17:22:12 (14 years ago)

Author:

amuller

Message:

Ticket #907 - Fechamento do ticket com correção e melhorias

Location:

trunk/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (1 diff)
• inc/hook_add_def_pref.inc.php (modified) (1 diff)
• inc/hook_settings.inc.php (modified) (2 diffs)
• js/draw_api.js (modified) (7 diffs)
• js/global.js (modified) (1 diff)
• preferences.php (deleted)

trunk/filemanager/inc/class.uifilemanager.inc.php

@@ -520 +520 @@
                                 $files = $this->files_array[$i];
 
-                                if($files['mime_type'] == "Directory" || (!$this->prefs['dotfiles'] && ereg("^\.", $files['name'])))
+                                if($files['mime_type'] == "Directory")
                                 {
                                         continue;

trunk/filemanager/inc/hook_add_def_pref.inc.php

@@ -16 +16 @@
 //$pref->change ("filemanager", "viewonserver", "False");
 $pref->change ("filemanager", "viewtextplain", True);
-//$pref->change ("filemanager", "dotdot", "False");
-//$pref->change ("filemanager", "dotfiles", "False");
 //$pref->change ("filemanager", "show_help", "False");
 $pref->change ("filemanager", "show_upload_boxes", "5");

trunk/filemanager/inc/hook_settings.inc.php

@@ -13 +13 @@
         //ExecMethod('filemanager.bofilemanager.check_set_default_prefs');
 
-        /*create_section('TESTING');
+        create_section('Display attributes');
 
-        create_check_box('Use new experimental Filemanager?','experimental_new_code','The future filemanager, now for TESTING PURPOSES ONLY, please send bugreports');
-
-        */
-        create_section('Display attributes');
+        $size=array(
+                "10"=>"10",
+                "25"=>"25",
+                "50"=>"50",
+                "100"=>"100",
+                "200"=>"200"
+        );
+        create_select_box('Number of files per pager','files_per_page',$size);
 
         $file_attributes = Array(
@@ -43 +47 @@
 
         $other_checkboxes = array (
-                "viewinnewwin" => "View documents in new window", 
-                "viewonserver" => "View documents on server (if available)", 
-                "viewtextplain" => "Unknown MIME-type defaults to text/plain when viewing", 
-                "dotdot" => "Show ..", 
-                "dotfiles" => "Show .files", 
+                "viewtextplain" => "Unknown MIME-type defaults to text/plain when viewing"
         );
 

trunk/filemanager/js/draw_api.js

@@ +1 @@
+var offset;
 
 function getPointer(e) {
@@ -153 +154 @@
 
         loadPreferences();
+        filesperpage = preferences.files_per_page; 
+        offset = (current_page-1)*preferences.files_per_page;
+
         currentPath = document.getElementById('currentPath').value;
         document.getElementById('divAppboxHeader').innerHTML = title_app;
@@ -545 +549 @@
                         last_folder = last_folder ? last_folder : currentPath;
                         current_folder = current_folder ? current_folder : currentPath;
-                        cExecute('./index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+filesperpage+'&offset='+offset,folderList.drawFiles);
+                        cExecute('./index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+preferences.files_per_page+'&offset='+offset,folderList.drawFiles);
                         return;
                 case 'tools':
@@ -679 +683 @@
         }
 
-        if(num_files > parseInt(filesperpage)) {
-                total_pages = parseInt(num_files/filesperpage);
-                if((num_files/filesperpage) > total_pages)
+        if(num_files > parseInt(preferences.files_per_page)) {
+                total_pages = parseInt(num_files/preferences.files_per_page);
+                if((num_files/preferences.files_per_page) > total_pages)
                         total_pages++;
         }
@@ -703 +707 @@
         span_paging.innerHTML="";
         files_range_begin = 1;
-        files_range_end = filesperpage;
+        files_range_end = preferences.files_per_page;
         if(current_page != 1) {
                 lnk_page = document.createElement("A");
@@ -743 +747 @@
                         lnk_page = document.createElement("A");
                         span_paging.appendChild(lnk_page);
-                        files_range_begin = ((i*filesperpage)-(filesperpage-1));
-                        files_range_end = (i*filesperpage);
-                        lnk_page.setAttribute("href", "javascript:current_page="+i+";offset=((current_page-1)*filesperpage);toolbar.control('reload');");
+                        files_range_begin = ((i*preferences.files_per_page)-(preferences.files_per_page-1));
+                        files_range_end = (i*preferences.files_per_page);
+                        lnk_page.setAttribute("href", "javascript:current_page="+i+";offset=((current_page-1)*preferences.files_per_page);toolbar.control('reload');");
                }
 
@@ -760 +764 @@
         if(current_page != total_pages) {
                 lnk_page = document.createElement("A");
-                files_range_begin = ((total_pages*filesperpage)-(filesperpage-1));
-                files_range_end = (total_pages*filesperpage);
-                lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";offset=((current_page-1)*filesperpage);toolbar.control('reload');");
+                files_range_begin = ((total_pages*preferences.files_per_page)-(preferences.files_per_page-1));
+                files_range_end = (total_pages*preferences.files_per_page);
+                lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";offset=((current_page-1)*preferences.files_per_page);toolbar.control('reload');");
         }
         else {

trunk/filemanager/js/global.js

@@ -34 +34 @@
 var lastPage = lastPage ? lastPage : 1;
 var numPages = numPages ? numPages : 5;
-var filesperpage = 10;
-var offset = (current_page-1)*filesperpage;