From e286c200858b8dc28690457d57d503d59acd849d Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 17 Mar 2017 15:10:03 -0300 Subject: [PATCH] Ivan - Fix email templates editor [skip ci] --- .../admin/panel/settings/admin-panel-email-templates.js | 7 +++---- .../admin/panel/settings/admin-panel-email-templates.scss | 5 +++++ client/src/data/fixtures/system-fixtures.js | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/client/src/app/admin/panel/settings/admin-panel-email-templates.js b/client/src/app/admin/panel/settings/admin-panel-email-templates.js index 74badc5f..be18c548 100644 --- a/client/src/app/admin/panel/settings/admin-panel-email-templates.js +++ b/client/src/app/admin/panel/settings/admin-panel-email-templates.js @@ -14,7 +14,6 @@ import Loading from 'core-components/loading'; import Form from 'core-components/form'; import FormField from 'core-components/form-field'; import SubmitButton from 'core-components/submit-button'; -import TextEditor from 'core-components/text-editor'; class AdminPanelEmailTemplates extends React.Component { @@ -28,7 +27,7 @@ class AdminPanelEmailTemplates extends React.Component { language: 'en', form: { title: '', - content: TextEditor.createEmpty() + content: '' } }; @@ -62,7 +61,7 @@ class AdminPanelEmailTemplates extends React.Component { - +
{i18n('SAVE')} @@ -182,7 +181,7 @@ class AdminPanelEmailTemplates extends React.Component { language = language || this.state.language; form.title = (items[index] && items[index][language].subject) || ''; - form.content = TextEditor.getEditorStateFromHTML((items[index] && items[index][language].body) || ''); + form.content = (items[index] && items[index][language].body) || ''; this.setState({ selectedIndex: index, diff --git a/client/src/app/admin/panel/settings/admin-panel-email-templates.scss b/client/src/app/admin/panel/settings/admin-panel-email-templates.scss index 340c7059..43f49a28 100644 --- a/client/src/app/admin/panel/settings/admin-panel-email-templates.scss +++ b/client/src/app/admin/panel/settings/admin-panel-email-templates.scss @@ -1,5 +1,10 @@ .admin-panel-email-templates { + &__text-area { + width: 100%; + height: 157px; + } + &__save-button { display: inline-block; float: left; diff --git a/client/src/data/fixtures/system-fixtures.js b/client/src/data/fixtures/system-fixtures.js index d160a64a..45739ad3 100644 --- a/client/src/data/fixtures/system-fixtures.js +++ b/client/src/data/fixtures/system-fixtures.js @@ -332,7 +332,7 @@ module.exports = [ return { status: "success", - data: DATA + data: DATA.reverse() }; } },