Changeset 3577

Timestamp:

12/10/10 17:18:39 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1395 - Padronizacao das janelas do filemanager com as do Expresso.

Location:

branches/2.2/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (2 diffs)
• js/draw_api.js (modified) (2 diffs)
• tp/expressowindow/xsl/copy_move_files.xsl (added)

branches/2.2/filemanager/inc/class.uifilemanager.inc.php

@@ -324 +324 @@
 
                         $GLOBALS['phpgw']->common->phpgw_header();
-
+                        
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/global.js'></script>";
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/main.js'></script>";
@@ -349 +349 @@
                         $webserver_url  = $webserver_url . 'filemanager/'; 
                         
-                        $js  = "var path_filemanager    = '".$webserver_url."';";
+                        $js   = "var path_filemanager   = '".$webserver_url."';";
+                        $js      .= "var my_home_filemanager    = '".trim($GLOBALS['uifilemanager']->bo->vfs->my_home)."';";
                         
                         echo "<script type='text/javascript'>".$js."</script>";

branches/2.2/filemanager/js/draw_api.js

@@ -38 +38 @@
 }
 
-function draw_window(htmlData, sizeW, sizeH)
+function draw_window( )
 {
-        if ( sizeW == undefined )
-                var sizeW = 420;
+        if( arguments.length > 0 )
+        {
+                var htmlData    = arguments[0];
+                var sizeW               = ( arguments[1] ) ? arguments[1] : 420 ;
+                var sizeH               = ( arguments[2] ) ? arguments[2] : 200 ;
+                var titleAction = ( arguments[3] ) ? " - " + arguments[3] : "";
+                
+                
+                var _janela = 
+                {
+                        id_window       : "dwindow"+zIndex,
+                        width           : sizeW,
+                        height          : sizeH,
+                        top             : 200,
+                        left            : ( ( screen.width / 2 ) - ( sizeW / 2) ),
+                        draggable       : true,
+                        visible         : "display",
+                        resizable       : true,
+                        zindex          : ++zIndex,
+                        title           : "Expresso - " + get_lang("filemanager") + titleAction,
+                        closeAction     : "remove",
+                        content         : htmlData
+                };
         
-        if ( sizeH == undefined )
-                var sizeH = 200;
-        
-        var _janela = 
-        {
-                id_window       : "dwindow"+zIndex,
-                width           : sizeW,
-                height          : sizeH,
-                top             : 30,
-                left            : 200,
-                draggable       : true,
-                visible         : "display",
-                resizable       : true,
-                zindex          : ++zIndex,
-                title           : get_lang("filemanager"),
-                closeAction     : "hidden",
-                content         : htmlData
-        };
-
-        _winBuild( _janela );
+                _winBuild( _janela );
+        }
         
 }
@@ -550 +553 @@
                 case 'move_to':
                 case 'copy_to':
+                        
                         var filesUrl = this.getCheckedFiles();
-                        if (filesUrl == undefined)
-                                return;
-                        var code = "";
-                        for(i=0; i< folders.length; i++)
+                        
+                        if ( filesUrl != undefined)
                         {
-                                address = document.location.toString();
-                                address = address.split("&");
-                                code += "<a href=\"javascript:"+escape(arg)+"('"+folders[i]+"','"+filesUrl+"'); close_window();\">";
-                                code += folders[i]+"</a><br>";
-
+                                DocY -= ( folders.length * 30 );
+                                
+                                var action = ( ( arg == 'move_to') ? get_lang('move to:') : get_lang('copy to:') );
+                                
+                                if( Xtools == null )
+                                        Xtools = new xtools( path_filemanager + "tp/expressowindow/" );
+                                
+                                var _xml        = Xtools.xml('files');
+                                var _files      = _xml.documentElement; 
+                                var _links      = _xml.createElement('links');
+                                
+                                for( var i = 0 ; i < folders.length ; i++ )
+                                {       
+                                        var _lk = _xml.createElement('lk');
+                                                _lk.setAttribute('function', "javascript:"+escape(arg)+"('"+folders[i]+"','"+filesUrl+"'); close_window();" );
+                                                _lk.appendChild( _xml.createTextNode( folders[i].replace( my_home_filemanager , "Minha Pasta" ) ) );
+                                                _links.appendChild( _lk );
+                                }
+                                
+                                _files.appendChild( _links );
+
+                                var img_1 = path_filemanager + "templates/default/images/button_copy_to.png";
+                                var img_2 = path_filemanager + "templates/default/images/button_move_to.png";
+                                var img_3 = templatePath+"images/group_close.gif";      
+                                
+                                var pArgs = 
+                                {
+                                        'action'        : action,
+                                        'img'           : ( ( arg == 'move_to') ? img_2 : img_1 ),
+                                        'img_1'         : img_3,
+                                        'width'         : 380,
+                                        'height'        : 200
+                                };
+                                
+                                var code = Xtools.parse( _files, "copy_move_files.xsl", pArgs );
+
+                                draw_window( code , 380, 200 );
                         }
-                        DocY -= (folders.length*30);
-                        draw_window(code);
 
                         break;