espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve email quick-edit

Browse Source
This commit is contained in:
yuri
2015-02-17 12:25:39 +02:00
parent 6d796c0b20
commit 20db3b0bd2
7 changed files with 91 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Resources/layouts/Email/detailSmall.json
+6 -6
View File
@@ -2,13 +2,13 @@
{
"label":"",
"rows":[
[{"name":"dateSent"}],
[{"name":"parent"}],
[{"name":"from"}],
[{"name":"dateSent"}, {"name":"assignedUser"}],
[{"name":"parent"}, {"name":"teams"}],
[{"name":"from"}, {"name":"cc"}],
[{"name":"to"}],
[{"name":"name"}],
[{"name":"body"}],
[{"name":"attachments"}]
[{"name":"name", "fullWidth": true}],
[{"name":"body", "fullWidth": true}],
[{"name":"attachments", "fullWidth": true}]
]
}
]
application/Espo/Resources/layouts/Email/detailSmallRestricted.json
+6 -6
View File
@@ -2,13 +2,13 @@
{
"label":"",
"rows":[
[{"name":"dateSent", "readOnly": true}],
[{"name":"parent"}],
[{"name":"from", "readOnly": true}],
[{"name":"dateSent", "readOnly": true}, {"name":"assignedUser"}],
[{"name":"parent"}, {"name":"teams"}],
[{"name":"from", "readOnly": true}, {"name":"cc", "readOnly": true}],
[{"name":"to", "readOnly": true}],
[{"name":"name", "readOnly": true}],
[{"name":"body", "readOnly": true}],
[{"name":"attachments", "readOnly": true}]
[{"name":"name", "readOnly": true, "fullWidth": true}],
[{"name":"body", "readOnly": true, "fullWidth": true}],
[{"name":"attachments", "readOnly": true, "fullWidth": true}]
]
}
]
frontend/client/src/views/email/record/compose.js
+6 -7
View File
@@ -17,17 +17,16 @@
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
************************************************************************/
************************************************************************/
Espo.define('Views.Email.Record.Compose', 'Views.Record.Edit', function (Dep) {
return Dep.extend({
isWide: true,
sideView: false,
});
});
frontend/client/src/views/email/record/detail.js
+8 -8
View File
@@ -17,34 +17,34 @@
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
************************************************************************/
************************************************************************/
Espo.define('Views.Email.Record.Detail', 'Views.Record.Detail', function (Dep) {
return Dep.extend({
layoutNameConfigure: function () {
if (!this.model.isNew()) {
var isRestricted = false;
if (this.model.get('status') == 'Sent') {
this.layoutName += 'Restricted';
isRestricted = true;
}
if (this.model.get('status') == 'Archived' && this.model.get('createdById') == 'system') {
if (this.model.get('status') == 'Archived' && this.model.get('createdById') == 'system') {
this.layoutName += 'Restricted';
isRestricted = true;
}
}
},
init: function () {
Dep.prototype.init.call(this);
this.layoutNameConfigure();
},
});
});
frontend/client/src/views/email/record/edit-quick.js
+13 -7
View File
@@ -17,19 +17,25 @@
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
************************************************************************/
************************************************************************/
Espo.define('Views.Email.Record.EditQuick', 'Views.Email.Record.Edit', function (Dep, Detail) {
return Dep.extend({
isWide: true,
sideView: false,
init: function () {
Dep.prototype.init.call(this);
Dep.prototype.init.call(this);
this.columnCount = 2;
},
setup: function () {
Dep.prototype.setup.call(this);
},
});
});
frontend/client/src/views/email/record/edit.js
+5 -6
View File
@@ -17,20 +17,19 @@
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
************************************************************************/
************************************************************************/
Espo.define('Views.Email.Record.Edit', ['Views.Record.Edit', 'Views.Email.Record.Detail'], function (Dep, Detail) {
return Dep.extend({
init: function () {
Dep.prototype.init.call(this);
Detail.prototype.layoutNameConfigure.call(this);
Detail.prototype.layoutNameConfigure.call(this);
},
});
});
frontend/client/src/views/fields/wysiwyg.js
+47 -41
View File
@@ -17,88 +17,94 @@
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
************************************************************************/
************************************************************************/
Espo.define('Views.Fields.Wysiwyg', ['Views.Fields.Text', 'lib!Summernote'], function (Dep, Summernote) {
return Dep.extend({
type: 'wysiwyg',
return Dep.extend({
type: 'wysiwyg',
detailTemplate: 'fields.wysiwyg.detail',
editTemplate: 'fields.wysiwyg.edit',
setup: function () {
Dep.prototype.setup.call(this);
this.listenTo(this.model, 'change:isHtml', function (model) {
setup: function () {
Dep.prototype.setup.call(this);
this.listenTo(this.model, 'change:isHtml', function (model) {
if (!model.has('isHtml') || model.get('isHtml')) {
this.enableWysiwygMode();
} else {
this.disableWysiwygMode();
}
}.bind(this));
this.once('remove', function () {
$('body > .tooltip').remove();
});
});
},
afterRender: function () {
Dep.prototype.afterRender.call(this);
Dep.prototype.afterRender.call(this);
var language = this.getConfig().get('language');
if (!(language in $.summernote.lang)) {
$.summernote.lang[language] = this.getLanguage().translate('summernote', 'sets');
}
if (this.mode == 'edit') {
if (!this.model.has('isHtml') || this.model.get('isHtml')) {
this.enableWysiwygMode();
}
}
if (this.mode == 'detail') {
if (!this.model.has('isHtml') || this.model.get('isHtml')) {
this.$el.find('iframe').removeClass('hidden');
var iframe = this.$el.find('iframe').get(0);
var document = iframe.contentWindow.document;
var iframe = this.iframe = this.$el.find('iframe').get(0);
var iframeDocument = this.iframeDocument = iframe.contentWindow.document;
var link = '<link href="client/css/iframe.css" rel="stylesheet" type="text/css"></link>'
document.open('text/html', 'replace');
iframeDocument.open('text/html', 'replace');
var body = this.model.get('body');
body += link;
document.write(body);
document.close();
iframe.style.height = document.body.scrollHeight + 'px';
iframeDocument.write(body);
iframeDocument.close();
this.handleIframeHeight();
} else {
this.$el.find('.plain').removeClass('hidden');
}
}
},
handleIframeHeight: function () {
console.log(this.iframeDocument.body.scrollHeight);
this.iframe.style.height = this.iframeDocument.body.scrollHeight + 'px';
},
enableWysiwygMode: function () {
this.$summernote = this.$element.summernote({
height: 250,
lang: this.getConfig().get('language'),
onImageUpload: function (files, editor, welEditable) {
var file = files[0];
this.notify('Uploading...');
this.getModelFactory().create('Attachment', function (attachment) {
this.notify('Uploading...');
this.getModelFactory().create('Attachment', function (attachment) {
var fileReader = new FileReader();
fileReader.onload = function (e) {
fileReader.onload = function (e) {
$.ajax({
type: 'POST',
url: 'Attachment/action/upload',
data: e.target.result,
contentType: 'multipart/encrypted',
}).done(function (data) {
attachment.id = data.attachmentId;
}).done(function (data) {
attachment.id = data.attachmentId;
attachment.set('name', file.name);
attachment.set('type', file.type);
attachment.set('role', 'Inline Attachment');
@@ -108,12 +114,12 @@ Espo.define('Views.Fields.Wysiwyg', ['Views.Fields.Text', 'lib!Summernote'], fun
var url = '?entryPoint=attachment&id=' + attachment.id;
editor.insertImage(welEditable, url);
this.notify(false);
}, this);
}, this);
attachment.save();
}.bind(this));
}.bind(this);
fileReader.readAsDataURL(file);
}, this);
}.bind(this),
toolbar: [
@@ -121,23 +127,23 @@ Espo.define('Views.Fields.Wysiwyg', ['Views.Fields.Text', 'lib!Summernote'], fun
['style', ['bold', 'italic', 'underline', 'clear']],
['color', ['color']],
['para', ['ul', 'ol', 'paragraph']],
['height', ['height']],
['height', ['height']],
['table', ['table', 'link', 'picture']],
['misc',['codeview']]
]
});
},
disableWysiwygMode: function () {
this.$element.destroy();
},
fetch: function () {
var data = {};
if (!this.model.has('isHtml') || this.model.get('isHtml')) {
data[this.name] = this.$element.code();
} else {
data[this.name] = this.$element.val();
data[this.name] = this.$element.val();
}
return data;
}