Index: admin/system_presets/simple/email_events_emailevents.php
===================================================================
--- admin/system_presets/simple/email_events_emailevents.php (revision 13557)
+++ admin/system_presets/simple/email_events_emailevents.php (working copy)
@@ -14,45 +14,51 @@
// toolbar buttons
$remove_buttons = Array (
-// list of all email templates (direct list)
-// 'email_messages_direct_list' => Array ('edit', 'view', 'dbl-click'),
+// list of all email templates
+// 'email_message_list' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'view', 'dbl-click'),
-// edit email body direct
-// 'email_messages_edit_direct' => Array ('select', 'cancel', 'reset_edit'),
+// edit email edit - general tab
+// 'email_message_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+
+// edit email edit - settings tab
+// 'email_message_edit_settings' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
);
// fields to hide
$hidden_fields = Array (
- /*'EventId', 'Event',*/ 'Headers', /*'ReplacementTags', 'Subject', 'Body',*/
- 'MessageType', 'Enabled', 'FrontEndOnly', 'FromUserId', /*'Module',
- 'Description', 'Type',*/
+ /*'EventId', 'Event', 'ReplacementTags', 'AllowChangingSender', 'CustomSender',
+ 'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
+ 'CustomRecipient', 'Recipients', 'Subject', 'Body', 'Headers', 'MessageType',
+ 'Enabled', 'FrontEndOnly', 'Module', 'Description', 'Type'*/
);
// virtual fields to hide
$virtual_hidden_fields = Array (
-
+ /*'RecipientType', 'RecipientName', 'RecipientAddressType',
+ 'RecipientAddress', 'Tag', 'Replacement', 'ReplacementTagsXML',*/
);
// fields to make required
$required_fields = Array (
- 'EventId', 'Event', /*'Headers', 'ReplacementTags',*/ 'Subject', 'Body',
- 'MessageType', /*'Enabled', 'FrontEndOnly', 'FromUserId',*/ 'Module',
- /*'Description',*/ 'Type',
+ /*'EventId',*/ 'Event', /*'ReplacementTags', 'AllowChangingSender', 'CustomSender',
+ 'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
+ 'CustomRecipient', 'Recipients',*/ 'Subject', 'Body', /*'Headers',*/ 'MessageType',
+ /*'Enabled', 'FrontEndOnly',*/ 'Module', /*'Description',*/ 'Type'
);
// virtual fields to make required
$virtual_required_fields = Array (
-
+ /*'RecipientType', 'RecipientName', 'RecipientAddressType',
+ 'RecipientAddress', 'Tag', 'Replacement', 'ReplacementTagsXML',*/
);
// tabs during editing
$hide_edit_tabs = Array (
-
+ 'Default' => Array (/*'general',*/ 'settings'),
);
// hide columns in grids
$hide_columns = Array (
-// currently not in user
-// 'Default' => Array ('Subject', 'Description', 'Type', ),
-// 'Emails' => Array ('EventId', 'Subject', 'Description', 'Type', ),
+// 'Default' => Array ('EventId', 'Description', 'Event', 'Module', 'Type', 'Enabled'),
+// 'Emails' => Array ('EventId', 'Event', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly'),
);
\ No newline at end of file
Index: admin/system_presets/simple/email_messages_emailmessages.php
===================================================================
--- admin/system_presets/simple/email_messages_emailmessages.php (revision 13557)
+++ admin/system_presets/simple/email_messages_emailmessages.php (working copy)
@@ -1,56 +1,3 @@
Array ('edit', 'view', 'dbl-click'),
-
-// edit email body direct
-// 'email_messages_edit_direct' => Array ('select', 'cancel', 'reset_edit'),
- );
-
- // fields to hide
- $hidden_fields = Array (
- /*'EmailMessageId', 'Template',*/ 'MessageType', /*'LanguageId', 'EventId', 'Subject' */
- );
-
- // virtual fields to hide
- $virtual_hidden_fields = Array (
- 'Headers',/* 'Body', 'ReplacementTags', 'Description', 'Module', 'Type', 'MassSubject', 'MassAttachment',
- 'MassHtmlMessage', 'MassTextMessage', */
- );
-
- // fields to make required
- $required_fields = Array (
- /*'EmailMessageId', 'Template', 'MessageType', 'LanguageId', 'EventId', 'Subject' */
- );
-
- // virtual fields to make required
- $virtual_required_fields = Array (
- /* 'Headers', 'Body', 'ReplacementTags', 'Description', 'Module', 'Type', 'MassSubject', 'MassAttachment',
- 'MassHtmlMessage', 'MassTextMessage', */
- );
-
- // tabs during editing
- $hide_edit_tabs = Array (
-
- );
-
- // hide columns in grids
- $hide_columns = Array (
-// currently not in user
-// 'Default' => Array ('Subject', 'Description', 'Type', ),
-// 'Emails' => Array ('EventId', 'Subject', 'Description', 'Type', 'LanguageId', ),
- );
\ No newline at end of file
+ // TO REMOVE
\ No newline at end of file
Index: core/admin_templates/incs/style_template.css
===================================================================
--- core/admin_templates/incs/style_template.css (revision 13557)
+++ core/admin_templates/incs/style_template.css (working copy)
@@ -663,4 +663,21 @@
.tree tr td a.debug-only-item {
color: grey;
+}
+
+/* Ajax Dropdown */
+.suggest-box {
+ border: 1px solid #999;
+ background-color: #fff;
+}
+
+.suggest-item, .suggest-item-over {
+ padding: 1px 2px 0px 2px;
+ font-family: arial,verdana;
+ font-size: 12px;
+}
+
+.suggest-item-over {
+ background-color: #3366CC;
+ color: #fff;
}
\ No newline at end of file
Index: core/admin_templates/languages/email_message_edit.tpl
===================================================================
--- core/admin_templates/languages/email_message_edit.tpl (revision 13557)
+++ core/admin_templates/languages/email_message_edit.tpl (working copy)
@@ -1,7 +1,7 @@
+ + | + +