Changeset 5038
- Timestamp:
- 09/05/11 17:16:12 (13 years ago)
- Location:
- trunk/filemanager
- Files:
-
- 5 edited
-
inc/class.uifilemanager.inc.php (modified) (4 diffs)
-
inc/class.vfs_functions.inc.php (modified) (1 diff)
-
js/drag_area.js (modified) (2 diffs)
-
js/draw_api.js (modified) (4 diffs)
-
tp/expressowindow/xsl/historyFile.xsl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/filemanager/inc/class.uifilemanager.inc.php
r4284 r5038 337 337 echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/handler.js'></script>"; 338 338 339 //echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/NewHandler.js'></script>";340 341 342 339 // Temas Expresso 343 340 $theme = "window_" . $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . ".css"; … … 529 526 } 530 527 531 function dir_ls() { 528 function dir_ls() 529 { 532 530 // change dir to this->path 533 531 $this->bo->vfs->cd(array('string' => $this->path, 'relatives' => array(RELATIVE_NONE), 'relative' => False)); 534 532 $return['permissions'] = $this->get_permissions(); 535 $return['quota']['usedSpace'] = $this->bo->vfs->get_size(array(533 /*$return['quota']['usedSpace'] = $this->bo->vfs->get_size(array( 536 534 'string' => $this->path, 537 535 'relatives' => array(RELATIVE_NONE) 538 )); 539 $return['files_count'] = $this->bo->vfs->count_files(array(540 'string' => $this->path,541 542 $quota = $this->bo->vfs->get_quota(array(543 'string' => $this->path544 ));536 ));*/ 537 538 $return['quota']['usedSpace'] = $this->bo->vfs->get_size_all( $GLOBALS['phpgw_info']['user']['account_id'] ); 539 $return['files_count'] = $this->bo->vfs->count_files(array( 'string' => $this->path )); 540 541 $quota = $this->bo->vfs->get_quota(array('string' => $this->bo->homedir )); 542 545 543 reset($this->files_array); 546 544 $this->readFilesInfo(); 547 545 548 for ($i = 0; $i != $this->numoffiles; $i++) { 546 for ($i = 0; $i != $this->numoffiles; $i++) 547 { 549 548 $files = $this->files_array[$i]; 550 549 … … 554 553 /* small keys to safe bandwidth */ 555 554 $tuple['name'] = htmlentities($files['name']); 556 if ($_SESSION['phpgw_info']['user']['preferences']['filemanager']['viewIcons'] == 1) { 555 if ($_SESSION['phpgw_info']['user']['preferences']['filemanager']['viewIcons'] == 1) 556 { 557 557 if ($files['mime_type'] == 'image/png' || 558 558 $files['mime_type'] == 'image/gif' || 559 $files['mime_type'] == 'image/jpg') { 559 $files['mime_type'] == 'image/jpg') 560 { 560 561 $filename = str_replace('=', '', base64_encode($tuple['name'])); 561 562 $pathname = str_replace('=', '', base64_encode($this->path)); … … 1000 1001 { 1001 1002 $historyFile[] = array( 1002 "created" => $ journal_entry['created'],1003 "created" => $this->vfs_functions->dateString2timeStamp($journal_entry['created']), 1003 1004 "version" => $journal_entry['version'], 1004 1005 "who" => $GLOBALS['phpgw']->accounts->id2name($journal_entry['owner_id']), -
trunk/filemanager/inc/class.vfs_functions.inc.php
r3924 r5038 134 134 } 135 135 136 function convertDateForm($pDate) 137 { 138 /** 139 * Recebe a data no formato : aaaa-mm-dd 140 * Retorna a data no formato : dd/mm/aaaa 141 **/ 142 143 $cDate = date_parse($pDate); 144 $day = ( strlen($cDate['day']) > 1 ) ? $cDate['day'] : "0".$cDate['day']; 145 $month = ( strlen($cDate['month']) > 1 ) ? $cDate['month'] : "0".$cDate['month']; 146 $year = $cDate['year']; 147 148 return $day."/".$month."/".$year; 149 } 150 136 151 // String format is YYYY-MM-DD HH:MM 137 152 function dateString2timeStamp($string) 138 153 { 139 return mktime($string[11].$string[12], 140 $string[14].$string[15], 141 $string[17].$string[18], 142 $string[5].$string[6], 143 $string[8].$string[9], 144 $string[0].$string[1]. 145 $string[2].$string[3]); 154 /** 155 * Recebe a data no formato : aaaa-mm-dd 156 * Retorna a data no formato : dd/mm/aaaa 157 **/ 158 159 $cDate = date_parse($string); 160 $day = ( strlen($cDate['day']) > 1 ) ? $cDate['day'] : "0".$cDate['day']; 161 $month = ( strlen($cDate['month']) > 1 ) ? $cDate['month'] : "0".$cDate['month']; 162 $year = $cDate['year']; 163 164 return $day."/".$month."/".$year; 146 165 } 147 166 -
trunk/filemanager/js/drag_area.js
r3436 r5038 1 var agt=navigator.userAgent.toLowerCase();2 var is_ie 1 /*var agt = navigator.userAgent.toLowerCase(); 2 var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1)); 3 3 4 function DragArea(){ 4 function DragArea() 5 { 5 6 this.pressed = 0; 6 7 this.resizing = 0; … … 54 55 } 55 56 56 57 var _dragArea = new DragArea(); 57 var _dragArea = new DragArea();*/ -
trunk/filemanager/js/draw_api.js
r3936 r5038 50 50 var pArgs = 51 51 { 52 'lang_created' : get_lang("Created"),52 'lang_created' : get_lang("Created"), 53 53 'lang_operation' : get_lang("Operation"), 54 'lang_version' : get_lang("Version"),55 'lang_who' : get_lang("Who"),56 'lang_history' : get_lang("File history"),57 'height' 54 'lang_version' : get_lang("Version"), 55 'lang_who' : get_lang("Who"), 56 'lang_history' : get_lang("File history"), 57 'height' : 300, 58 58 'path_filemanager' : path_filemanager, 59 59 'width' : 450 … … 87 87 var ACL_PRIVATE = 16; 88 88 89 permissions['read'] =(permission & ACL_READ);90 permissions['add'] =(permission & ACL_ADD);91 permissions['edit'] =(permission & ACL_EDIT);92 permissions['delete'] =(permission & ACL_DELETE);93 permissions['private'] =(permission & ACL_PRIVATE);89 permissions['read'] = (permission & ACL_READ); 90 permissions['add'] = (permission & ACL_ADD); 91 permissions['edit'] = (permission & ACL_EDIT); 92 permissions['delete'] = (permission & ACL_DELETE); 93 permissions['private'] = (permission & ACL_PRIVATE); 94 94 toolbar.load(); 95 95 } … … 150 150 } 151 151 152 var _optionsItens 152 var _optionsItens = document.createElement("div"); 153 153 _optionsItens.id = "fastMenuFileManager"; 154 154 _optionsItens.className = "x-menu"; 155 155 _optionsItens.style.zIndex = zIndex++; 156 156 _optionsItens.innerHTML = _itens; 157 _optionsItens.onclick = function(){ 158 showHidden.hiddenObject(false); 159 }; 160 _optionsItens.onmouseout = function(){ 161 showHidden.hiddenObject(false); 162 }; 163 _optionsItens.onmouseover = function(){ 164 showHidden.hiddenObject(true); 165 }; 157 _optionsItens.onclick = function(){ showHidden.hiddenObject(false); }; 158 _optionsItens.onmouseout = function(){ showHidden.hiddenObject(false); }; 159 _optionsItens.onmouseover = function(){ showHidden.hiddenObject(true); }; 166 160 167 161 showHidden.action('onmouseover', 'onmouseout', _optionsItens); … … 321 315 folderList.prototype.createLine = function(file){ 322 316 var fl = folderList; 323 retBuff = '<tr id="line_'+file.name+'" onmouseout="clearTimeout(menuTimeout)" onmousedown="_dragArea.dragEl=this;_dragArea.operation=\'drag\'">'; 317 //retBuff = '<tr id="line_'+file.name+'" onmouseout="clearTimeout(menuTimeout)" onmousedown="_dragArea.dragEl=this;_dragArea.operation=\'drag\'">'; 318 retBuff = '<tr id="line_'+file.name+'">'; 324 319 retBuff += fl.td; 325 320 retBuff += '<input name="fileman" value="'+file.name+'" type="checkbox"></td>'; -
trunk/filemanager/tp/expressowindow/xsl/historyFile.xsl
r3885 r5038 14 14 <xsl:template match="file"> 15 15 16 <div style="font-size:10pt; margin: 6px;">16 <div style="font-size:10pt; margin: 10px 6px 10px 6px; border-bottom:1px solid #000;"> 17 17 <img src="{$path_filemanager}templates/default/images/button_info.png" style="margin-right: 5px;"/> 18 18 <label style="font-size:12px;font-weight:bold;"> <xsl:value-of select="$lang_history" /></label> 19 19 </div> 20 20 21 <div style='margin:6px; width:{($width)-20}px ; height:{($height)- 40}px; overflow-y: auto; text-align: left;'>21 <div style='margin:6px; width:{($width)-20}px ; height:{($height)-80}px; overflow-y: auto; text-align: left;'> 22 22 <xsl:for-each select="info"> 23 23 <div style="margin-bottom:10px;">
Note: See TracChangeset
for help on using the changeset viewer.
