Changeset 4459 for branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php

Timestamp:

05/19/11 14:52:35 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1895 - dinamizar utilização de edit.js, publicView.php - corrigir erro em addAttach no IE

File:

• branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php (modified) (2 diffs)

branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php

@@ -5986 +5986 @@
                                                                 }
 
+                                                                $edit_js_path = 'calendar/templates/'.$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set'];
+                                                                if (!file_exists($GLOBALS['phpgw_info']['server']['webserver_url'].$edit_js_path.'/js/edit.js'))
+                                                                        $edit_js_path = 'calendar';
+
                                                                 $var['participants'] = array
                                                                 (
                                                                         '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="'.$edit_js_path.'/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>
@@ -6226 +6230 @@
 
                         if ($event['attachment'] == '' || $event['attachment'] == 'ERROR' || is_array($event['attachment']))
-                            $data =  '<a onClick="javascript:addAttach()" href="#divFiles" >Anexos: adicionar+</a><div id="divFiles"</div>';
+                            $data =  '<a onClick="javascript:addAttach()" href="#divFiles" >Anexos: adicionar+</a><div id="divFiles"></div>';
                         else
                             $data = '<input type="hidden" name="cal[attachment]" value='.$event["attachment"].'>'.lang('Notification with attachments sent.').'<br><a onClick="javascript:addAttach()" href="#divFiles" >Anexos: adicionar+</a><div id="divFiles"</div>';