Changeset 3006 for trunk

Timestamp:

07/06/10 18:04:21 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1133 - Ajustando o item Help da janela de contatos do Novo Modulo IM, seguindo assim o padrao do Expresso.

Location:

trunk/jmessenger

Files:

• inc/jabberit_acl.inc.php (modified) (2 diffs)
• js/jscode/loadIM.js (modified) (1 diff)
• xsl/contactsList.xsl (modified) (2 diffs)

trunk/jmessenger/inc/jabberit_acl.inc.php

@@ -40 +40 @@
                         $webserver_url .= '/';
 
-                $webserver_url = $webserver_url . 'jmessenger/'; 
+                $help_expresso  = $webserver_url .'help';
+                $webserver_url  = $webserver_url . 'jmessenger/'; 
                 
                 require_once PHPGW_SERVER_ROOT . '/jmessenger/inc/jabberit_sessions.inc.php';
@@ -55 +56 @@
                 $fullName       = $_SESSION['phpgw_info']['jabberit_messenger']['fullname'];
 
-                $js  = "var path_jabberit='".$webserver_url."';";
-                $js .= "var theme_jabberit='".$theme."';";
+                $js  = "var path_jabberit       ='".$webserver_url."';";
+                $js .= "var theme_jabberit      ='".$theme."';";
+                $js .= "var help_expresso       ='".$help_expresso."';";
 
                 // Preferences User

trunk/jmessenger/js/jscode/loadIM.js

@@ -815 +815 @@
                                 'full_name'             : (( fullName.length < 25 ) ? fullName : ( fullName.substring( 0, 25) + "...")),
                                 'path_jabberit' : path_jabberit,
+                                'help_expresso' : help_expresso,
                                 'zIndex_'               : zIndex++
                         };

trunk/jmessenger/xsl/contactsList.xsl

@@ -5 +5 @@
         <xsl:param name="idUser"/>
         <xsl:param name="full_name" />
+        <xsl:param name="help_expresso" />
         <xsl:param name="path_jabberit" />
         <xsl:param name="zIndex_" />
@@ -22 +23 @@
                                 <img style="height:15px; margin-left:10px;cursor:pointer;" alt="Minhas Preferências" title="Minhas Preferências" src="{$path_jabberit}templates/default/images/preferences.png" onclick="loadscript.preferences();"/>
                                 
-                                <img style="height:16px; margin-left:10px;cursor:pointer;" alt="Help" title="Help" src="{$path_jabberit}templates/default/images/help.png" onclick="alert('2');" />
+                                <img style="height:16px; margin-left:10px;cursor:pointer;" alt="Help" title="Help" src="{$path_jabberit}templates/default/images/help.png" onclick="javascript:openWindow(480,510,'{$help_expresso}');" />
                         
                         </div>