X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEmail.js;h=0c83f956a986a1f0f869b97ac1202209d6549f65;hp=a665fcfe8e2b4fa0bd1887ae8e29db800755c94a;hb=HEAD;hpb=180aa2e20298e233812b23d3a1161a6d818f2fd0
diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index a665fcfe..0c83f956 100644
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -13,14 +13,15 @@ Pman.Dialog.CoreEmail = {
'b357b524e740bc85b9790a0712d84a30' :"Email address",
'962b90039a542a29cedd51d87a9f28a1' :"Html Editor",
'72d6d7a1885885bb55a565fd1070581a' :"Import",
+ '28690be026c0bb9003aa58e45e5662ca' :"Enabled - will be sent out",
'ea30b40c3caf28acb29198d20d243e54' :"Images / Attachments >>",
'31fde7b05ac8952dacf4af8a704074ec' :"Preview",
'b337c8a67244afb6551ee1f8f9717676' :"Test Class
(for system reference only)",
'884df8e413319ff51a3f5f528606238a' :"Use template",
'e6b391a8d2c4d45902a23a8b6585703d' :"URL",
- '2393ad754ba179442d85e415d1d5167c' :"Displayorder",
'6f16a5f8ff5d75ab84c018adacdfcbb7' :"Field",
'ec211f7c20af43e742bf2570c3cb84f9' :"Add",
+ '2393ad754ba179442d85e415d1d5167c' :"Displayorder",
'e9968623956c15023d54335ea3699855' :"Convert Html to Text",
'1243daf593fa297e07ab03bf06d925af' :"Searching...",
'5b8ef4e762c00a15a41cfc26dc3ef99c' :"Send me a test copy",
@@ -31,6 +32,7 @@ Pman.Dialog.CoreEmail = {
'ea4788705e6873b424c65e91c2846b19' :"Cancel",
'68b00d723d37122f64da8d9939f836f0' :"BCC Group",
'c4ca4238a0b923820dcc509a6f75849b' :"1",
+ '4994a8ffeba4ac3140beb89e8d41f174' :"Language",
'bd88a20b53a47f7b5704a83a15ff5506' :"Saved Version",
'b20a8b77b05d53b4e695738731400c85' :"Mailout Name",
'1bd18d39370b7f26c1c5e18067b74c6f' :"Html File",
@@ -39,13 +41,31 @@ Pman.Dialog.CoreEmail = {
'31bb2f6e9b8fb11cbb7fb63c6025223f' :"Select Template",
'b78a3223503896721cca1303f776159b' :"Title",
'278c491bdd8a53618c149c4ac790da34' :"Template",
- '1351017ac6423911223bc19a8cb7c653' :"Filename",
'308f2757bfc9ce92fb00ff93fdffd279' :"Images / Attachments",
+ '1351017ac6423911223bc19a8cb7c653' :"Filename",
'c9cc8cce247e49bae79f15173ce97354' :"Save",
'5feb9bf3c03b32635135006cbacb9542' :"Insert Field",
'4c2a8fe7eaf24721cc7a9f0175115bd4' :"Message",
'fff0d600f8a0b5e19e88bfb821dd1157' :"Images"
},
+ _named_strings : {
+ 'active_boxLabel' : '28690be026c0bb9003aa58e45e5662ca' /* Enabled - will be sent out */ ,
+ 'template_fieldLabel' : '278c491bdd8a53618c149c4ac790da34' /* Template */ ,
+ '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 */ ,
+ 'template_emptyText' : '31bb2f6e9b8fb11cbb7fb63c6025223f' /* Select Template */ ,
+ 'active_value' : 'c4ca4238a0b923820dcc509a6f75849b' /* 1 */ ,
+ 'from_name_fieldLabel' : '5da618e8e4b89c66fe86e32cdafde142' /* From */ ,
+ 'bcc_group_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
+ 'bcc_group_id_name_fieldLabel' : '68b00d723d37122f64da8d9939f836f0' /* BCC Group */ ,
+ 'subject_fieldLabel' : 'c7892ebbb139886662c6f2fc8c450710' /* Subject */ ,
+ 'test_class_fieldLabel' : 'b337c8a67244afb6551ee1f8f9717676' /* Test Class
(for system reference only) */
+ },
dialog : false,
callback: false,
@@ -58,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);
@@ -538,6 +558,21 @@ Pman.Dialog.CoreEmail = {
});
}
+
+ if (!_this.form.findField('bodytext').getValue().match(/unsubscribe/i)) {
+ Roo.MessageBox.confirm("Missing unusubscribe",
+ "There is no unsubscribe link on the email are you sure you want to save it",
+ function(res) {
+ if (res == 'no') {
+ return;
+ }
+ mkimg();
+ }
+ );
+
+ return;
+ }
+
mkimg();
},
style : 'margin:10px',
@@ -614,13 +649,14 @@ Pman.Dialog.CoreEmail = {
},
{
xtype : 'Column',
- hideLabels : true,
+ labelSeparator : ' ',
+ labelWidth : 0,
xns : Roo.form,
'|xns' : 'Roo.form',
items : [
{
xtype : 'Checkbox',
- boxLabel : 'Enabled - will be sent out',
+ boxLabel : _this._strings['28690be026c0bb9003aa58e45e5662ca'] /* Enabled - will be sent out */,
checked : true,
name : 'active',
value : 1,
@@ -676,10 +712,10 @@ Pman.Dialog.CoreEmail = {
emptyText : _this._strings['2c466a2c159463f1d9ef5a7b57b52827'] /* Select BCC Group */,
fieldLabel : _this._strings['68b00d723d37122f64da8d9939f836f0'] /* BCC Group */,
forceSelection : true,
- hiddenName : 'bcc_group',
+ hiddenName : 'bcc_group_id',
loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */,
minChars : 2,
- name : 'bcc_group_name',
+ name : 'bcc_group_id_name',
pageSize : 25,
qtip : _this._strings['2c466a2c159463f1d9ef5a7b57b52827'] /* Select BCC Group */,
selectOnFocus : true,
@@ -724,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 : '{title}
',
+ 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',
@@ -748,6 +815,8 @@ Pman.Dialog.CoreEmail = {
items : [
{
xtype : 'HtmlEditor',
+ allowComments : true,
+ autoClean : false,
autosave : function() {
var body = _this.form.findField('bodytext');
@@ -764,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',
@@ -1098,7 +1188,7 @@ Pman.Dialog.CoreEmail = {
p.setValue(res.data);
}
}
- });
+ });
}
},
@@ -1221,7 +1311,7 @@ Pman.Dialog.CoreEmail = {
Pman.Dialog.Image.show( { id : 0, onid: id, ontable: ontable }, function() {
_this.igrid.getDataSource().load({});
- });
+ });
}
},
xns : Roo.Toolbar,
@@ -1235,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,