Skip to content

EspoCRM – Open Source CRM Application

create post edit view change

Yuri Kuznetsov11da4d0d8134
diff --git a/client/res/templates/stream/record/edit.tpl b/client/res/templates/stream/record/edit.tpl
index 18ffcd1a4e..05c5bce500 100644
--- a/client/res/templates/stream/record/edit.tpl
+++ b/client/res/templates/stream/record/edit.tpl
@@ -1,38 +1,32 @@
-<div class="row">
- <div class="cell col-sm-12 form-group" data-name="post">
- <div class="field" data-name="post">{{{postField}}}</div>
- </div>
-</div>
-<div class="row post-control{{#if interactiveMode}} hidden{{/if}}">
- <div class="col-sm-7 form-group">
- <div class="floated-row clearfix">
- {{#if interactiveMode}}
- <div>
- <button
- type="button"
- class="btn btn-primary btn-xs-wide post pull-left"
- >{{translate 'Post'}}</button>
- </div>
- {{/if}}
- <div>
- <div class="field" style="display: inline-block;" data-name="attachments">{{{attachmentsField}}}</div>
+<div class="panel panel-default">
+ <div class="panel-body panel-body-form">
+ <div class="row">
+ <div class="cell col-sm-12 form-group" data-name="post">
+ <div class="field" data-name="post">{{{postField}}}</div>
</div>
</div>
- </div>
- <div class="col-sm-5">
- <div class="form-group">
- <div class="cell" data-name="targetType">
- <label class="control-label">{{translate 'to' category='otherFields' scope='Note'}}</label>
- <div class="field" data-name="targetType">{{{targetTypeField}}}</div>
- </div>
- <div class="cell" data-name="users">
- <div class="field" data-name="users">{{{usersField}}}</div>
- </div>
- <div class="cell" data-name="teams">
- <div class="field" data-name="teams">{{{teamsField}}}</div>
+ <div class="row post-control">
+ <div class="col-sm-7">
+ <div class="cell floated-row form-group clearfix">
+ <div>
+ <div class="field" style="display: inline-block;" data-name="attachments">{{{attachmentsField}}}</div>
+ </div>
+ </div>
</div>
- <div class="cell" data-name="portals">
- <div class="field" data-name="portals">{{{portalsField}}}</div>
+ <div class="col-sm-5">
+ <div class="cell form-group" data-name="targetType">
+ <label class="control-label">{{translate 'to' category='otherFields' scope='Note'}}</label>
+ <div class="field" data-name="targetType">{{{targetTypeField}}}</div>
+ </div>
+ <div class="cell form-group" data-name="users">
+ <div class="field" data-name="users">{{{usersField}}}</div>
+ </div>
+ <div class="cell form-group" data-name="teams">
+ <div class="field" data-name="teams">{{{teamsField}}}</div>
+ </div>
+ <div class="cell form-group" data-name="portals">
+ <div class="field" data-name="portals">{{{portalsField}}}</div>
+ </div>
</div>
</div>
</div>
diff --git a/client/src/views/stream/modals/create-post.js b/client/src/views/stream/modals/create-post.js
index 7cfe19e763..c7104c1d74 100644
--- a/client/src/views/stream/modals/create-post.js
+++ b/client/src/views/stream/modals/create-post.js
@@ -30,7 +30,9 @@ import ModalView from 'views/modal';
class CreatePostModalView extends ModalView {
- templateContent = '<div class="record">{{{record}}}</div>'
+ templateContent = `
+ <div class="record no-side-margin">{{{record}}}</div>
+ `
shortcutKeys = {
'Control+Enter': 'post',
diff --git a/client/src/views/stream/record/edit.js b/client/src/views/stream/record/edit.js
index 77ec601822..7fbf4459e7 100644
--- a/client/src/views/stream/record/edit.js
+++ b/client/src/views/stream/record/edit.js
@@ -105,47 +105,11 @@ class EditStreamView extends BaseRecordView {
}
}
- data() {
- const data = super.data();
-
- data.interactiveMode = this.options.interactiveMode;
-
- return data;
- }
-
setup() {
super.setup();
this.seed = this.model.clone();
- if (this.options.interactiveMode) {
- this.events['focus textarea[data-name="post"]'] = () => {
- this.enablePostingMode();
- };
-
- this.addHandler('keydown', 'textarea[data-name="post"]', /** KeyboardEvent */e => {
- if (Espo.Utils.getKeyFromKeyEvent(e) === 'Control+Enter') {
- e.stopPropagation();
- e.preventDefault();
-
- this.post();
- }
-
- // Don't hide to be able to focus on the upload button.
- /*if (e.code === 'Tab') {
- let $text = $(e.currentTarget);
-
- if ($text.val() === '') {
- this.disablePostingMode();
- }
- }*/
- });
-
- this.events['click button.post'] = () => {
- this.post();
- };
- }
-
const optionList = ['self'];
this.model.set('type', 'Post');
@@ -280,17 +244,6 @@ class EditStreamView extends BaseRecordView {
afterSave() {
Espo.Ui.success(this.translate('Posted'));
-
- if (this.options.interactiveMode) {
- this.model.clear();
- this.model.set('targetType', 'self');
- this.model.set('type', 'Post');
-
- this.disablePostingMode();
- this.enablePostButton();
-
- this.getFieldView('post').$element.prop('rows', 1);
- }
}
afterNotValid() {