Changeset 4459 for branches

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

Location:

branches/2.2.0.1/calendar

Files:

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

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>';

branches/2.2.0.1/calendar/inc/hook_sidebox_menu.inc.php

@@ -24 +24 @@
 
         $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
+
+        $publicview_php_template_path = $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'];
+        if (!file_exists($GLOBALS['phpgw_info']['server']['webserver_url'].'/calendar/templates/'.$publicview_php_template_path.'/publicView.php'))
+                $publicview_php_template_path = 'default';
+
         $file = Array(
                 'New Entry'   => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.add'),
@@ -36 +41 @@
                 'Import'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import'),
                 'Report of hours'=>$GLOBALS['phpgw']->link('/calendar/inc/hourReport.php',''),
-                'Public Calendars'=> "javascript:openwindow('calendar/templates/".$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']."/publicView.php')"
+                'Public Calendars'=> "javascript:openwindow('calendar/templates/".$publicview_php_template_path."/publicView.php')"
         );
         display_sidebox($appname,$menu_title,$file);

branches/2.2.0.1/calendar/templates/default/edit.tpl

@@ -12 +12 @@
 
         function addAttach(){
-            divFiles = document.getElementById("divFiles");
+                        var divFiles = document.getElementById("divFiles");
             if (! divFiles)
                     return false;