Index: branches/RC/core/units/email_events/email_events_config.php
===================================================================
diff -u -r9366 -r9622
--- branches/RC/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 9366)
+++ branches/RC/core/units/email_events/email_events_config.php (.../email_events_config.php) (revision 9622)
@@ -76,28 +76,27 @@
),
'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array('default'=>'icon16_custom.gif'),
- 'Fields' => Array(
- 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td'),
- 'Event' => Array( 'title'=>'la_col_Event'),
- 'Module' => Array( 'title'=>'la_col_Module'),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'),
- 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
- ),
+ 'Default' => Array (
+ 'Icons' => Array('default'=>'icon16_custom.gif'),
+ 'Fields' => Array(
+ 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td'),
+ 'Event' => Array( 'title'=>'la_col_Event'),
+ 'Module' => Array( 'title'=>'la_col_Module'),
+ 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'),
+ 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
+ ),
+ ),
- ),
-
- 'EmailSettings' => Array(
- 'Icons' => Array('default'=>'icon16_custom.gif'),
- 'Fields' => Array(
- 'Description' => Array('title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td' ),
- 'Type' => Array('title'=>'la_col_Type'),
- 'Enabled' => Array('title'=>'la_col_Status'),
- 'FromUser' => Array('title'=>'la_col_FromToUser'),
- ),
- ),
+ 'EmailSettings' => Array (
+ 'Icons' => Array('default'=>'icon16_custom.gif'),
+ 'Fields' => Array(
+ 'Description' => Array('title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td' ),
+ 'Type' => Array('title'=>'la_col_Type'),
+ 'Enabled' => Array('title'=>'la_col_Status'),
+ 'FromUser' => Array('title'=>'la_col_FromToUser'),
),
+ ),
+ ),
);
if (defined('DEBUG_MODE') && DEBUG_MODE) {
Index: branches/RC/admin/install/langpacks/english.lang
===================================================================
diff -u -r9431 -r9622
--- branches/RC/admin/install/langpacks/english.lang (.../english.lang) (revision 9431)
+++ branches/RC/admin/install/langpacks/english.lang (.../english.lang) (revision 9622)
@@ -82,6 +82,7 @@
Vmlld3M=
QWNjZXNz
QWRkaXRpb25hbA==
+ QWRtaW4gSW50ZXJmYWNlIExhbmd1YWdl
QmFzZWQgT24=
Q2F0ZWdvcnk=
Q2F0ZWdvcnkgTmFtZQ==
@@ -102,6 +103,7 @@
VVJM
SW5oZXJpdGVk
SW5oZXJpdGVkIEZyb20=
+ UHJpbWFyeQ==
U3lzdGVt
TGFiZWw=
TGFzdCBDaGFuZ2Vk
@@ -561,6 +563,8 @@
RmllbGQ=
RGlzcGxheSBPcmRlcg==
QWRkcmVzcyBMaW5l
+ QWRkcmVzcyBMaW5lIDE=
+ QWRkcmVzcyBMaW5lIDI=
QWR2YW5jZWQgQ1NT
QWx0IFZhbHVl
QXNzaWduZWQgQ291cG9u
@@ -616,6 +620,7 @@
RmllbGRzIHNlcGFyYXRlZCBieQ==
RmllbGQgVGl0bGVz
RmlsZW5hbWU=
+ Rmlyc3QgTmFtZQ==
Rm9udA==
Rm9udCBDb2xvcg==
Rm9udCBGYW1pbHk=
@@ -643,6 +648,7 @@
SXRlbSBUZW1wbGF0ZQ==
TGFuZ3VhZ2UgRmlsZQ==
TGFuZ3VhZ2UgSUQ=
+ TGFzdCBOYW1l
TGVmdA==
TGluZSBlbmRpbmdz
TGluZSBFbmRpbmdzIEluc2lkZSBGaWVsZHM=
@@ -655,6 +661,7 @@
TWFyZ2luIFRvcA==
TWF4aW11bSBudW1iZXIgb2YgQ2F0ZWdvcmllcyBvbiBJdGVtIGNhbiBiZSBhZGRlZCB0bw==
TWVzc2FnZSBCb2R5
+ TWVzc2FnZSBUZXh0
TWVzc2FnZSBUeXBl
TW9kaWZpZWQ=
TW9kdWxl
@@ -1394,6 +1401,7 @@
UHJvcGVydGllcw==
UXVlcnkgRGF0YWJhc2U=
UmVnaW9uYWw=
+ UmVsYXRlZCBTZWFyY2hlcw==
UmVsYXRpb25z
U3VtbWFyeSAmIExvZ3M=
UmVzdG9yZQ==
@@ -1980,6 +1988,7 @@
SXMgTm90IEVxdWFsIFRv
RG9lcyBOb3QgQ29udGFpbg==
QWxsIHJpZ2h0cyByZXNlcnZlZC4=
+ YWxsIHdlYnNpdGU=
IGhhcyBhbHJlYWR5IGJlZW4gc3VnZ2VzdGVkIHRvIHRoaXMgc2l0ZSBvbg==
QW5k
QU9MIElN
@@ -2011,6 +2020,7 @@
RGVsZXRl
RGVsZXRlIEltYWdl
RGV0YWlscw==
+ RmluZCBJdA==
R28=
TW9kaWZ5
TW9yZSBJbWFnZXM=
@@ -2735,6 +2745,7 @@
VGhhbmsgeW91IGZvciBzdWdnZXN0aW5nIHlvdXIgY2F0ZWdvcnku
U3VnZ2VzdGVkIGNhdGVnb3J5IGlzIHBlbmRpbmcgZm9yIEFkbWluaXN0cmF0aXZlIGFwcHJvdmFsIA==
VGhhbmsgeW91IGZvciBzdWJzY3JpYmluZyB0byBvdXIgbWFpbGluZyBsaXN0
+ dGhpcyBjYXRlZ29yeSBvbmx5
QWN0aW9uIEJveA==
QWRkaW5nIEFkZHJlc3M=
Q2F0ZWdvcmllcw==
@@ -2835,18 +2846,11 @@
TmV4dCBUaGVtZQ==
UHJldmlvdXMgVGhlbWU=
dGVzdCAy
- QWRtaW4gSW50ZXJmYWNlIExhbmd1YWdl
- UHJpbWFyeQ==
- QWRkcmVzcyBMaW5lIDE=
- QWRkcmVzcyBMaW5lIDI=
- Rmlyc3QgTmFtZQ==
- TGFzdCBOYW1l
- TWVzc2FnZSBUZXh0
U3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhZGRlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gYWRkZWQu
-
+ WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5IGlzIHBlbmRpbmcgYWRtaW5pc3RyYXRpb24gYXBwcm92YWwu
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQgKHBlbmRpbmcpCgpBIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZCwgcGVuZGluZyB5b3VyIGNvbmZpcm1hdGlvbi4gIFBsZWFzZSByZXZpZXcgdGhlIGNhdGVnb3J5IGFuZCBhcHByb3ZlIG9yIGRlbnkgaXQu
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIGFwcHJvdmVkLg==
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gYXBwcm92ZWQu