[Phpgroupware-cvs] CVS: calendar/inc hook_settings.inc.php,1.1.2.1,1.1.2.2 hook_sidebox_menu.inc.php,1.1.2.2,1.1.2.3

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv26581

Modified Files:
      Tag: Version-0_9_16-branch
        hook_settings.inc.php hook_sidebox_menu.inc.php 
Log Message:
added the new prefs to the calendar, not all (=nothing) working atm.


Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_settings.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** hook_settings.inc.php       30 Mar 2003 01:35:26 -0000      1.1.2.1
--- hook_settings.inc.php       3 May 2003 22:43:54 -0000       1.1.2.2
***************
*** 16,26 ****
        /* $Id$ */
  
!       create_check_box('show default view on main 
screen','mainscreen_showevents');
        
!       create_select_box('weekday starts on','weekdaystarts',array(
                'Monday'   => lang('Monday'),
                'Sunday'   => lang('Sunday'),
                'Saturday' => lang('Saturday')
!       ));
        
        for ($i=0; $i < 24; ++$i)
--- 16,70 ----
        /* $Id$ */
  
!       $default = array(
!               'day'          => lang('Daily'),
!               'week'         => lang('Weekly'),
!               'month'        => lang('Monthly'),
!               'year'         => lang('Yearly'),
!               'planner_cat'  => lang('Planner by category'),
!               'planner_user' => lang('Planner by user'),
!       );
!       create_select_box('default calendar view','defaultcalendar',$default,
!               'Which of the calendar-views do you want to see, when you enter 
the calendar ?');
! 
!       create_check_box('show default view on main 
screen','mainscreen_showevents',
!               'Displays your default calendar view on the startpage (page you 
get when you enter phpGroupWare or click on the homepage icon)?');
! 
!       $summary = array(
!               'no'     => 'Never',
!               'daily'  => 'Daily',
!               'weekly' => 'Weekly'
!       );
!       create_select_box('Regular summary of your 
appointments','summary',$summary,
!               'Do you want to receive a regulary summary of your 
appointsments via email?<br>The summary is send to your standard email-address 
in the morning of that day or on monday for weekly summarys.<br>It is only send 
when you have any appointments on that day or week.');
        
!       $updates = array(
!               'no'             => lang('Never'),
!               'new_delete'     => lang('on invitation / cancelation only'),
!               'time_change_4h' => lang('on time-changes >= 4 hours too'),
!               'time_change'    => lang('on every time-change too'),
!               'all_changes'    => lang('on all changes too')
!       );
!       create_select_box('Updates of your appointments via 
email','receive_updates',$updates,
!               'Do you want to be notified about new or changed appointments? 
You dont get notifications for changes you made yourself.<br>You can limit the 
notifications on certain changes only. Every item include all notification 
above. All changes include changes of title, description, participants and the 
acceptions and rejections of them.');
! 
!       create_notify('Notification message for updates you 
send','notification_msg',5,50,
!               'This message is send to every participant of events you own, 
who requested notifcations.<br>You can use certain variables which get 
substituted with the data of the event. The first line is the subject of the 
email.');
! 
!       create_check_box('Show invitations you rejected','show_rejected',
!               'Should invitations you rejected still be shown in your 
calendar ?<br>You can only accept them later (eg. when your sheduling conflict 
disappears), if they are still in your calendar!');
! /*
!       create_check_box('Send/receive updates via email','send_updates');
!       create_check_box('Receive extra information in event 
mails','send_extra');
! */
!       create_check_box('Display status of events','display_status',
!               'Should the status of the event-participants (accept, reject, 
...) be shown in brakets after each participants name ?');
! 
!       $weekdaystarts = array(
                'Monday'   => lang('Monday'),
                'Sunday'   => lang('Sunday'),
                'Saturday' => lang('Saturday')
!       );
!       create_select_box('weekday starts on','weekdaystarts',$weekdaystarts,
!               'This day is shown as first day in the week or month view.');
        
        for ($i=0; $i < 24; ++$i)
***************
*** 28,43 ****
                $options[$i] = $GLOBALS['phpgw']->common->formattime($i,'00');
        }
!       create_select_box('work day starts on','workdaystarts',$options);
!       create_select_box('work day ends on','workdayends',$options);
!       unset($options);
!       
!       create_select_box('default calendar view','defaultcalendar',array(
!               'planner_cat'  => lang('Planner by category'),
!               'planner_user' => lang('Planner by user'),
!               'year'         => lang('Yearly'),
!               'month'        => lang('Monthly'),
!               'week'         => lang('Weekly'),
!               'day'          => lang('Daily')
!       ));
        $groups = 
$GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']);
        $options = array(-1 => lang('none'));
--- 72,91 ----
                $options[$i] = $GLOBALS['phpgw']->common->formattime($i,'00');
        }
!       create_select_box('work day starts on','workdaystarts',$options,
!               'This defines the start of your dayview. Events before that 
time, are shown above the dayview.');
!       create_select_box('work day ends on','workdayends',$options,
!               'This defines the end of your dayview. Events after that time, 
are shown below the dayview.');
!       $intervals = array(
!               5       => '5',
!               10      => '10',
!               15      => '15',
!               20      => '20',
!               30      => '30',
!               45      => '45',
!               60      => '60'
!       );
!       create_select_box('Intervals in day view','interval',$intervals,
!               'Defines the size in minutes of the lines in the day view.');
! 
        $groups = 
$GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']);
        $options = array(-1 => lang('none'));
***************
*** 46,55 ****
                $options[$group['account_id']] = 
$GLOBALS['phpgw']->common->grab_owner_name($group['account_id']);
        }
!       create_select_box('Preselected group for entering the 
planner','planner_start_with_group',$options);
!       unset($groups); 
!       unset($options); 
!       unset($group);
        
!       create_select_box('Default calendar filter','defaultfilter',array(
                'all'     => lang('all'),
                'private' => lang('private only'),
--- 94,110 ----
                $options[$group['account_id']] = 
$GLOBALS['phpgw']->common->grab_owner_name($group['account_id']);
        }
!       create_select_box('Preselected group for entering the 
planner','planner_start_with_group',$options,
!               'This group got preselected when you enter the planner. You can 
change it in the planner anytime you want.');
        
!       $planner_intervals = array(
!               1       => '1',
!               2       => '2',
!               3       => '3',
!               4       => '4',
!       );
!       create_select_box('Intervals per day in planner 
view','planner_intervals_per_day',
!               $planner_intervals,'Specifies the granularity of the planner 
view.'); 
! 
!       $defaultfilter = array(
                'all'     => lang('all'),
                'private' => lang('private only'),
***************
*** 59,89 ****
  //            'private+group'  => lang('private and group public'),
  //            'public+group'   => lang('global public and group public')
!       ));
! 
!       create_select_box('Display interval in Day View','interval',array(
!               5       => '5',
!               10      => '10',
!               15      => '15',
!               20      => '20',
!               30      => '30',
!               45      => '45',
!               60      => '60'
!       ));
!       
!       create_select_box('Number of Intervals per Day in Planner 
View','planner_intervals_per_day',array(
!               1       => '1',
!               2       => '2',
!               3       => '3',
!               4       => '4',
!       ));
! 
!       create_check_box('Send/receive updates via email','send_updates');
!       create_check_box('Receive extra information in event 
mails','send_extra');
! 
!       create_check_box('Display status of events','display_status');
  
!       create_check_box('When creating new events default set to 
private','default_private');
  
!       create_check_box('Display mini calendars when 
printing','display_minicals');
  
!       create_check_box('Print calendars in black & 
white','print_black_white');
--- 114,127 ----
  //            'private+group'  => lang('private and group public'),
  //            'public+group'   => lang('global public and group public')
!       );
!       create_select_box('Default calendar 
filter','defaultfilter',$defaultfilter,
!               'Which events do you want to see when you enter the calendar.');
  
!       create_check_box('Set new events to private','default_private',
!               'Should new events created private by default ?');
  
!       create_check_box('Print the mini calendars','display_minicals',
!               'Should the mini calendars by printed / displayed in the 
printer friendly views ?');
  
!       create_check_box('Print calendars in black & white','print_black_white',
!               'Should the printer friendly view be in black & white or in 
color, like the normal view?');

Index: hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/Attic/hook_sidebox_menu.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** hook_sidebox_menu.inc.php   19 Apr 2003 21:11:49 -0000      1.1.2.2
--- hook_sidebox_menu.inc.php   3 May 2003 22:43:54 -0000       1.1.2.3
***************
*** 34,38 ****
                '_NewLine_'=>'', // give a newline
                'Group 
Planner'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.planner'),
!               'Daily Matrix 
View'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.matrixselect')
        );
        display_sidebox($appname,$menu_title,$file);
--- 34,39 ----
                '_NewLine_'=>'', // give a newline
                'Group 
Planner'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.planner'),
!               'Daily Matrix 
View'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.matrixselect'),
!               
'Import'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import')
        );
        display_sidebox($appname,$menu_title,$file);
***************
*** 42,49 ****
                $menu_title = lang('Preferences');
                $file = Array(
!                       
'Preferences'=>$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=calendar'),
                        'Grant 
Access'=>$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app=calendar'),
                        'Edit Categories' 
=>$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=calendar&cats_level=True&global_cats=True'),
-                       
'Import'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import')
                );
                display_sidebox($appname,$menu_title,$file);
--- 43,49 ----
                $menu_title = lang('Preferences');
                $file = Array(
!                       
'User-preferences'=>$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=calendar'),
                        'Grant 
Access'=>$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app=calendar'),
                        'Edit Categories' 
=>$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=calendar&cats_level=True&global_cats=True'),
                );
                display_sidebox($appname,$menu_title,$file);