Changeset 1791

Timestamp:

12/08/09 13:42:25 (14 years ago)

Author:

amuller

Message:

Ticket #806 - Melhorias no módulos gerenciador de arquivos do expresso livre

Location:

sandbox/filemanager

Files:

• inc/class.uiconfig.inc.php (modified) (1 diff)
• inc/class.uifilemanager.inc.php (modified) (2 diffs)
• js/common_functions.js (modified) (2 diffs)
• js/draw_api.js (modified) (2 diffs)
• js/global.js (modified) (1 diff)

sandbox/filemanager/inc/class.uiconfig.inc.php

@@ -69 +69 @@
                          ));
 
-                         /* Clean the trash */
+                         /* Clean the log */
                          $GLOBALS['phpgw']->db->query('DELETE FROM phpgw_vfs WHERE directory = \''.$name.'\'',__LINE__,__FILE__);
                          if ($GLOBALS['phpgw']->db->Error)

sandbox/filemanager/inc/class.uifilemanager.inc.php

@@ -452 +452 @@
                         if($this->path != $this->bo->homedir && $this->path != $this->bo->fakebase && $this->path != '/' && !$this->can_read)
                         {
-                                echo lang('You do not have access to %1', $this->path);
-                                $this->html_link('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->homedir, lang('Go to your home directory'));
-
+                                $this->messages[] = lang('You do not have access to %1', $this->path);
+                                $this->path = $this->homedir;
+                                $this->bo->vfs->cd(array('string' => $this->path, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
                                 $GLOBALS['phpgw']->common->phpgw_footer();
                                 $GLOBALS['phpgw']->common->phpgw_exit();
@@ -471 +471 @@
                                 {
                                         $this->messages[] = lang('Error:').lang('Directory %1 does not exist', $this->path);
-                                        $this->html_link('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->bo->homedir, lang('Go to your home directory'));
-
+                                        $this->path = $this->homedir;
+                                        $this->bo->vfs->cd(array('string' => $this->path, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
                                         $GLOBALS['phpgw']->common->phpgw_footer();
                                         $GLOBALS['phpgw']->common->phpgw_exit();

sandbox/filemanager/js/common_functions.js

@@ -168 +168 @@
 }
 
-function enterComments(e,id){
-        if (e.keyCode == 13) //Enter
-                document.getElementById(id).blur();
+function enterComments(e,el){
+        if (e.keyCode == KEY_ENTER)
+                el.blur();
 }
 
@@ -215 +215 @@
                 nameLink.innerHTML = returnVal[2];
                 nameLink.href="./index.php?menuaction=filemanager.uifilemanager.view&file="+base64_encode(returnVal[2])+"&path="+base64_encode(currentPath);
+                nameLink.target = "_blank";
                 nameLink.id = "name_"+returnVal[2];
                 

sandbox/filemanager/js/draw_api.js

@@ -271 +271 @@
                 if (preferences.createdby_id =='1') retBuff += fl.td+file.creatdby+'</td>';
                 if (preferences.modifiedby_id =='1') retBuff += fl.td+file.modifdby+'</td>';
-                if (preferences.comment =='1') retBuff += fl.td+'<input id="'+file.name+'" class="inputComment" onkeydown="enterComments(event,\''+file.name+'\')" onclick="presetComments(this)" onblur="setComments(this)" value="'+file.comm+'" alt="'+get_lang('Click to change comments')+'" title="'+get_lang('Click to change comments')+'"></input></td>';
+                if (preferences.comment =='1') retBuff += fl.td+'<input id="'+file.name+'" class="inputComment" onkeydown="enterComments(event,this)" onclick="presetComments(this)" onblur="setComments(this)" value="'+file.comm+'" alt="'+get_lang('Click to change comments')+'" title="'+get_lang('Click to change comments')+'"></input></td>';
                 if (preferences.version =='1') retBuff += fl.td+'<span onclick="loadHistory(\''+file.name+'\')">'+file.vers+'</span></td>';
                 return retBuff;
@@ -409 +409 @@
                                         inputName.value = filename;
                                         inputName.onblur = function () { cExecute('./index.php?menuaction=filemanager.vfs_functions.rename&file='+base64_encode(this.id.substr(6))+'&to='+base64_encode(this.value)+"&path="+base64_encode(currentPath),handlerRename) };
+                                        inputName.onkeydown=function (event) {if (event.keyCode == KEY_ENTER) this.blur(); };
                                         nameLink.parentNode.appendChild(inputName);
                                         nameLink.parentNode.removeChild(nameLink);

sandbox/filemanager/js/global.js

@@ -19 +19 @@
 var permissions = new Array();
 var preferences = new Array();
+
+var KEY_ENTER = 13;