fix #7165 - language on email dialog

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 0447e14..c38930d 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -59,6 +59,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
                     bcc_group_id = {$cgm}.group_id
             )  AS bcc_group_member_count
         ");
+
        
        if (!empty($_REQUEST['_hide_system_emails'])) {
            $this->whereAddIn("!{$this->tableName()}.name", array('EVENT_ERRORS_REPORT'), 'string');

diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs
index 62da75b..bde0c1f 100644 (file)
--- a/Pman.Dialog.CoreEmail.bjs
+++ b/Pman.Dialog.CoreEmail.bjs
@@ -28,10 +28,10 @@
   "dc0de523c25be298ba751c63c694109e" : "Responsive Email (1)",
   "396ecabf0cd1f9503e591418851ef406" : "Edit / Create Message",
   "b9c49611cfda3259a2b837b39489e650" : "Add Image",
-  "cafbb1cfc96d63acd85e7de928e1636b" : "To Group <BR/> (for system reference only)",
   "ea4788705e6873b424c65e91c2846b19" : "Cancel",
   "68b00d723d37122f64da8d9939f836f0" : "BCC Group",
   "c4ca4238a0b923820dcc509a6f75849b" : "1",
+  "4994a8ffeba4ac3140beb89e8d41f174" : "Language",
   "bd88a20b53a47f7b5704a83a15ff5506" : "Saved Version",
   "b20a8b77b05d53b4e695738731400c85" : "Mailout Name",
   "1bd18d39370b7f26c1c5e18067b74c6f" : "Html File",
@@ -49,11 +49,11 @@
  },
  "named_strings" : {
   "active_boxLabel" : "28690be026c0bb9003aa58e45e5662ca",
-  "to_group_id_name_fieldLabel" : "cafbb1cfc96d63acd85e7de928e1636b",
   "template_fieldLabel" : "278c491bdd8a53618c149c4ac790da34",
   "name_fieldLabel" : "b20a8b77b05d53b4e695738731400c85",
   "bcc_group_id_name_qtip" : "2c466a2c159463f1d9ef5a7b57b52827",
   "bcc_group_id_name_emptyText" : "2c466a2c159463f1d9ef5a7b57b52827",
+  "language_name_fieldLabel" : "4994a8ffeba4ac3140beb89e8d41f174",
   "template_qtip" : "31bb2f6e9b8fb11cbb7fb63c6025223f",
   "template_loadingText" : "1243daf593fa297e07ab03bf06d925af",
   "from_email_fieldLabel" : "b357b524e740bc85b9790a0712d84a30",
@@ -82,14 +82,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,
@@ -98,8 +98,8 @@
     },
     {
      "autoScroll" : false,
-     "fitToFrame" : true,
      "region" : "center",
+     "fitToFrame" : true,
      "xtype" : "NestedLayoutPanel",
      "fitContainer" : true,
      "$ xns" : "Roo",
@@ -200,8 +200,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Core/MailTemplateList.php'",
-             "xtype" : "HttpProxy",
              "method" : "GET",
+             "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -249,8 +249,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",
@@ -262,9 +262,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    \n    if (!_this.form.findField('bodytext').getValue().match(/unsubscribe/i)) {\n        Roo.MessageBox.confirm(\"Missing unusubscribe\",\n            \"There is no unsubscribe link on the email  are you sure you want to save it\",\n            function(res) {\n                if (res == 'no') {\n                    return;\n                }\n                mkimg();\n            }\n        );\n\n        return;\n    }\n    \n    mkimg();\n}\n",
            "$ url" : "baseURL + '/Roo/crm_mailing_list_message.php'",
-           "labelAlign" : "right",
            "method" : "POST",
            "style" : "margin:10px",
            "xtype" : "Form",
@@ -286,7 +286,8 @@
               {
                "xtype" : "Column",
                "$ xns" : "Roo.form",
-               "Boolean hideLabels" : true,
+               "String labelSeparator" : " ",
+               "Number labelWidth" : 0,
                "items" : [
                 {
                  "listeners" : {
@@ -360,8 +361,8 @@
                  "items" : [
                   {
                    "$ url" : "baseURL + '/Roo/Core_group'",
-                   "method" : "GET",
                    "xtype" : "HttpProxy",
+                   "method" : "GET",
                    "$ xns" : "Roo.data",
                    "* prop" : "proxy"
                   },
@@ -381,12 +382,43 @@
              ]
             },
             {
-             "fieldLabel" : "Subject",
-             "xtype" : "TextField",
-             "allowBlank" : false,
-             "width" : 600,
+             "xtype" : "Row",
              "$ xns" : "Roo.form",
-             "name" : "subject"
+             "items" : [
+              {
+               "fieldLabel" : "Subject",
+               "xtype" : "TextField",
+               "allowBlank" : false,
+               "width" : 600,
+               "$ 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,
@@ -395,8 +427,8 @@
              "items" : [
               {
                "hideLabels" : true,
-               "style" : "text-align:center;",
                "legend" : "Html Editor",
+               "style" : "text-align:center;",
                "xtype" : "FieldSet",
                "$ xns" : "Roo.form",
                "items" : [
@@ -406,8 +438,8 @@
                   "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}"
                  },
                  "bool allowComments" : true,
-                 "| 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",
+                 "| 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",
                  "$ cwhite" : "[ \n    'background',\n    'background-color',\n    'border',\n    'border-radius',\n    'border-bottom',\n    'border-left',\n    'border-right',\n    'border-top',\n    'border-collapse',\n     'border-color',\n     'border-style',\n    'border-width',\n\n    \n    'box-shadow',\n    'clear',\n    'color',\n    'cursor',\n    'display',\n    'float' ,\n    'font-family',\n    'font-size',\n    'font-style',        \n    'font-weight',\n\n    'height',\n    'left',\n    'line-height',\n    'list-style',\n    'margin',\n    'margin-bottom',\n    'margin-left',\n    'margin-right',\n    'margin-top',\n    'max-width',\n    'min-height',\n    '-ms-interpolation-mode',\n    'mso-table-rspace',\n    '-ms-text-size-adjust',\n    'outline',\n    'overflow',\n    'padding',\n    'padding-bottom',\n    'padding-left',\n    'padding-right',\n    'padding-top',\n    'position',\n    'right',\n    'text-align',\n    'text-decoration',\n    'top',\n    'vertical-align',\n    '-webkit-text-size-adjust',\n    'width',\n    'width',\n    'z-index'\n ]",
                  "boolean autoClean" : false,
                  "$ xns" : "Roo.form",
@@ -466,8 +498,8 @@
                        "items" : [
                         {
                          "$ url" : "baseURL + '/Roo/Images.php'",
-                         "method" : "GET",
                          "xtype" : "HttpProxy",
+                         "method" : "GET",
                          "$ xns" : "Roo.data",
                          "* prop" : "proxy"
                         },
@@ -564,8 +596,8 @@
              "items" : [
               {
                "hideLabels" : true,
-               "style" : "text-align:center;",
                "legend" : "Plain Text",
+               "style" : "text-align:center;",
                "xtype" : "FieldSet",
                "$ xns" : "Roo.form",
                "items" : [
@@ -594,21 +626,6 @@
               }
              ]
             },
-            {
-             "xtype" : "Row",
-             "$ xns" : "Roo.form",
-             "items" : [
-              {
-               "fieldLabel" : "To Group <BR/> (for system reference only)",
-               "Boolean readOnly" : true,
-               "xtype" : "TextField",
-               "allowBlank" : true,
-               "width" : 300,
-               "$ xns" : "Roo.form",
-               "name" : "to_group_id_name"
-              }
-             ]
-            },
             {
              "xtype" : "Hidden",
              "$ xns" : "Roo.form",
@@ -627,8 +644,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",
@@ -658,8 +675,8 @@
          "items" : [
           {
            "$ url" : "baseURL + '/Roo/Images.php'",
-           "method" : "GET",
            "xtype" : "HttpProxy",
+           "method" : "GET",
            "$ xns" : "Roo.data",
            "* prop" : "proxy"
           },
@@ -703,8 +720,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 '<img src=\"' + baseURL + '/Images/' + r.data.id + '/' + r.data.filename + '\" width=\"' + width + '\" height=\"' + height + '\" />';\n}",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -712,8 +729,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "width" : 75,
          "header" : "Displayorder",
+         "width" : 75,
          "$ renderer" : "function(v) { return String.format('{0}', v); }",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -721,8 +738,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 72d77d9..cf93539 100644 (file)
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -33,6 +33,7 @@ Pman.Dialog.CoreEmail = {
   'ea4788705e6873b424c65e91c2846b19' :"Cancel",
   '68b00d723d37122f64da8d9939f836f0' :"BCC Group",
   'c4ca4238a0b923820dcc509a6f75849b' :"1",
+  '4994a8ffeba4ac3140beb89e8d41f174' :"Language",
   'bd88a20b53a47f7b5704a83a15ff5506' :"Saved Version",
   'b20a8b77b05d53b4e695738731400c85' :"Mailout Name",
   '1bd18d39370b7f26c1c5e18067b74c6f' :"Html File",
@@ -55,6 +56,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 */ ,
@@ -649,7 +651,8 @@ Pman.Dialog.CoreEmail = {
               },
               {
                xtype : 'Column',
-               hideLabels : true,
+               labelSeparator : ' ',
+               labelWidth : 0,
                xns : Roo.form,
                '|xns' : 'Roo.form',
                items  : [
@@ -759,13 +762,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',

diff --git a/sql/core_email.sql b/sql/core_email.sql
index b7e582f..fe30275 100644 (file)
--- a/sql/core_email.sql
+++ b/sql/core_email.sql
@@ -34,5 +34,7 @@ ALTER TABLE core_email ADD COLUMN description VARCHAR(254) NOT NULL DEFAULT '';
 
 ALTER TABLE core_email ADD INDEX lookup_owner_id (owner_id);
 
+ALTER TABLE core_email ADD COLUMN language varchar(5)  NOT NULL DEFAULT 'en';
+
 UPDATE core_email SET updated_dt = NOW() where updated_dt IS NULL;