Changeset 3568

Timestamp:

12/07/10 15:11:58 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1395 - Corrigido o path para o carregamento dinamico dos temas setados nas preferencias.

Location:

branches/2.2/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (1 diff)
• tp/expressowindow/js/makeW.js (modified) (2 diffs)

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

@@ -333 +333 @@
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/handler.js'></script>";
 
+
+                        // Temas Expresso
+                        $theme = "window_" . $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . ".css";
+
+                        if( !file_exists('filemanager/tp/expressowindow/css/'.$theme) )
+                                $theme = "window_default.css";
+
+                        // Path FileManager
+                        $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
+                        $webserver_url = ( !empty($webserver_url) ) ? $webserver_url : '/';
+                
+                        if(strrpos($webserver_url,'/') === false || strrpos($webserver_url,'/') != (strlen($webserver_url)-1))
+                                $webserver_url .= '/';
+                
+                        $webserver_url  = $webserver_url . 'filemanager/'; 
+                        
+                        $js  = "var path_filemanager    = '".$webserver_url."';";
+                        $js .= "var theme_filemanager   = '".$theme."';";
+                        
+                        echo "<script type='text/javascript'>".$js."</script>";
+
                         /*Expresso Window*/
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/xtools.js'></script>";

branches/2.2/filemanager/tp/expressowindow/js/makeW.js

@@ -3 +3 @@
         var _xtools             = null;
         var dragDrop    = null;
-        var path                = "/filemanager/tp/expressowindow/";
+        var path                = path_filemanager + "tp/expressowindow/";
         
         function build(pObj)
@@ -81 +81 @@
                         if( arguments.length == 1 )
                         {
-                                JSLoader.load([path + "js/xtools.js"]);
-                                JSLoader.load([path + "js/dragdrop.js"]);
-                                JSLoader.load([path + "css/window_azul.css"]);
-                                //JSLoader.load([path + "css/window_cataratas.css"]);
-                                //JSLoader.load([path + "css/window_celepar.css"]);
-                                //JSLoader.load([path + "css/window_comics.css"]);
-                                //JSLoader.load([path + "css/window_default.css"]);
-                                //JSLoader.load([path + "css/window_escritorio.css"]);
-                                //JSLoader.load([path + "css/window_metropole.css"]);
-                                //JSLoader.load([path + "css/window_rochas.css"]);
+                                JSLoader.load([path + "css/" + theme_filemanager]);
                                 
                                 var obj = arguments[0];