Changeset 2496

Timestamp:

04/13/10 11:53:20 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Correção de problemas no ExpressoCalendar? ao carregar o script 'edit.js'.

Location:

trunk/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (2 diffs)
• templates/classic/listUsers.php (modified) (1 diff)
• templates/classic/listUsers.tpl (modified) (1 diff)
• templates/default/listUsers.php (modified) (1 diff)

trunk/calendar/inc/class.uicalendar.inc.php

@@ -5128 +5128 @@
                                                                                 </tr>
                                                                                 </table>
-                                                                                <script src='calendar/js/edit.js' type='text/javascript'></script>
+                                                                                <script src='{$GLOBALS['phpgw'] -> link( '/calendar' )}/js/edit.js' type='text/javascript'></script>
                                                                         "
                                                 );
@@ -5179 +5179 @@
                                                                 (
                                                                         'field' => '
-                                                                        <script src="calendar/templates/'.$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set'].'/js/edit.js" type="text/javascript"></script><div id=\'disponibility\' style=\'display:none;position:absolute\' bgcolor=\'#FFFFFF\'>
+                                                                        <script src="'.$GLOBALS['phpgw'] -> link( '/calendar' ).'/js/edit.js" type="text/javascript"></script><div id=\'disponibility\' style=\'display:none;position:absolute\' bgcolor=\'#FFFFFF\'>
         <iframe src=\'#\' id=\'frame_disponibility\' width=\'500\' marginHeight=\'0\' marginWidth=\'0\' height=\'200px\'></iframe>
 </div>

trunk/calendar/templates/classic/listUsers.php

@@ -21 +21 @@
         // seta o Template
         $t->set_file(array('addUser_t' => '../../../calendar/templates/classic/listUsers.tpl'));
-        
+
+        $obj_account = CreateObject('phpgwapi.accounts',$this->bo->owner);
+
         $obj_account = CreateObject('phpgwapi.accounts',$owner);
 

trunk/calendar/templates/classic/listUsers.tpl

@@ -48 +48 @@
         </body>
 </html>
-<script src="../../js/edit.js" type="text/javascript"></script>
+<script src="{url}/js/edit.js" type="text/javascript"></script>

trunk/calendar/templates/default/listUsers.php

@@ -30 +30 @@
         // seta o Template
         $t->set_file(array('addUser_t' => '../../../calendar/templates/default/listUsers.tpl'));
-        
+
+        $t -> set_var( 'url', $GLOBALS[ 'phpgw' ] -> link( '/calendar' ) );
+
         $obj_account = CreateObject('phpgwapi.accounts',$this->bo->owner);