1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-28 09:39:42 +02:00

Improve position of WYSIWYG editor toolbar

This commit is contained in:
sauls8t 2018-02-08 12:12:27 +00:00
parent 1ef8807b2d
commit 8f0440d55f
3 changed files with 7 additions and 6 deletions

View file

@ -23,6 +23,10 @@ export default Component.extend({
let page = this.get('page'); let page = this.get('page');
return `wysiwyg-editor-${page.id}`; return `wysiwyg-editor-${page.id}`;
}), }),
toolbarId: computed('page', function () {
let page = this.get('page');
return `wysiwyg-editor-toolbar-${page.id}`;
}),
didReceiveAttrs() { didReceiveAttrs() {
this._super(...arguments); this._super(...arguments);
@ -41,7 +45,7 @@ export default Component.extend({
gecko_spellcheck: false, gecko_spellcheck: false,
statusbar: false, statusbar: false,
inline: true, inline: true,
// fixed_toolbar_container: '#mytoolbar', // fixed_toolbar_container: '#' + this.get('toolbarId'),
paste_data_images: true, paste_data_images: true,
image_advtab: true, image_advtab: true,
image_caption: true, image_caption: true,

View file

@ -1,5 +1,4 @@
<div id="section-editor-{{pageId}}"> <div id="section-editor-{{pageId}}">
<div class="row"> <div class="row">
<div class="col-8 section-editor"> <div class="col-8 section-editor">
{{#if blockMode}} {{#if blockMode}}
@ -15,7 +14,6 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
<div class="col-4"> <div class="col-4">
<div class="float-right"> <div class="float-right">
{{#if busy}} {{#if busy}}
@ -35,15 +33,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col section-editor"> <div class="col section-editor">
<div class="canvas rounded"> <div class="canvas rounded mt-5">
{{yield}} {{yield}}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id={{concat "discard-modal-" page.id}} class="modal" tabindex="-1" role="dialog"> <div id={{concat "discard-modal-" page.id}} class="modal" tabindex="-1" role="dialog">

View file

@ -1,6 +1,7 @@
{{#section/base-editor-inline document=document folder=folder page=page {{#section/base-editor-inline document=document folder=folder page=page
blockMode=blockMode contentLinkerButton=true onInsertLink=(action 'onInsertLink') blockMode=blockMode contentLinkerButton=true onInsertLink=(action 'onInsertLink')
isDirty=(action 'isDirty') onCancel=(action 'onCancel') onAction=(action 'onAction')}} isDirty=(action 'isDirty') onCancel=(action 'onCancel') onAction=(action 'onAction')}}
<div id={{toolbarId}}></div>
<div id={{editorId}} class="mousetrap wysiwyg wysiwyg-editor"> <div id={{editorId}} class="mousetrap wysiwyg wysiwyg-editor">
{{{pageBody}}} {{{pageBody}}}
</div> </div>