Changeset 4459
- Timestamp:
- 05/19/11 14:52:35 (13 years ago)
- Location:
- branches/2.2.0.1/calendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php
r4432 r4459 5986 5986 } 5987 5987 5988 $edit_js_path = 'calendar/templates/'.$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set']; 5989 if (!file_exists($GLOBALS['phpgw_info']['server']['webserver_url'].$edit_js_path.'/js/edit.js')) 5990 $edit_js_path = 'calendar'; 5991 5988 5992 $var['participants'] = array 5989 5993 ( 5990 5994 'field' => ' 5991 <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\'>5995 <script src="'.$edit_js_path.'/js/edit.js" type="text/javascript"></script><div id=\'disponibility\' style=\'display:none;position:absolute\' bgcolor=\'#FFFFFF\'> 5992 5996 <iframe src=\'#\' id=\'frame_disponibility\' width=\'500\' marginHeight=\'0\' marginWidth=\'0\' height=\'200px\'></iframe> 5993 5997 </div> … … 6226 6230 6227 6231 if ($event['attachment'] == '' || $event['attachment'] == 'ERROR' || is_array($event['attachment'])) 6228 $data = '<a onClick="javascript:addAttach()" href="#divFiles" >Anexos: adicionar+</a><div id="divFiles" </div>';6232 $data = '<a onClick="javascript:addAttach()" href="#divFiles" >Anexos: adicionar+</a><div id="divFiles"></div>'; 6229 6233 else 6230 6234 $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
r923 r4459 24 24 25 25 $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu'); 26 27 $publicview_php_template_path = $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']; 28 if (!file_exists($GLOBALS['phpgw_info']['server']['webserver_url'].'/calendar/templates/'.$publicview_php_template_path.'/publicView.php')) 29 $publicview_php_template_path = 'default'; 30 26 31 $file = Array( 27 32 'New Entry' => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.add'), … … 36 41 'Import'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import'), 37 42 'Report of hours'=>$GLOBALS['phpgw']->link('/calendar/inc/hourReport.php',''), 38 'Public Calendars'=> "javascript:openwindow('calendar/templates/".$ GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']."/publicView.php')"43 'Public Calendars'=> "javascript:openwindow('calendar/templates/".$publicview_php_template_path."/publicView.php')" 39 44 ); 40 45 display_sidebox($appname,$menu_title,$file); -
branches/2.2.0.1/calendar/templates/default/edit.tpl
r3966 r4459 12 12 13 13 function addAttach(){ 14 14 var divFiles = document.getElementById("divFiles"); 15 15 if (! divFiles) 16 16 return false;
Note: See TracChangeset
for help on using the changeset viewer.