Changeset 3569 for branches/2.2/filemanager/inc/class.uifilemanager.inc.php

Timestamp:

12/09/10 16:47:45 (13 years ago)

Author:

alexandrecorreia

Message:

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

File:

• branches/2.2/filemanager/inc/class.uifilemanager.inc.php (modified) (2 diffs)

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

@@ -350 +350 @@
                         
                         $js  = "var path_filemanager    = '".$webserver_url."';";
-                        $js .= "var theme_filemanager   = '".$theme."';";
                         
                         echo "<script type='text/javascript'>".$js."</script>";
 
-                        /*Expresso Window*/
+                        // Expresso Window - CSS
+                        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'tp/expressowindow/css/'.$theme.'" >';
+
+                        // Expresso Window - JS 
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/xtools.js'></script>";
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/jsloader.js'></script>";
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/makeW.js'></script>";
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/dragdrop.js'></script>";
+                        echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/show_hidden.js'></script>";
 
                         echo "<script src='./phpgwapi/js/dftree/dftree.js'></script>";
@@ -1354 +1357 @@
                         if($img)
                         {
-                                return '<span name="'.$link.'" class="toolButton" onclick="toolbar.control(\''.$link.'\');" title="'.$description.'"><img src="'.$image.'" alt="'.$description.'"/></a><small>'.$description.'</small></span>';
+                                return '<span name="'.$link.'" class="toolButton" onclick="toolbar.control(\''.$link.'\',this);" title="'.$description.'"><img src="'.$image.'" alt="'.$description.'"/></a><small>'.$description.'</small></span>';
                         }
                 }