fix conflicts

[Pman.Core] / Pman.Dialog.CoreEmail.js

diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index a534745..cf93539 100644 (file)
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -29,6 +29,7 @@ Pman.Dialog.CoreEmail = {
   'dc0de523c25be298ba751c63c694109e' :"Responsive Email (1)",
   '396ecabf0cd1f9503e591418851ef406' :"Edit / Create Message",
   'b9c49611cfda3259a2b837b39489e650' :"Add Image",
+  'cafbb1cfc96d63acd85e7de928e1636b' :"To Group <BR/> (for system reference only)",
   'ea4788705e6873b424c65e91c2846b19' :"Cancel",
   '68b00d723d37122f64da8d9939f836f0' :"BCC Group",
   'c4ca4238a0b923820dcc509a6f75849b' :"1",
@@ -50,6 +51,7 @@ Pman.Dialog.CoreEmail = {
  },
  _named_strings : {
   'active_boxLabel' : '28690be026c0bb9003aa58e45e5662ca' /* Enabled - will be sent out */ ,
+  'to_group_id_name_fieldLabel' : 'cafbb1cfc96d63acd85e7de928e1636b' /* To Group <BR/> (for system reference only) */ ,
   'template_fieldLabel' : '278c491bdd8a53618c149c4ac790da34' /* Template */ ,
   'name_fieldLabel' : 'b20a8b77b05d53b4e695738731400c85' /* Mailout Name */ ,
   'bcc_group_id_name_qtip' : '2c466a2c159463f1d9ef5a7b57b52827' /* Select BCC Group */ ,
@@ -760,37 +762,44 @@ Pman.Dialog.CoreEmail = {
              ]
             },
             {
-             xtype : 'TextField',
-             allowBlank : false,
-             fieldLabel : _this._strings['c7892ebbb139886662c6f2fc8c450710'] /* Subject */,
-             name : 'subject',
-             width : 600,
-             xns : Roo.form,
-             '|xns' : 'Roo.form'
-            },
-            {
-             xtype : 'ComboBox',
-             allowBlank : false,
-             displayField : 'title',
-             editable : false,
-             fieldLabel : _this._strings['4994a8ffeba4ac3140beb89e8d41f174'] /* Language */,
-             hiddenName : 'language',
-             listWidth : 200,
-             mode : 'local',
-             name : 'language_name',
-             tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{title}</b> </div>',
-             triggerAction : 'all',
-             valueField : 'code',
-             width : 200,
+             xtype : 'Row',
              xns : Roo.form,
              '|xns' : 'Roo.form',
-             store : {
-              xtype : 'SimpleStore',
-              data : (function() {return typeof(Pman) == 'object'  ? Pman.I18n.simpleStoreData('l') : []})(),
-              fields : ['code', 'title'],
-              xns : Roo.data,
-              '|xns' : 'Roo.data'
-             }
+             items  : [
+              {
+               xtype : 'TextField',
+               allowBlank : false,
+               fieldLabel : _this._strings['c7892ebbb139886662c6f2fc8c450710'] /* Subject */,
+               name : 'subject',
+               width : 600,
+               xns : Roo.form,
+               '|xns' : 'Roo.form'
+              },
+              {
+               xtype : 'ComboBox',
+               allowBlank : false,
+               displayField : 'title',
+               editable : false,
+               fieldLabel : _this._strings['4994a8ffeba4ac3140beb89e8d41f174'] /* Language */,
+               hiddenName : 'language',
+               listWidth : 200,
+               mode : 'local',
+               name : 'language_name',
+               tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{title}</b> </div>',
+               triggerAction : 'all',
+               valueField : 'code',
+               width : 200,
+               xns : Roo.form,
+               '|xns' : 'Roo.form',
+               store : {
+                xtype : 'SimpleStore',
+                data : (function() {return typeof(Pman) == 'object'  ? Pman.I18n.simpleStoreData('l') : []})(),
+                fields : ['code', 'title'],
+                xns : Roo.data,
+                '|xns' : 'Roo.data'
+               }
+              }
+             ]
             },
             {
              xtype : 'Row',
@@ -1232,6 +1241,23 @@ Pman.Dialog.CoreEmail = {
               }
              ]
             },
+            {
+             xtype : 'Row',
+             xns : Roo.form,
+             '|xns' : 'Roo.form',
+             items  : [
+              {
+               xtype : 'TextField',
+               allowBlank : true,
+               fieldLabel : _this._strings['cafbb1cfc96d63acd85e7de928e1636b'] /* To Group <BR/> (for system reference only) */,
+               name : 'to_group_id_name',
+               readOnly : true,
+               width : 300,
+               xns : Roo.form,
+               '|xns' : 'Roo.form'
+              }
+             ]
+            },
             {
              xtype : 'Hidden',
              name : 'id',