X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEmail.js;h=bfda4a7974b392731bd38cfd4317d8f51a00b89e;hp=280b8032ac53122f4ce5db541271fdeff386d0cf;hb=HEAD;hpb=2a8f70995a15cb6d31a3627ff7f0f20c019a9233

diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index 280b8032..0c83f956 100644
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -32,6 +32,7 @@ Pman.Dialog.CoreEmail = {
   'ea4788705e6873b424c65e91c2846b19' :"Cancel",
   '68b00d723d37122f64da8d9939f836f0' :"BCC Group",
   'c4ca4238a0b923820dcc509a6f75849b' :"1",
+  '4994a8ffeba4ac3140beb89e8d41f174' :"Language",
   'bd88a20b53a47f7b5704a83a15ff5506' :"Saved Version",
   'b20a8b77b05d53b4e695738731400c85' :"Mailout Name",
   '1bd18d39370b7f26c1c5e18067b74c6f' :"Html File",
@@ -40,8 +41,8 @@ Pman.Dialog.CoreEmail = {
   '31bb2f6e9b8fb11cbb7fb63c6025223f' :"Select Template",
   'b78a3223503896721cca1303f776159b' :"Title",
   '278c491bdd8a53618c149c4ac790da34' :"Template",
-  '1351017ac6423911223bc19a8cb7c653' :"Filename",
   '308f2757bfc9ce92fb00ff93fdffd279' :"Images / Attachments",
+  '1351017ac6423911223bc19a8cb7c653' :"Filename",
   'c9cc8cce247e49bae79f15173ce97354' :"Save",
   '5feb9bf3c03b32635135006cbacb9542' :"Insert Field",
   '4c2a8fe7eaf24721cc7a9f0175115bd4' :"Message",
@@ -53,6 +54,7 @@ Pman.Dialog.CoreEmail = {
   'name_fieldLabel' : 'b20a8b77b05d53b4e695738731400c85' /* Mailout Name */ ,
   'bcc_group_id_name_qtip' : '2c466a2c159463f1d9ef5a7b57b52827' /* Select BCC Group */ ,
   'bcc_group_id_name_emptyText' : '2c466a2c159463f1d9ef5a7b57b52827' /* Select BCC Group */ ,
+  'language_name_fieldLabel' : '4994a8ffeba4ac3140beb89e8d41f174' /* Language */ ,
   'template_qtip' : '31bb2f6e9b8fb11cbb7fb63c6025223f' /* Select Template */ ,
   'template_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
   'from_email_fieldLabel' : 'b357b524e740bc85b9790a0712d84a30' /* Email address */ ,
@@ -76,7 +78,7 @@ Pman.Dialog.CoreEmail = {
 
   this.callback = cb;
   this.data = data;
-  this.dialog.show(this.data._el);
+  this.dialog.show.apply(this.dialog,  Array.prototype.slice.call(arguments).slice(2));
   if (this.form) {
    this.form.reset();
    this.form.setValues(data);
@@ -647,7 +649,8 @@ Pman.Dialog.CoreEmail = {
               },
               {
                xtype : 'Column',
-               hideLabels : true,
+               labelSeparator : ' ',
+               labelWidth : 0,
                xns : Roo.form,
                '|xns' : 'Roo.form',
                items  : [
@@ -757,13 +760,44 @@ Pman.Dialog.CoreEmail = {
              ]
             },
             {
-             xtype : 'TextField',
-             allowBlank : false,
-             fieldLabel : _this._strings['c7892ebbb139886662c6f2fc8c450710'] /* Subject */,
-             name : 'subject',
-             width : 600,
+             xtype : 'Row',
              xns : Roo.form,
-             '|xns' : 'Roo.form'
+             '|xns' : 'Roo.form',
+             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',
@@ -781,6 +815,8 @@ Pman.Dialog.CoreEmail = {
                items  : [
                 {
                  xtype : 'HtmlEditor',
+                 allowComments : true,
+                 autoClean : false,
                  autosave : function() {
                      
                      var body = _this.form.findField('bodytext');
@@ -797,43 +833,64 @@ Pman.Dialog.CoreEmail = {
                  },
                  clearUp : false,
                  cwhite : [ 
-                     'margin',
-                     'padding',
-                     'text-align',
                      'background',
-                     'height',
-                     'width',
                      'background-color',
+                     'border',
+                     'border-radius',
+                     'border-bottom',
+                     'border-left',
+                     'border-right',
+                     'border-top',
+                     'border-collapse',
+                      'border-color',
+                      'border-style',
+                     'border-width',
+                 
+                     
+                     'box-shadow',
+                     'clear',
+                     'color',
+                     'cursor',
+                     'display',
+                     'float' ,
+                     'font-family',
                      'font-size',
+                     'font-style',        
+                     'font-weight',
+                 
+                     'height',
+                     'left',
                      'line-height',
-                     'color',
-                     'outline',
-                     'text-decoration',
-                     'position',
-                     'clear',
-                     'overflow',
-                     'margin-top',
-                     'border-bottom',
-                     'top',
                      'list-style',
+                     'margin',
+                     'margin-bottom',
                      'margin-left',
-                     'border',
-                     'float' ,
                      'margin-right',
-                     'padding-top',
+                     'margin-top',
+                     'max-width',
                      'min-height',
-                     'left',
-                     'padding-left',
-                     'font-weight',
-                     'font-family',
-                     'display',
-                     'margin-bottom',
+                     '-ms-interpolation-mode',
+                     'mso-table-rspace',
+                     '-ms-text-size-adjust',
+                     'outline',
+                     'overflow',
+                     'padding',
                      'padding-bottom',
+                     'padding-left',
+                     'padding-right',
+                     'padding-top',
+                     'position',
+                     'right',
+                     'text-align',
+                     'text-decoration',
+                     'top',
                      'vertical-align',
-                     'cursor',
-                     'z-index',
-                     'right'
+                     '-webkit-text-size-adjust',
+                     'width',
+                     'width',
+                     'z-index'
                   ],
+                 enableBlocks : false,
                  height : 250,
                  name : 'bodytext',
                  resizable : 's',
@@ -1268,29 +1325,7 @@ Pman.Dialog.CoreEmail = {
           listeners : {
            click : function()
             {
-                var s = _this.igrid.getSelectionModel().getSelected();
-                if (!s || isNaN(s.id *1)) {
-                    Roo.MessageBox.alert("Error", "Select a image"); 
-                    return;
-                }
-                Roo.MessageBox.confirm("Confirm", "Are sure you want to delete this image?", function (v){
-                    if (v != 'yes') {
-                        return;
-                    }
-                    
-                    new Pman.Request({
-                        url : baseURL + '/Roo/Images.php',
-                        method: 'POST',
-                        params : {
-                            _delete : s.id
-                        },
-                        success : function()
-                        {
-                            Roo.log('Got Success!!');
-                           _this.igrid.ds.load({});
-                        }
-                    });
-                });
+                       Pman.genericDelete({grid: _this.igrid}, 'Images');
             }
           },
           xns : Roo.Toolbar,