Changeset 1530 for trunk/jabberit_messenger/inc

Timestamp:

10/27/09 14:17:10 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #370 - Melhoria do layout das janelas, para criação de preferencia(on/offline).

Location:

trunk/jabberit_messenger/inc

Files:

• controller.xml (modified) (2 diffs)
• jabberit_acl.inc.php (modified) (3 diffs)
• webservice.php (modified) (1 diff)

trunk/jabberit_messenger/inc/controller.xml

@@ -17 +17 @@
         <controller-sections>
                 <css></css>
-                <js path="/var/www/expresso/jabberit_messenger/js" suffix=".js" debug="false">
+                <js path="/var/www/expresso/jabberit_messenger/js" suffix=".js" debug="true">
                         <item ref="connector" js="connector" />
-                        <item ref="dragdrop" js="dragdrop" />
                         <item ref="editSelect" js="editSelect" />
                         <item ref="glocked" js="glocked" />                     
@@ -26 +25 @@
                         <item ref="load" js="load" />
                         <item ref="show_hidden" js="show_hidden" />
-                        <item ref="setup" js="setup" path="/var/www/expresso/jabberit_messenger/templates/default"/>
+                        <item ref="setup" js="setup" path="/var/www/expresso/jabberit_messenger/templates/default" />
                         <item ref="xtools" js="xtools" />
-                        <item ref="windows" js="windows" />
+                        <item ref="jsloader" js="jsloader" />
+                        <item ref="makeW" js="makeW" />
                 </js>
                 <php path="/var/www/expresso/jabberit_messenger/inc" suffix=".class.php">

trunk/jabberit_messenger/inc/jabberit_acl.inc.php

@@ -48 +48 @@
                 require_once dirname(__FILE__) . '/load_lang.php';
                 
-                $var_js  = "var path_jabberit='".$webserver_url."';";
+                $js  = "var path_jabberit='".$webserver_url."';";
+                $js .= "var _ZINDEX='990000'; ";        
 
-                echo "<script type=\"text/javascript\">".$var_js."</script>";
-
+                echo "<script type=\"text/javascript\">".$js."</script>";
+                
                 $js = array(
-                                'connector',
-                                'xtools',
-                                'dragdrop',
-                                'windows',      
-                                'ldap',
-                                'images',
-                                'show_hidden',
-                                'load',
-                                'editSelect'
-                                );
+                                        'j.connector',
+                                        'j.xtools',
+                                        'j.ldap',
+                                        'j.images',
+                                        'j.show_hidden',
+                                        'j.load',
+                                        'j.editSelect',
+                                        'j.jsloader',
+                                        'j.makeW'
+                                        );
 
                 require_once dirname(__FILE__) . '/Controller.class.php';
@@ -68 +69 @@
                 $controller = new Controller;
                 $script = '';
+                
                 foreach( $js as $key => $val ) 
                 {
-                        $val = array('act' => 'j.' . $val );
-                        $script .= $controller->exec($val);
+                        $script .= $controller->exec(array('act' => $val));
                 }       
                 
+                $theme = "window_" . $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . ".css";
+
+                if( !file_exists('../jabberit_messenger/templates/default/css/'.$theme) )
+                        $theme = "window_default.css";
+                
+                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/'.$theme.'" >';
+                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/common.css" >';
+                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/selectEditStyle.css" >';                
+
                 printf("<script type=\"text/javascript\">%s</script>", $script);
-                
-                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/window.css">';
-                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/common.css">';
-                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/selectEditStyle.css">';         
 
                 break;
@@ -84 +90 @@
         
 }
+
 ?>

trunk/jabberit_messenger/inc/webservice.php

@@ -301 +301 @@
                         $uid = substr($pUid, 0, strpos($pUid, "@"));
                 
+                require_once("../../header.session.inc.php");
+                
                 if( isset($_SESSION['phpgw_info']['jabberit_messenger']['photo'][$pOu][$uid]) )
                 {