diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header 2006-02-25 18:54:16.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header 2006-09-14 22:27:18.000000000 -0500 @@ -1,7 +1,7 @@ //00Header /** - * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.4 2005/05/23 16:31:35 jan Exp $ + * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.7 2006/03/14 18:44:35 chuck Exp $ * * See horde/config/prefs.php for documentation on the structure of this file. */ diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View 2006-03-01 23:49:33.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View 2006-09-15 02:54:51.000000000 -0500 @@ -3,10 +3,10 @@ 'column' => _("Display Options"), 'label' => _("User Interface"), 'desc' => _("Select confirmation options, how to display the different views and choose default view."), - 'members' => array('confirm_delete', 'defaultview', 'half', + 'members' => array('confirm_delete', 'defaultview', 'time_between_days', 'week_start_monday', - 'day_hour_start', 'day_hour_end', 'show_icons', - 'show_legend', 'show_fb_legend', + 'day_hour_start', 'day_hour_end', 'slots_per_hour', + 'show_icons', 'show_legend', 'show_fb_legend', 'show_shared_side_by_side') ); diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/120MethodTasks mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/120MethodTasks --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/120MethodTasks 2006-02-25 18:59:39.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/120MethodTasks 2006-09-15 02:57:31.000000000 -0500 @@ -8,3 +8,12 @@ ); \} +if ($registry->hasMethod('contacts/search')) \{ + $prefGroups['addressbook'] = array( + 'column' => _("Display Options"), + 'label' => _("Address Books"), + 'desc' => _("Configure the address book search used when sending invitations."), + 'members' => array('display_contact'), + ); +\} + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/145Notification mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/145Notification --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/145Notification 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/145Notification 2006-09-15 02:59:55.000000000 -0500 @@ -0,0 +1,8 @@ +//145Notification +$prefGroups['notification'] = array( + 'column' => _("Calendars"), + 'label' => _("Notifications"), + 'desc' => _("Choose if you want to be notified of new, edited, and deleted events."), + 'members' => array('event_notification', 'event_reminder') +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/150FreeBusy mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/150FreeBusy --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/150FreeBusy 2006-02-25 22:20:19.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/150FreeBusy 2006-09-15 03:01:16.000000000 -0500 @@ -2,7 +2,7 @@ $prefGroups['freebusy'] = array( 'column' => _("Calendars"), 'label' => _("Free/Busy Information"), - 'desc' => _("Set your own and other user's free/busy options."), - 'members' => array('freebusy_days') + 'desc' => _("Set your free/busy calendars and your own and other users' free/busy options."), + 'members' => array('fb_cals_select', 'freebusy_days') ); diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/190Half mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/190Half --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/190Half 2006-02-25 19:02:49.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/190Half 1969-12-31 18:00:00.000000000 -0600 @@ -1,10 +0,0 @@ -//190Half -// half hour slots -$_prefs['half'] = array( - 'value' => 0, - 'locked' => false, - 'shared' => false, - 'type' => 'checkbox', - 'desc' => _("Show half hour slots in day and week views?") -); - diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/230SlotsPerHour mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/230SlotsPerHour --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/230SlotsPerHour 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/230SlotsPerHour 2006-09-15 03:07:10.000000000 -0500 @@ -0,0 +1,14 @@ +//230SlotsPerHour +// number of slots in each hour: +$_prefs['slots_per_hour'] = array( + 'value' => 1, + 'locked' => false, + 'shared' => false, + 'type' => 'enum', + 'desc' => _("How long should the time slots on the day and week views be?"), + 'enum' => array(4 => _("15 minutes"), + 3 => _("20 minutes"), + 2 => _("30 minutes"), + 1 => _("1 hour")) +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/375EventNotification mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/375EventNotification --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/375EventNotification 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/375EventNotification 2006-09-15 03:10:14.000000000 -0500 @@ -0,0 +1,14 @@ +//375EventNotification +// new event notifications +$_prefs['event_notification'] = array( + 'value' => '', + 'locked' => false, + 'shared' => false, + 'type' => 'enum', + 'enum' => array('' => _("No"), + 'owner' => _("On my calendars only"), + 'show' => _("On all shown calendars"), + 'read' => _("On all calendars I have read access to")), + 'desc' => _("Choose if you want to be notified of new, edited, and deleted events by email:") +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/377EventReminder mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/377EventReminder --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/377EventReminder 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/377EventReminder 2006-09-15 03:10:51.000000000 -0500 @@ -0,0 +1,14 @@ +//377EventReminder +// reminder notifications +$_prefs['event_reminder'] = array( + 'value' => 'owner', + 'locked' => false, + 'shared' => false, + 'type' => 'enum', + 'enum' => array('' => _("No"), + 'owner' => _("On my calendars only"), + 'show' => _("On all shown calendars"), + 'read' => _("On all calendars I have read access to")), + 'desc' => _("Choose if you want to receive email reminders for events with alarms:") +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/380FreeBusyDays mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/380FreeBusyDays --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/380FreeBusyDays 2006-02-25 19:13:04.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/380FreeBusyDays 2006-09-15 03:12:09.000000000 -0500 @@ -5,6 +5,6 @@ 'locked' => false, 'shared' => false, 'type' => 'number', - 'desc' => _("How many days into the future should we generate free/busy information for?") + 'desc' => _("How many days of free/busy information should we generate?") ); diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/405DisplayContact mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/405DisplayContact --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/405DisplayContact 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/405DisplayContact 2006-09-15 03:16:26.000000000 -0500 @@ -0,0 +1,12 @@ +//405DisplayContact +// By default, display all contacts in the address book when loading +// the contacts screen. If your default address book is large and +// slow to display, you may want to disable and lock this option. +$_prefs['display_contact'] = array( + 'value' => 1, + 'locked' => false, + 'shared' => true, + 'type' => 'checkbox', + 'desc' => _("List all contacts when loading the contacts screen? (if disabled, you will only see contacts that you search for explicitly)"), +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/407FbCals mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/407FbCals --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/407FbCals 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/407FbCals 2006-09-15 03:17:05.000000000 -0500 @@ -0,0 +1,10 @@ +//407FbCals +// Calendars to include in generating free/busy URLs. +$_prefs['fb_cals'] = array( + 'value' => 'a:0:\{\}', + 'locked' => false, + 'shared' => false, + 'type' => 'implicit', + 'desc' => _("Choose the calendars to include when generating free/busy URLs:") +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/409FbCalsSelect mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/409FbCalsSelect --- smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/409FbCalsSelect 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-kronolith-1.1/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/409FbCalsSelect 2006-09-15 03:18:51.000000000 -0500 @@ -0,0 +1,4 @@ +//409FbCalsSelect +// Free/busy calendars selector. +$_prefs['fb_cals_select'] = array('type' => 'special'); +