1 |
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 |
2 |
--- 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 |
3 |
+++ 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 |
4 |
@@ -1,7 +1,7 @@ |
5 |
|
6 |
//00Header |
7 |
/** |
8 |
- * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.4 2005/05/23 16:31:35 jan Exp $ |
9 |
+ * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.7 2006/03/14 18:44:35 chuck Exp $ |
10 |
* |
11 |
* See horde/config/prefs.php for documentation on the structure of this file. |
12 |
*/ |
13 |
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 |
14 |
--- 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 |
15 |
+++ 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 |
16 |
@@ -3,10 +3,10 @@ |
17 |
'column' => _("Display Options"), |
18 |
'label' => _("User Interface"), |
19 |
'desc' => _("Select confirmation options, how to display the different views and choose default view."), |
20 |
- 'members' => array('confirm_delete', 'defaultview', 'half', |
21 |
+ 'members' => array('confirm_delete', 'defaultview', |
22 |
'time_between_days', 'week_start_monday', |
23 |
- 'day_hour_start', 'day_hour_end', 'show_icons', |
24 |
- 'show_legend', 'show_fb_legend', |
25 |
+ 'day_hour_start', 'day_hour_end', 'slots_per_hour', |
26 |
+ 'show_icons', 'show_legend', 'show_fb_legend', |
27 |
'show_shared_side_by_side') |
28 |
); |
29 |
|
30 |
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 |
31 |
--- 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 |
32 |
+++ 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 |
33 |
@@ -8,3 +8,12 @@ |
34 |
); |
35 |
\} |
36 |
|
37 |
+if ($registry->hasMethod('contacts/search')) \{ |
38 |
+ $prefGroups['addressbook'] = array( |
39 |
+ 'column' => _("Display Options"), |
40 |
+ 'label' => _("Address Books"), |
41 |
+ 'desc' => _("Configure the address book search used when sending invitations."), |
42 |
+ 'members' => array('display_contact'), |
43 |
+ ); |
44 |
+\} |
45 |
+ |
46 |
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 |
47 |
--- 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 |
48 |
+++ 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 |
49 |
@@ -0,0 +1,8 @@ |
50 |
+//145Notification |
51 |
+$prefGroups['notification'] = array( |
52 |
+ 'column' => _("Calendars"), |
53 |
+ 'label' => _("Notifications"), |
54 |
+ 'desc' => _("Choose if you want to be notified of new, edited, and deleted events."), |
55 |
+ 'members' => array('event_notification', 'event_reminder') |
56 |
+); |
57 |
+ |
58 |
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 |
59 |
--- 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 |
60 |
+++ 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 |
61 |
@@ -2,7 +2,7 @@ |
62 |
$prefGroups['freebusy'] = array( |
63 |
'column' => _("Calendars"), |
64 |
'label' => _("Free/Busy Information"), |
65 |
- 'desc' => _("Set your own and other user's free/busy options."), |
66 |
- 'members' => array('freebusy_days') |
67 |
+ 'desc' => _("Set your free/busy calendars and your own and other users' free/busy options."), |
68 |
+ 'members' => array('fb_cals_select', 'freebusy_days') |
69 |
); |
70 |
|
71 |
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 |
72 |
--- 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 |
73 |
+++ 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 |
74 |
@@ -1,10 +0,0 @@ |
75 |
-//190Half |
76 |
-// half hour slots |
77 |
-$_prefs['half'] = array( |
78 |
- 'value' => 0, |
79 |
- 'locked' => false, |
80 |
- 'shared' => false, |
81 |
- 'type' => 'checkbox', |
82 |
- 'desc' => _("Show half hour slots in day and week views?") |
83 |
-); |
84 |
- |
85 |
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 |
86 |
--- 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 |
87 |
+++ 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 |
88 |
@@ -0,0 +1,14 @@ |
89 |
+//230SlotsPerHour |
90 |
+// number of slots in each hour: |
91 |
+$_prefs['slots_per_hour'] = array( |
92 |
+ 'value' => 1, |
93 |
+ 'locked' => false, |
94 |
+ 'shared' => false, |
95 |
+ 'type' => 'enum', |
96 |
+ 'desc' => _("How long should the time slots on the day and week views be?"), |
97 |
+ 'enum' => array(4 => _("15 minutes"), |
98 |
+ 3 => _("20 minutes"), |
99 |
+ 2 => _("30 minutes"), |
100 |
+ 1 => _("1 hour")) |
101 |
+); |
102 |
+ |
103 |
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 |
104 |
--- 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 |
105 |
+++ 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 |
106 |
@@ -0,0 +1,14 @@ |
107 |
+//375EventNotification |
108 |
+// new event notifications |
109 |
+$_prefs['event_notification'] = array( |
110 |
+ 'value' => '', |
111 |
+ 'locked' => false, |
112 |
+ 'shared' => false, |
113 |
+ 'type' => 'enum', |
114 |
+ 'enum' => array('' => _("No"), |
115 |
+ 'owner' => _("On my calendars only"), |
116 |
+ 'show' => _("On all shown calendars"), |
117 |
+ 'read' => _("On all calendars I have read access to")), |
118 |
+ 'desc' => _("Choose if you want to be notified of new, edited, and deleted events by email:") |
119 |
+); |
120 |
+ |
121 |
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 |
122 |
--- 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 |
123 |
+++ 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 |
124 |
@@ -0,0 +1,14 @@ |
125 |
+//377EventReminder |
126 |
+// reminder notifications |
127 |
+$_prefs['event_reminder'] = array( |
128 |
+ 'value' => 'owner', |
129 |
+ 'locked' => false, |
130 |
+ 'shared' => false, |
131 |
+ 'type' => 'enum', |
132 |
+ 'enum' => array('' => _("No"), |
133 |
+ 'owner' => _("On my calendars only"), |
134 |
+ 'show' => _("On all shown calendars"), |
135 |
+ 'read' => _("On all calendars I have read access to")), |
136 |
+ 'desc' => _("Choose if you want to receive email reminders for events with alarms:") |
137 |
+); |
138 |
+ |
139 |
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 |
140 |
--- 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 |
141 |
+++ 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 |
142 |
@@ -5,6 +5,6 @@ |
143 |
'locked' => false, |
144 |
'shared' => false, |
145 |
'type' => 'number', |
146 |
- 'desc' => _("How many days into the future should we generate free/busy information for?") |
147 |
+ 'desc' => _("How many days of free/busy information should we generate?") |
148 |
); |
149 |
|
150 |
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 |
151 |
--- 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 |
152 |
+++ 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 |
153 |
@@ -0,0 +1,12 @@ |
154 |
+//405DisplayContact |
155 |
+// By default, display all contacts in the address book when loading |
156 |
+// the contacts screen. If your default address book is large and |
157 |
+// slow to display, you may want to disable and lock this option. |
158 |
+$_prefs['display_contact'] = array( |
159 |
+ 'value' => 1, |
160 |
+ 'locked' => false, |
161 |
+ 'shared' => true, |
162 |
+ 'type' => 'checkbox', |
163 |
+ 'desc' => _("List all contacts when loading the contacts screen? (if disabled, you will only see contacts that you search for explicitly)"), |
164 |
+); |
165 |
+ |
166 |
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 |
167 |
--- 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 |
168 |
+++ 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 |
169 |
@@ -0,0 +1,10 @@ |
170 |
+//407FbCals |
171 |
+// Calendars to include in generating free/busy URLs. |
172 |
+$_prefs['fb_cals'] = array( |
173 |
+ 'value' => 'a:0:\{\}', |
174 |
+ 'locked' => false, |
175 |
+ 'shared' => false, |
176 |
+ 'type' => 'implicit', |
177 |
+ 'desc' => _("Choose the calendars to include when generating free/busy URLs:") |
178 |
+); |
179 |
+ |
180 |
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 |
181 |
--- 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 |
182 |
+++ 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 |
183 |
@@ -0,0 +1,4 @@ |
184 |
+//409FbCalsSelect |
185 |
+// Free/busy calendars selector. |
186 |
+$_prefs['fb_cals_select'] = array('type' => 'special'); |
187 |
+ |