X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEmail.bjs;h=3dd0bd6c9278b548a5b924b2de322bfab5df9bf7;hp=8f22f2a14db51302fa142f544f8c424531b0dace;hb=586e4eb470252d837ba18b67e4c3c1702131fd1d;hpb=6f18a595cd6cf60fe682c85975522badd0afbeb3
diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs
index 8f22f2a1..3dd0bd6c 100644
--- a/Pman.Dialog.CoreEmail.bjs
+++ b/Pman.Dialog.CoreEmail.bjs
@@ -2,7 +2,7 @@
"name" : "Pman.Dialog.CoreEmail",
"parent" : "",
"title" : "",
- "path" : "/home/edward/gitlive/Pman.Core/Pman.Dialog.CoreEmail.bjs",
+ "path" : "/home/johns/gitlive/Pman.Core/Pman.Dialog.CoreEmail.bjs",
"permname" : "",
"modOrder" : "001",
"strings" : {
@@ -14,6 +14,7 @@
"72d6d7a1885885bb55a565fd1070581a" : "Import",
"ea30b40c3caf28acb29198d20d243e54" : "Images / Attachments >>",
"31fde7b05ac8952dacf4af8a704074ec" : "Preview",
+ "b337c8a67244afb6551ee1f8f9717676" : "Test Class
(for system reference only)",
"884df8e413319ff51a3f5f528606238a" : "Use template",
"e6b391a8d2c4d45902a23a8b6585703d" : "URL",
"2393ad754ba179442d85e415d1d5167c" : "Displayorder",
@@ -26,7 +27,6 @@
"dc0de523c25be298ba751c63c694109e" : "Responsive Email (1)",
"396ecabf0cd1f9503e591418851ef406" : "Edit / Create Message",
"b9c49611cfda3259a2b837b39489e650" : "Add Image",
- "44e7830e754c2e275ef6f658eafba13e" : "Test Class",
"ea4788705e6873b424c65e91c2846b19" : "Cancel",
"68b00d723d37122f64da8d9939f836f0" : "BCC Group",
"c4ca4238a0b923820dcc509a6f75849b" : "1",
@@ -62,14 +62,14 @@
"items" : [
{
"xtype" : "LayoutRegion",
- "$ xns" : "Roo",
"tabPosition" : "top",
+ "$ xns" : "Roo",
"* prop" : "center"
},
{
"hidden" : true,
- "xtype" : "LayoutRegion",
"title" : "Images / Attachments",
+ "xtype" : "LayoutRegion",
"width" : 500,
"$ xns" : "Roo",
"split" : true,
@@ -78,8 +78,8 @@
},
{
"autoScroll" : false,
- "region" : "center",
"fitToFrame" : true,
+ "region" : "center",
"xtype" : "NestedLayoutPanel",
"fitContainer" : true,
"$ xns" : "Roo",
@@ -180,8 +180,8 @@
"items" : [
{
"$ url" : "baseURL + '/Core/MailTemplateList.php'",
- "method" : "GET",
"xtype" : "HttpProxy",
+ "method" : "GET",
"$ xns" : "Roo.data",
"* prop" : "proxy"
},
@@ -229,8 +229,8 @@
"render" : "function (_self, width, height)\n{\n \n Roo.log(\"RESIZE, \" + width + ',' + height);\n \n var ew = Math.max(250, width-50);\n var eh = Math.max(250,height-50) ;\n \n \n\n}"
},
"autoScroll" : false,
- "fitToFrame" : true,
"background" : false,
+ "fitToFrame" : true,
"region" : "center",
"title" : "Message",
"xtype" : "ContentPanel",
@@ -242,9 +242,9 @@
"|actioncomplete" : "function(_self,action)\n{\n \n if (action.type == 'setdata') {\n \n setInterval(_this.form.findField('bodytext').autosave, 5000);\n \n _this.data.module = _this.data.module || 'crm_mailing_list_message';\n \n _this.form.url = baseURL + '/Roo/' + _this.data.module;\n \n _this.html_preview.hide();\n _this.preview_btn.hide();\n \n if(_this.data.id*1 > 0){\n _this.dialog.el.mask(\"Loading\");\n this.load({ method: 'GET', params: { '_id' : _this.data.id }});\n _this.html_preview.show();\n _this.preview_btn.show();\n \n } else {\n _this.form.setValues({\n 'from_name' : Pman.Login.authUser.name,\n 'from_email' : Pman.Login.authUser.email\n });\n }\n return;\n }\n if (action.type == 'load') {\n _this.dialog.el.unmask();\n \n _this.form.findField('bodytext').originalValue = _this.form.findField('bodytext').getValue();\n \n return;\n }\n if (action.type =='submit') {\n \n _this.dialog.el.unmask();\n _this.dialog.hide();\n \n if (_this.callback) {\n _this.callback.call(_this, action.result.data);\n }\n _this.form.reset();\n return;\n }\n}\n",
"|rendered" : "function (form)\n{\n _this.form= form;\n}\n"
},
+ "$ url" : "baseURL + '/Roo/crm_mailing_list_message.php'",
"labelAlign" : "right",
"$ preValidate" : "function(done_callback) {\n \n Roo.MessageBox.progress(\"Uploading Images\", \"Uploading\");\n \n if(!_this.form.findField('bodytext').editorcore.sourceEditMode){\n _this.form.findField('bodytext').syncValue();\n }else{\n _this.form.findField('bodytext').pushValue();\n }\n \n var html = _this.form.findField('bodytext').getValue();\n \n var s = Roo.get(_this.form.findField('bodytext').editorcore.doc.documentElement);\n \n var ontable = (_this.data.module) ? _this.data.module : 'crm_mailing_list_message';\n \n var nodes = [];\n s.select('img[src]').each(function(i) {\n nodes.push(i.dom);\n });\n var total = nodes.length;\n var mkimg = function() {\n \n if (!nodes.length) {\n Roo.MessageBox.hide();\n _this.form.findField('bodytext').syncValue();\n done_callback(true);\n // _this.form.doAction(\"submit\");\n return;\n }\n var i = nodes.pop(); \n \n var n = i.getAttribute('src').match(/(baseURL|server_baseurl)/);\n \n if(n){\n mkimg();\n return;\n }\n \n n = i.getAttribute('src').match(/^http(.*)/);\n \n if(!n ){\n mkimg();\n return;\n }\n \n new Pman.Request({\n url : baseURL + '/Roo/Images.php',\n method : 'POST',\n params : {\n onid : _this.form.findField('id').getValue(),\n ontable : ontable ,\n _remote_upload : i.src\n },\n success : function(res){\n if(res.success == true){ \n i.setAttribute('src', res.data);\n Roo.MessageBox.updateProgress( (total - nodes.length) / total , \"Done \" + (total - nodes.length) + '/' + total);\n }\n mkimg();\n }\n });\n \n }\n mkimg();\n}\n",
- "$ url" : "baseURL + '/Roo/crm_mailing_list_message.php'",
"method" : "POST",
"style" : "margin:10px",
"xtype" : "Form",
@@ -313,7 +313,7 @@
"pageSize" : 25,
"displayField" : "name",
"emptyText" : "Select BCC Group",
- "hiddenName" : "bcc_group",
+ "hiddenName" : "bcc_group_id",
"minChars" : 2,
"valueField" : "id",
"xtype" : "ComboBox",
@@ -322,7 +322,7 @@
"editable" : false,
"width" : 300,
"$ xns" : "Roo.form",
- "name" : "bcc_group_name",
+ "name" : "bcc_group_id_name",
"qtip" : "Select BCC Group",
"tpl" : "