[Phpgroupware-cvs] phpgwapi/inc class.jscalendar.inc.php, 1.1.2.6, 1.1.2.7

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv6116

Modified Files:
      Tag: Version-0_9_16-branch
        class.jscalendar.inc.php 
Log Message:
minor fixes


Index: class.jscalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.jscalendar.inc.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** class.jscalendar.inc.php    17 Nov 2003 13:48:23 -0000      1.1.2.6
--- class.jscalendar.inc.php    1 Dec 2003 00:15:14 -0000       1.1.2.7
***************
*** 30,43 ****
        function jscalendar($do_header=True)
        {
                $this->phpgw_js_url = 
$GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js';
                $this->dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
  
!               if ($do_header && 
!strstr($GLOBALS['phpgw_info']['flags']['java_script'],'jscalendar'))
                {
!                       $GLOBALS['phpgw_info']['flags']['java_script'] .=
! '<link rel="stylesheet" type="text/css" media="all" 
href="'.$this->phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css" 
title="win2k-cold-1" />
! <script type="text/javascript" 
src="'.$this->phpgw_js_url.'/jscalendar/calendar.js"></script>
! <script type="text/javascript" 
src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$GLOBALS['phpgw']->link('/phpgwapi/js/jscalendar/jscalendar-setup.php')).'"></script>
! ';
                }
        }
--- 30,50 ----
        function jscalendar($do_header=True)
        {
+               $GLOBALS['phpgw']->js = createObject('phpgwapi.javascript');
+               $GLOBALS['phpgw']->js->validate_file('jscalendar', 'calendar');
                $this->phpgw_js_url = 
$GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/js';
                $this->dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
  
!               if ($do_header && 
!strstr($GLOBALS['phpgw_info']['flags']['css'],'jscalendar'))
                {
!                       $GLOBALS['phpgw_info']['flags']['css'] .= 
"-->\n</style>\n"
!                               . '<link rel="stylesheet" type="text/css" 
media="all" href="'
!                               . $this->phpgw_js_url
!                               . '/jscalendar/calendar-win2k-cold-1.css" 
title="win2k-cold-1" />'
!                               . "\n<style type=\"text/css\">\n<!--\n";
! 
!                       $GLOBALS['phpgw_info']['flags']['java_script'] .= "\n"
!                               . '<script type="text/javascript" src="'
!                               . 
$GLOBALS['phpgw']->link('/phpgwapi/js/jscalendar/jscalendar-setup.php')
!                               ."\">\n</script>\n";
                }
        }
***************
*** 74,88 ****
                }
                return
! '<input type="text" id="'.$name.'" name="'.$name.'" size="10" 
value="'.$date.'"'.$options.'/>
! <script type="text/javascript">
!       document.writeln(\'<img id="'.$name.'-trigger" 
src="'.$this->phpgw_js_url.'/jscalendar/img.gif" title="'.lang('Select 
date').'" style="cursor:pointer; cursor:hand;"/>\');
!       Calendar.setup(
!       {
!               inputField  : "'.$name.'",
!               button      : "'.$name.'-trigger"
!       }
!       );
! </script>
! ';
        }
  
--- 81,95 ----
                }
                return
!               '<input type="text" id="'.$name.'" name="'.$name.'" size="12" 
value="'.$date.'"'.$options.'/>
!               <script type="text/javascript">
!               document.writeln(\'<img id="'.$name.'-trigger" 
src="'.$GLOBALS['phpgw']->common->find_image('phpgwapi','cal').'" 
title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\');
!               Calendar.setup(
!                       {
!                               inputField  : "'.$name.'",
!                               button      : "'.$name.'-trigger"
!                       }
!               );
!               </script>
!               ';
        }