From 16a85ebd25b0cb432579aab3154f46707e0e51b4 Mon Sep 17 00:00:00 2001 From: edward Date: Mon, 18 Jul 2016 13:55:44 +0800 Subject: [PATCH] Pman.Dialog.CoreEmail.bjs Pman.Dialog.CoreEmail.js --- Pman.Dialog.CoreEmail.bjs | 34 +++++++++++++++++----------------- Pman.Dialog.CoreEmail.js | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs index fb1914be..fc2006cc 100644 --- a/Pman.Dialog.CoreEmail.bjs +++ b/Pman.Dialog.CoreEmail.bjs @@ -24,11 +24,11 @@ "1243daf593fa297e07ab03bf06d925af" : "Searching...", "c7892ebbb139886662c6f2fc8c450710" : "Subject", "dc0de523c25be298ba751c63c694109e" : "Responsive Email (1)", + "8e5fb038528cb96c95ed88a734589034" : "Mailout Name ?", "396ecabf0cd1f9503e591418851ef406" : "Edit / Create Message", "b9c49611cfda3259a2b837b39489e650" : "Add Image", "ea4788705e6873b424c65e91c2846b19" : "Cancel", "bd88a20b53a47f7b5704a83a15ff5506" : "Saved Version", - "b20a8b77b05d53b4e695738731400c85" : "Mailout Name", "1bd18d39370b7f26c1c5e18067b74c6f" : "Html File", "5da618e8e4b89c66fe86e32cdafde142" : "From", "31bb2f6e9b8fb11cbb7fb63c6025223f" : "Select Template", @@ -58,14 +58,14 @@ "items" : [ { "xtype" : "LayoutRegion", - "tabPosition" : "top", "$ xns" : "Roo", + "tabPosition" : "top", "* prop" : "center" }, { "hidden" : true, - "title" : "Images / Attachments", "xtype" : "LayoutRegion", + "title" : "Images / Attachments", "width" : 500, "$ xns" : "Roo", "split" : true, @@ -74,8 +74,8 @@ }, { "autoScroll" : false, - "fitToFrame" : true, "region" : "center", + "fitToFrame" : true, "xtype" : "NestedLayoutPanel", "fitContainer" : true, "$ xns" : "Roo", @@ -176,8 +176,8 @@ "items" : [ { "$ url" : "baseURL + '/Core/MailTemplateList.php'", - "xtype" : "HttpProxy", "method" : "GET", + "xtype" : "HttpProxy", "$ xns" : "Roo.data", "* prop" : "proxy" }, @@ -225,8 +225,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, - "background" : false, "fitToFrame" : true, + "background" : false, "region" : "center", "title" : "Message", "xtype" : "ContentPanel", @@ -238,9 +238,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" }, + "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'", - "labelAlign" : "right", "method" : "POST", "style" : "margin:10px", "xtype" : "Form", @@ -252,7 +252,7 @@ "$ xns" : "Roo.form", "items" : [ { - "fieldLabel" : "Mailout Name", + "fieldLabel" : "Mailout Name ?", "xtype" : "TextField", "allowBlank" : false, "width" : 400, @@ -298,8 +298,8 @@ "items" : [ { "hideLabels" : true, - "style" : "text-align:center;", "legend" : "Html Editor", + "style" : "text-align:center;", "xtype" : "FieldSet", "$ xns" : "Roo.form", "items" : [ @@ -308,9 +308,9 @@ "savedpreview" : "function (_self)\n{\n var id = _this.form.findField('id').getValue() * 1;\n \n var successFn = function(res){\n return res.data.POST.source;\n };\n \n var params = {\n action : 'AUTOSAVE',\n remarks : 'BODY',\n on_id : (id < 1) ? 0 : id,\n on_table : 'crm_mailing_list_message',\n successFn : successFn\n };\n \n \n Pman.Dialog.CoreAutoSavePreview.show(params, function(res){\n _self.setValue(res);\n _self.originalValue = res;\n });\n}", "autosave" : "function (_self)\n{\n Roo.log('autosave');\n \n var id = _this.form.findField('id').getValue() * 1;\n \n /*\n if(!_self.editorcore.sourceEditMode){\n _self.syncValue();\n }else{\n _self.pushValue();\n }\n */\n \n new Pman.Request({\n url : baseURL + '/Roo/Events.php',\n method :'POST',\n params : {\n id : 0,\n action : 'AUTOSAVE',\n on_id : (id > 0) ? id : 0,\n on_table : 'crm_mailing_list_message',\n remarks : 'BODY',\n source: _self.getValue()\n },\n success : function() {\n _self.originalValue = _self.getValue();\n \n },\n failure : function() \n {\n Roo.log('body autosave failed?!');\n }\n });\n \n}" }, + "| function autosave" : "function() {\n \n var body = _this.form.findField('bodytext');\n \n if(!body.wrap.isVisible(true) || body.getValue() == '' || !body.isDirty()){\n Roo.log('body not dirty');\n return;\n }\n \n Roo.log('body dirty, auto save!');\n \n body.fireEvent('autosave', body);\n \n}\n", "xtype" : "HtmlEditor", "$ cwhite" : "[ \n 'margin',\n 'padding',\n 'text-align',\n 'background',\n 'height',\n 'width',\n 'background-color',\n 'font-size',\n 'line-height',\n 'color',\n 'outline',\n 'text-decoration',\n 'position',\n 'clear',\n 'overflow',\n 'margin-top',\n 'border-bottom',\n 'top',\n 'list-style',\n 'margin-left',\n 'border',\n 'float' ,\n 'margin-right',\n 'padding-top',\n 'min-height',\n 'left',\n 'padding-left',\n 'font-weight',\n 'font-family',\n 'display',\n 'margin-bottom',\n 'padding-bottom',\n 'vertical-align',\n 'cursor',\n 'z-index',\n 'right'\n ]", - "| function autosave" : "function() {\n \n var body = _this.form.findField('bodytext');\n \n if(!body.wrap.isVisible(true) || body.getValue() == '' || !body.isDirty()){\n Roo.log('body not dirty');\n return;\n }\n \n Roo.log('body dirty, auto save!');\n \n body.fireEvent('autosave', body);\n \n}\n", "$ xns" : "Roo.form", "resizable" : "s", "name" : "bodytext", @@ -366,8 +366,8 @@ "items" : [ { "$ url" : "baseURL + '/Roo/Images.php'", - "method" : "GET", "xtype" : "HttpProxy", + "method" : "GET", "$ xns" : "Roo.data", "* prop" : "proxy" }, @@ -464,8 +464,8 @@ "items" : [ { "hideLabels" : true, - "style" : "text-align:center;", "legend" : "Plain Text", + "style" : "text-align:center;", "xtype" : "FieldSet", "$ xns" : "Roo.form", "items" : [ @@ -497,8 +497,8 @@ "|activate" : "function() {\n _this.ipanel = this;\n if (_this.igrid) {\n _this.igrid.ds.load({});\n }\n}" }, "autoScroll" : false, - "background" : false, "fitToframe" : true, + "background" : false, "region" : "east", "title" : "Images / Attachments", "xtype" : "GridPanel", @@ -528,8 +528,8 @@ "items" : [ { "$ url" : "baseURL + '/Roo/Images.php'", - "method" : "GET", "xtype" : "HttpProxy", + "method" : "GET", "$ xns" : "Roo.data", "* prop" : "proxy" }, @@ -573,8 +573,8 @@ }, { "xtype" : "ColumnModel", - "header" : "Filename", "width" : 300, + "header" : "Filename", "$ renderer" : "function(v,x,r)\n{\n var width = r.data.width;\n var height = r.data.height;\n \n if(width > 50){\n height = Math.round(height * 50 / width);\n width = 50;\n }\n \n return '';\n}", "$ xns" : "Roo.grid", "* prop" : "colModel[]", @@ -582,8 +582,8 @@ }, { "xtype" : "ColumnModel", - "width" : 75, "header" : "Displayorder", + "width" : 75, "$ renderer" : "function(v) { return String.format('{0}', v); }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", @@ -591,8 +591,8 @@ }, { "xtype" : "ColumnModel", - "header" : "Title", "width" : 75, + "header" : "Title", "$ renderer" : "function(v) { return String.format('{0}', v); }", "$ xns" : "Roo.grid", "* prop" : "colModel[]", diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js index 69318ef2..53a376bd 100644 --- a/Pman.Dialog.CoreEmail.js +++ b/Pman.Dialog.CoreEmail.js @@ -25,11 +25,11 @@ Pman.Dialog.CoreEmail = { '1243daf593fa297e07ab03bf06d925af' :"Searching...", 'c7892ebbb139886662c6f2fc8c450710' :"Subject", 'dc0de523c25be298ba751c63c694109e' :"Responsive Email (1)", + '8e5fb038528cb96c95ed88a734589034' :"Mailout Name ?", '396ecabf0cd1f9503e591418851ef406' :"Edit / Create Message", 'b9c49611cfda3259a2b837b39489e650' :"Add Image", 'ea4788705e6873b424c65e91c2846b19' :"Cancel", 'bd88a20b53a47f7b5704a83a15ff5506' :"Saved Version", - 'b20a8b77b05d53b4e695738731400c85' :"Mailout Name", '1bd18d39370b7f26c1c5e18067b74c6f' :"Html File", '5da618e8e4b89c66fe86e32cdafde142' :"From", '31bb2f6e9b8fb11cbb7fb63c6025223f' :"Select Template", @@ -601,7 +601,7 @@ Pman.Dialog.CoreEmail = { items : [ { allowBlank : false, - fieldLabel : _this._strings['b20a8b77b05d53b4e695738731400c85'] /* Mailout Name */, + fieldLabel : _this._strings['8e5fb038528cb96c95ed88a734589034'] /* Mailout Name ? */, name : 'name', width : 400, xns : Roo.form, -- 2.39.2