diff --git a/gui/app/components/customize/general-settings.js b/gui/app/components/customize/general-settings.js
index 4b9b4459..4972e155 100644
--- a/gui/app/components/customize/general-settings.js
+++ b/gui/app/components/customize/general-settings.js
@@ -14,6 +14,7 @@ import { empty, and } from '@ember/object/computed';
import { isEmpty } from '@ember/utils';
import { set } from '@ember/object';
import { inject as service } from '@ember/service';
+import { schedule } from '@ember/runloop';
import Notifier from '../../mixins/notifier';
import Component from '@ember/component';
@@ -31,6 +32,7 @@ export default Component.extend(Notifier, {
didReceiveAttrs() {
this._super(...arguments);
+
this.set('maxTags', this.get('model.general.maxTags'));
this.set('domain', this.get('model.general.domain'));
},
@@ -80,6 +82,69 @@ export default Component.extend(Notifier, {
dzone.removeFile(file);
});
}
+
+ schedule('afterRender', () => {
+ let options = {
+ cache_suffix: '?v=510',
+ selector: '#editor-message',
+ relative_urls: false,
+ browser_spellcheck: true,
+ contextmenu: false,
+ statusbar: false,
+ inline: false,
+ paste_data_images: true,
+ images_upload_handler: function (blobInfo, success, failure) { // eslint-disable-line no-unused-vars
+ success("data:" + blobInfo.blob().type + ";base64," + blobInfo.base64());
+ },
+ image_advtab: true,
+ image_caption: true,
+ media_live_embeds: true,
+ theme: 'silver',
+ skin: 'oxide',
+ entity_encoding: 'raw',
+ extended_valid_elements: 'b,i,b/strong,i/em',
+ fontsize_formats:
+ '8px 10px 12px 14px 16px 18px 20px 22px 24px 26px 28px 30px 32px 34px 36px 38px 40px 42px 44px 46px 48px 50px 52px 54px 56px 58px 60px 70px 80px 90px 100px',
+ formats: {
+ bold: {
+ inline: 'b'
+ },
+ italic: {
+ inline: 'i'
+ }
+ },
+
+ plugins: [
+ 'advlist autolink autoresize lists link image charmap print hr pagebreak',
+ 'searchreplace wordcount visualblocks visualchars',
+ 'insertdatetime media nonbreaking save table directionality',
+ 'template paste textpattern imagetools'
+ ],
+ menu: {},
+ menubar: false,
+ toolbar: [
+ 'formatselect fontsizeselect | bold italic underline strikethrough superscript subscript blockquote | forecolor backcolor link unlink',
+ 'outdent indent bullist numlist | alignleft aligncenter alignright alignjustify | table uploadimage image media'
+ ],
+ };
+
+ if (typeof tinymce === 'undefined') {
+ $.getScript('/tinymce/tinymce.min.js?v=510', function () {
+ window.tinymce.dom.Event.domLoaded = true;
+ tinymce.baseURL = '//' + window.location.host + '/tinymce';
+ tinymce.suffix = '.min';
+ tinymce.init(options);
+ });
+ } else {
+ tinymce.init(options);
+ }
+ });
+ },
+
+ willDestroyElement() {
+ this._super(...arguments);
+
+ tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'editor-message');
},
actions: {
@@ -91,14 +156,17 @@ export default Component.extend(Notifier, {
},
save() {
+ let editor = tinymce.EditorManager.get('editor-message');
+ let message = editor.getContent();
+
if (isEmpty(this.get('model.general.title'))) {
set(this, 'titleError', true);
return $("#siteTitle").focus();
}
- if (isEmpty(this.get('model.general.message'))) {
+ if (isEmpty(message)) {
set(this, 'messageError', true);
- return $("#siteMessage").focus();
+ return editor.focus();
}
if (isEmpty(this.get('model.general.conversionEndpoint'))) {
@@ -112,6 +180,7 @@ export default Component.extend(Notifier, {
}
this.set('model.general.maxTags', this.get('maxTags'));
+ this.set('model.general.message', message);
let domainChanged = this.get('model.general.domain') !== this.get('domain').toLowerCase();
this.set('model.general.domain', this.get('domain').toLowerCase());
diff --git a/gui/app/components/folder/settings-general.js b/gui/app/components/folder/settings-general.js
index 48fc84f0..b040eaa0 100644
--- a/gui/app/components/folder/settings-general.js
+++ b/gui/app/components/folder/settings-general.js
@@ -9,10 +9,12 @@
//
// https://documize.com
+import $ from 'jquery';
import { A } from '@ember/array';
import { inject as service } from '@ember/service';
import { computed } from '@ember/object';
import { empty } from '@ember/object/computed';
+import { schedule } from '@ember/runloop';
import AuthMixin from '../../mixins/auth';
import Notifier from '../../mixins/notifier';
import Component from '@ember/component';
@@ -44,6 +46,73 @@ export default Component.extend(AuthMixin, Notifier, {
this.set('iconList', this.get('iconSvc').getSpaceIconList());
},
+ didInsertElement() {
+ this._super(...arguments);
+
+ schedule('afterRender', () => {
+ let options = {
+ cache_suffix: '?v=510',
+ selector: '#space-desc',
+ relative_urls: false,
+ browser_spellcheck: true,
+ contextmenu: false,
+ statusbar: false,
+ inline: false,
+ paste_data_images: true,
+ images_upload_handler: function (blobInfo, success, failure) { // eslint-disable-line no-unused-vars
+ success("data:" + blobInfo.blob().type + ";base64," + blobInfo.base64());
+ },
+ image_advtab: true,
+ image_caption: true,
+ media_live_embeds: true,
+ theme: 'silver',
+ skin: 'oxide',
+ entity_encoding: 'raw',
+ extended_valid_elements: 'b,i,b/strong,i/em',
+ fontsize_formats:
+ '8px 10px 12px 14px 16px 18px 20px 22px 24px 26px 28px 30px 32px 34px 36px 38px 40px 42px 44px 46px 48px 50px 52px 54px 56px 58px 60px 70px 80px 90px 100px',
+ formats: {
+ bold: {
+ inline: 'b'
+ },
+ italic: {
+ inline: 'i'
+ }
+ },
+
+ plugins: [
+ 'advlist autolink autoresize lists link image charmap print hr pagebreak',
+ 'searchreplace wordcount visualblocks visualchars',
+ 'insertdatetime media nonbreaking save table directionality',
+ 'template paste textpattern imagetools'
+ ],
+ menu: {},
+ menubar: false,
+ toolbar: [
+ 'formatselect fontsizeselect | bold italic underline strikethrough superscript subscript blockquote | forecolor backcolor link unlink',
+ 'outdent indent bullist numlist | alignleft aligncenter alignright alignjustify | table uploadimage image media'
+ ],
+ };
+
+ if (typeof tinymce === 'undefined') {
+ $.getScript('/tinymce/tinymce.min.js?v=510', function () {
+ window.tinymce.dom.Event.domLoaded = true;
+ tinymce.baseURL = '//' + window.location.host + '/tinymce';
+ tinymce.suffix = '.min';
+ tinymce.init(options);
+ });
+ } else {
+ tinymce.init(options);
+ }
+ });
+ },
+
+ willDestroyElement() {
+ this._super(...arguments);
+
+ tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'space-desc');
+ },
+
didReceiveAttrs() {
this._super(...arguments);
@@ -107,8 +176,11 @@ export default Component.extend(AuthMixin, Notifier, {
if (spaceName.length === 0) return;
space.set('name', spaceName);
+ let editor = tinymce.EditorManager.get('space-desc');
+ let spaceDesc = editor.getContent();
+
space.set('icon', this.get('spaceIcon'));
- space.set('desc', this.get('spaceDesc'));
+ space.set('desc', spaceDesc);
space.set('labelId', this.get('spaceLabel'));
this.get('spaceSvc').save(space).then(() => {
diff --git a/gui/app/styles/core/layout/headings.scss b/gui/app/styles/core/layout/headings.scss
index 840d26dc..b9775ca9 100644
--- a/gui/app/styles/core/layout/headings.scss
+++ b/gui/app/styles/core/layout/headings.scss
@@ -16,8 +16,9 @@
flex-direction: row;
> .icon, > .meta-icon, > .meta-logo {
- align-self: center;
+ align-self: flex-start;
margin-right: 25px;
+ margin-top: 10px;
> i {
font-size: 3.5rem;
diff --git a/gui/app/templates/components/customize/general-settings.hbs b/gui/app/templates/components/customize/general-settings.hbs
index 770f646a..e34ea862 100644
--- a/gui/app/templates/components/customize/general-settings.hbs
+++ b/gui/app/templates/components/customize/general-settings.hbs
@@ -6,7 +6,9 @@
@@ -59,4 +61,4 @@
{{ui/ui-button color=constants.Color.Green light=true icon=constants.Icon.Settings label=constants.Label.Save onClick=(action "save")}}
-
\ No newline at end of file
+
diff --git a/gui/app/templates/components/folder/settings-general.hbs b/gui/app/templates/components/folder/settings-general.hbs
index d1fe9fa0..92bdda0d 100644
--- a/gui/app/templates/components/folder/settings-general.hbs
+++ b/gui/app/templates/components/folder/settings-general.hbs
@@ -11,7 +11,9 @@
diff --git a/gui/app/templates/components/layout/page-desc.hbs b/gui/app/templates/components/layout/page-desc.hbs
index 79ba04a8..a4ea2370 100644
--- a/gui/app/templates/components/layout/page-desc.hbs
+++ b/gui/app/templates/components/layout/page-desc.hbs
@@ -1 +1 @@
-{{desc}}
\ No newline at end of file
+{{{desc}}}
diff --git a/gui/app/templates/components/layout/page-heading.hbs b/gui/app/templates/components/layout/page-heading.hbs
index 25c25d51..ab17eedc 100644
--- a/gui/app/templates/components/layout/page-heading.hbs
+++ b/gui/app/templates/components/layout/page-heading.hbs
@@ -1 +1 @@
-{{title}}
\ No newline at end of file
+{{title}}
diff --git a/gui/app/templates/components/spaces/space-list.hbs b/gui/app/templates/components/spaces/space-list.hbs
index cbbf5e0f..e18e231d 100644
--- a/gui/app/templates/components/spaces/space-list.hbs
+++ b/gui/app/templates/components/spaces/space-list.hbs
@@ -27,7 +27,7 @@
{{space.name}}
{{#if (not-eq viewDensity "3")}}
- {{space.desc}}
+ {{{space.desc}}}
{{/if}}
{{#if (eq viewDensity "1")}}