Pman.Dialog.CoreEmail.bjs

Pman.Dialog.CoreEmail.js

diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs
index a878160..5106511 100644 (file)
--- a/Pman.Dialog.CoreEmail.bjs
+++ b/Pman.Dialog.CoreEmail.bjs
@@ -284,52 +284,39 @@
                "name" : "name"
               },
               {
-               "xtype" : "Column",
+               "listeners" : {
+                "check" : "function (_self, checked)\n{\n    var boxLabel = 'Enabled - will be sent out';\n    \n    if(!checked){\n        boxLabel = 'Disabled - will NOT be sent out';\n    }\n    \n    this.setBoxLabel(boxLabel);\n}"
+               },
+               "String name" : "active",
+               "Boolean checked" : true,
+               "xtype" : "Checkbox",
+               "String valueOff" : 0,
+               "String boxLabel" : "Enabled - will be sent out",
                "$ xns" : "Roo.form",
-               "Boolean hideLabels" : true,
-               "items" : [
-                {
-                 "listeners" : {
-                  "check" : "function (_self, checked)\n{\n    var boxLabel = 'Enabled - will be sent out';\n    \n    if(!checked){\n        boxLabel = 'Disabled - will NOT be sent out';\n    }\n    \n    this.setBoxLabel(boxLabel);\n}"
-                 },
-                 "String name" : "active",
-                 "Boolean checked" : true,
-                 "xtype" : "Checkbox",
-                 "String valueOff" : 0,
-                 "String boxLabel" : "Enabled - will be sent out",
-                 "$ xns" : "Roo.form",
-                 "Mixed value" : 1
-                }
-               ]
+               "Mixed value" : 1
               },
               {
-               "xtype" : "Column",
+               "listWidth" : 200,
+               "triggerAction" : "all",
+               "fieldLabel" : "Language",
+               "displayField" : "title",
+               "hiddenName" : "language",
+               "valueField" : "code",
+               "xtype" : "ComboBox",
+               "allowBlank" : false,
+               "editable" : false,
+               "width" : 200,
                "$ xns" : "Roo.form",
+               "mode" : "local",
+               "name" : "language_name",
+               "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{title}</b> </div>",
                "items" : [
                 {
-                 "listWidth" : 200,
-                 "triggerAction" : "all",
-                 "fieldLabel" : "Language",
-                 "displayField" : "title",
-                 "hiddenName" : "language",
-                 "valueField" : "code",
-                 "xtype" : "ComboBox",
-                 "allowBlank" : false,
-                 "editable" : false,
-                 "width" : 200,
-                 "$ xns" : "Roo.form",
-                 "mode" : "local",
-                 "name" : "language_name",
-                 "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{title}</b> </div>",
-                 "items" : [
-                  {
-                   "| data" : "(function() {return typeof(Pman) == 'object'  ? Pman.I18n.simpleStoreData('l') : []})()",
-                   "xtype" : "SimpleStore",
-                   "$ fields" : "['code', 'title']",
-                   "$ xns" : "Roo.data",
-                   "* prop" : "store"
-                  }
-                 ]
+                 "| data" : "(function() {return typeof(Pman) == 'object'  ? Pman.I18n.simpleStoreData('l') : []})()",
+                 "xtype" : "SimpleStore",
+                 "$ fields" : "['code', 'title']",
+                 "$ xns" : "Roo.data",
+                 "* prop" : "store"
                 }
                ]
               }
@@ -419,31 +406,6 @@
              "$ xns" : "Roo.form",
              "name" : "subject"
             },
-            {
-             "listWidth" : 200,
-             "triggerAction" : "all",
-             "fieldLabel" : "Language",
-             "displayField" : "title",
-             "hiddenName" : "language",
-             "valueField" : "code",
-             "xtype" : "ComboBox",
-             "allowBlank" : false,
-             "editable" : false,
-             "width" : 200,
-             "$ xns" : "Roo.form",
-             "mode" : "local",
-             "name" : "language_name",
-             "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{title}</b> </div>",
-             "items" : [
-              {
-               "| data" : "(function() {return typeof(Pman) == 'object'  ? Pman.I18n.simpleStoreData('l') : []})()",
-               "xtype" : "SimpleStore",
-               "$ fields" : "['code', 'title']",
-               "$ xns" : "Roo.data",
-               "* prop" : "store"
-              }
-             ]
-            },
             {
              "hideLabels" : true,
              "xtype" : "Row",

diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index 9bc923b..00b6cc3 100644 (file)
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -648,65 +648,50 @@ Pman.Dialog.CoreEmail = {
                '|xns' : 'Roo.form'
               },
               {
-               xtype : 'Column',
-               hideLabels : true,
+               xtype : 'Checkbox',
+               boxLabel : _this._strings['28690be026c0bb9003aa58e45e5662ca'] /* Enabled - will be sent out */,
+               checked : true,
+               name : 'active',
+               value : 1,
+               valueOff : 0,
+               listeners : {
+                check : function (_self, checked)
+                 {
+                     var boxLabel = 'Enabled - will be sent out';
+                     
+                     if(!checked){
+                         boxLabel = 'Disabled - will NOT be sent out';
+                     }
+                     
+                     this.setBoxLabel(boxLabel);
+                 }
+               },
                xns : Roo.form,
-               '|xns' : 'Roo.form',
-               items  : [
-                {
-                 xtype : 'Checkbox',
-                 boxLabel : _this._strings['28690be026c0bb9003aa58e45e5662ca'] /* Enabled - will be sent out */,
-                 checked : true,
-                 name : 'active',
-                 value : 1,
-                 valueOff : 0,
-                 listeners : {
-                  check : function (_self, checked)
-                   {
-                       var boxLabel = 'Enabled - will be sent out';
-                       
-                       if(!checked){
-                           boxLabel = 'Disabled - will NOT be sent out';
-                       }
-                       
-                       this.setBoxLabel(boxLabel);
-                   }
-                 },
-                 xns : Roo.form,
-                 '|xns' : 'Roo.form'
-                }
-               ]
+               '|xns' : 'Roo.form'
               },
               {
-               xtype : 'Column',
+               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',
-               items  : [
-                {
-                 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'
-                 }
-                }
-               ]
+               store : {
+                xtype : 'SimpleStore',
+                data : (function() {return typeof(Pman) == 'object'  ? Pman.I18n.simpleStoreData('l') : []})(),
+                fields : ['code', 'title'],
+                xns : Roo.data,
+                '|xns' : 'Roo.data'
+               }
               }
              ]
             },
@@ -798,30 +783,6 @@ Pman.Dialog.CoreEmail = {
              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',
              hideLabels : true,