diff --git a/.gitattributes b/.gitattributes index 72e11d631..0e9b00b8b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,11 @@ * text=auto # These files are text and should be normalized (convert crlf > lf) -*.hbs text \ No newline at end of file +*.hbs text eol=lf +*.js text eol=lf +*.html text eol=lf +*.go text eol=lf +*.sql text eol=lf +*.scss text eol=lf +*.js text eol=lf +*.json text eol=lf diff --git a/app/.editorconfig b/app/.editorconfig index 219985c22..deb893209 100644 --- a/app/.editorconfig +++ b/app/.editorconfig @@ -10,8 +10,8 @@ end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -indent_style = space -indent_size = 2 +indent_style = tab +indent_size = 4 [*.hbs] insert_final_newline = false diff --git a/app/.jshintrc b/app/.jshintrc index 767b6edf1..cee569be4 100644 --- a/app/.jshintrc +++ b/app/.jshintrc @@ -18,7 +18,8 @@ "Drop", "Dropzone", "dragula", - "datetimepicker" + "datetimepicker", + "Waypoint" ], "browser": true, "boss": true, diff --git a/app/app/components/layout/button-home.js b/app/app/components/back-to-home.js similarity index 90% rename from app/app/components/layout/button-home.js rename to app/app/components/back-to-home.js index f62de8900..cb25c125c 100644 --- a/app/app/components/layout/button-home.js +++ b/app/app/components/back-to-home.js @@ -11,4 +11,5 @@ import Ember from 'ember'; -export default Ember.Component.extend({}); +export default Ember.Component.extend({ +}); diff --git a/app/app/components/back-to-space.js b/app/app/components/back-to-space.js new file mode 100644 index 000000000..cb25c125c --- /dev/null +++ b/app/app/components/back-to-space.js @@ -0,0 +1,15 @@ +// Copyright 2016 Documize Inc. . All rights reserved. +// +// This software (Documize Community Edition) is licensed under +// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html +// +// You can operate outside the AGPL restrictions by purchasing +// Documize Enterprise Edition and obtaining a commercial license +// by contacting . +// +// https://documize.com + +import Ember from 'ember'; + +export default Ember.Component.extend({ +}); diff --git a/app/app/components/document/document-sidebar-toc.js b/app/app/components/document/document-sidebar-toc.js index 3cc285b06..435ea3413 100644 --- a/app/app/components/document/document-sidebar-toc.js +++ b/app/app/components/document/document-sidebar-toc.js @@ -45,27 +45,29 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { didInsertElement() { this.eventBus.subscribe('documentPageAdded', this, 'onDocumentPageAdded'); - - var s = $(".document-structure"); - var pos = s.position(); - - $(window).scroll(function() { - var windowpos = $(window).scrollTop(); - if (windowpos - 200 >= pos.top) { - s.addClass("stick"); - s.css('width', s.parent().width()); - } else { - s.removeClass("stick"); - s.css('width', 'auto'); - } - }); - }, + }, willDestroyElement() { this.eventBus.unsubscribe('documentPageAdded'); this.destroyTooltips(); }, + // positionToc() { + // let s = $(".document-structure"); + // let pos = s.position(); + // + // $(window).scroll(_.throttle(function() { + // let windowpos = $(window).scrollTop(); + // if (windowpos - 200 >= pos.top) { + // s.addClass("stuck-toc"); + // s.css('width', s.parent().width()); + // } else { + // s.removeClass("stuck-toc"); + // s.css('width', 'auto'); + // } + // }, 50)); + // }, + onDocumentPageAdded(pageId) { this.send('onEntryClick', pageId); }, diff --git a/app/app/components/document/document-sidebar.js b/app/app/components/document/document-sidebar.js index 0c1107b19..350e94826 100644 --- a/app/app/components/document/document-sidebar.js +++ b/app/app/components/document/document-sidebar.js @@ -11,23 +11,51 @@ import Ember from 'ember'; import TooltipMixin from '../../mixins/tooltip'; +import NotifierMixin from '../../mixins/notifier'; -export default Ember.Component.extend(TooltipMixin, { +export default Ember.Component.extend(TooltipMixin, NotifierMixin, { documentService: Ember.inject.service('document'), document: {}, folder: {}, showToc: true, showViews: false, showContributions: false, + showSections: false, + showScrollTool: false, + showingSections: false, didRender() { if (this.session.authenticated) { this.addTooltip(document.getElementById("owner-avatar")); + this.addTooltip(document.getElementById("section-tool")); } }, - willDestroyElements() { - this.destroyElements(); + didInsertElement() { + this.eventBus.subscribe('resized', this, 'positionTool'); + this.eventBus.subscribe('scrolled', this, 'positionTool'); + }, + + willDestroyElement() { + this.destroyTooltips(); + }, + + positionTool() { + if (this.get('isDestroyed') || this.get('isDestroying')) { + return; + } + + let s = $(".scroll-tool"); + let windowpos = $(window).scrollTop(); + + if (windowpos >= 300) { + this.set('showScrollTool', true); + s.addClass("stuck-tool"); + s.css('left', parseInt($(".zone-sidebar").css('width')) - 18 + 'px'); + } else { + this.set('showScrollTool', false); + s.removeClass("stuck-tool"); + } }, actions: { @@ -45,27 +73,55 @@ export default Ember.Component.extend(TooltipMixin, { return this.attrs.gotoPage(id); }, - // close dialog - close() { - return true; - }, - showToc() { this.set('showToc', true); this.set('showViews', false); this.set('showContributions', false); + this.set('showSections', false); + this.set('showingSections', false); }, showViews() { this.set('showToc', false); this.set('showViews', true); this.set('showContributions', false); + this.set('showSections', false); + this.set('showingSections', false); }, showContributions() { this.set('showToc', false); this.set('showViews', false); this.set('showContributions', true); + this.set('showSections', false); + this.set('showingSections', false); + }, + + showSections() { + this.set('showToc', false); + this.set('showViews', false); + this.set('showContributions', false); + this.set('showSections', true); + this.set('showingSections', true); + }, + + onCancel() { + this.send('showToc'); + this.set('showingSections', false); + }, + + onAddSection(section) { + this.attrs.onAddSection(section); + + this.set('showingSections', false); + }, + + scrollTop() { + this.set('showScrollTool', false); + + $("html,body").animate({ + scrollTop: 0 + }, 500, "linear"); } } }); diff --git a/app/app/components/document/document-toolbar.js b/app/app/components/document/document-toolbar.js index 1fec9d383..4f19a868b 100644 --- a/app/app/components/document/document-toolbar.js +++ b/app/app/components/document/document-toolbar.js @@ -35,7 +35,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { this.addTooltip(document.getElementById("save-template-button")); this.addTooltip(document.getElementById("set-meta-button")); this.addTooltip(document.getElementById("delete-document-button")); - this.addTooltip(document.getElementById("add-section-button")); } this.addTooltip(document.getElementById("print-document-button")); @@ -139,4 +138,4 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { return true; }, } -}); \ No newline at end of file +}); diff --git a/app/app/components/document/document-view.js b/app/app/components/document/document-view.js index ed539429b..5efb80c9d 100644 --- a/app/app/components/document/document-view.js +++ b/app/app/components/document/document-view.js @@ -133,4 +133,4 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { this.get('documentService').save(doc); } } -}); \ No newline at end of file +}); diff --git a/app/app/components/document/page-wizard.js b/app/app/components/document/page-wizard.js index 493a49e3b..36d6477f1 100644 --- a/app/app/components/document/page-wizard.js +++ b/app/app/components/document/page-wizard.js @@ -13,9 +13,18 @@ import Ember from 'ember'; import NotifierMixin from '../../mixins/notifier'; export default Ember.Component.extend(NotifierMixin, { + sectionService: Ember.inject.service('section'), + + didReceiveAttrs() { + let self = this; + this.get('sectionService').getAll().then(function(sections) { + self.set('sections', sections); + }); + }, didRender() { let self = this; + Mousetrap.bind('esc', function() { self.send('onCancel'); return false; @@ -28,12 +37,6 @@ export default Ember.Component.extend(NotifierMixin, { }, addSection(section) { - - if (section.preview) { - this.showNotification("Coming soon!"); - return; - } - this.attrs.onAction(section); } } diff --git a/app/app/components/folder/folder-toolbar.js b/app/app/components/folder/folder-toolbar.js index ea1140c1f..d8a06bc56 100644 --- a/app/app/components/folder/folder-toolbar.js +++ b/app/app/components/folder/folder-toolbar.js @@ -18,32 +18,24 @@ const { } = Ember; export default Ember.Component.extend(NotifierMixin, TooltipMixin, { + folderService: Ember.inject.service('folder'), documentService: Ember.inject.service('document'), - templateService: Ember.inject.service('template'), - folderService: Ember.inject.service('folder'), session: Ember.inject.service(), + appMeta: Ember.inject.service(), + showToolbar: false, folder: {}, busy: false, importedDocuments: [], - savedTemplates: [], isFolderOwner: computed.equal('folder.userId', 'session.user.id'), moveFolderId: "", + drop: null, didReceiveAttrs() { this.set('isFolderOwner', this.get('folder.userId') === this.get("session.user.id")); - let self = this; - - this.get('templateService').getSavedTemplates().then(function(saved) { - let emptyTemplate = { - id: "0", - title: "Empty document", - selected: true - }; - saved.unshiftObject(emptyTemplate); - self.set('savedTemplates', saved); - }); + let show = this.get('isFolderOwner') || this.get('hasSelectedDocuments') || this.get('folderService').get('canEditCurrentFolder'); + this.set('showToolbar', show); let targets = _.reject(this.get('folders'), { id: this.get('folder').get('id') @@ -62,34 +54,67 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { this.addTooltip(document.getElementById("folder-settings-button")); } if (this.get('folderService').get('canEditCurrentFolder')) { - this.addTooltip(document.getElementById("start-document-button")); + this.addTooltip(document.getElementById("import-document-button")); } } - }, + + if (this.get('folderService').get('canEditCurrentFolder')) { + let self = this; + let folderId = this.get('folder.id'); + let url = this.get('appMeta.endpoint'); + let importUrl = `${url}/import/folder/${folderId}`; + + let dzone = new Dropzone("#import-document-button > i", { + headers: { + 'Authorization': 'Bearer ' + self.get('session.session.content.authenticated.token') + }, + url: importUrl, + method: "post", + paramName: 'attachment', + acceptedFiles: ".doc,.docx,.txt,.md,.markdown", + clickable: true, + maxFilesize: 10, + parallelUploads: 3, + uploadMultiple: false, + addRemoveLinks: false, + autoProcessQueue: true, + + init: function () { + this.on("success", function (document) { + self.send('onDocumentImported', document.name, document); + }); + + this.on("error", function (x) { + console.log("Conversion failed for ", x.name, " obj ", x); // TODO proper error handling + }); + + this.on("queuecomplete", function () {}); + + this.on("addedfile", function (file) { + self.send('onDocumentImporting', file.name); + self.audit.record('converted-document'); + }); + } + }); + + dzone.on("complete", function (file) { + dzone.removeFile(file); + }); + + this.set('drop', dzone); + } + }, willDestroyElement() { - this.destroyTooltips(); - }, + if (is.not.null(this.get('drop'))) { + this.get('drop').destroy(); + this.set('drop', null); + } - navigateToDocument(document) { - this.attrs.showDocument(this.get('folder'), document); + this.destroyTooltips(); }, actions: { - onEditTemplate(template) { - this.navigateToDocument(template); - }, - - onDocumentTemplate(id /*, title, type*/ ) { - let self = this; - - this.send("showNotification", "Creating"); - - this.get('templateService').importSavedTemplate(this.folder.get('id'), id).then(function(document) { - self.navigateToDocument(document); - }); - }, - onDocumentImporting(filename) { this.send("showNotification", `Importing ${filename}`); diff --git a/app/app/components/folder/folders-list.js b/app/app/components/folder/folders-list.js index 31a61e44f..137758050 100644 --- a/app/app/components/folder/folders-list.js +++ b/app/app/components/folder/folders-list.js @@ -12,24 +12,55 @@ import Ember from 'ember'; import constants from '../../utils/constants'; import TooltipMixin from '../../mixins/tooltip'; +import NotifierMixin from '../../mixins/notifier'; -export default Ember.Component.extend(TooltipMixin, { +export default Ember.Component.extend(TooltipMixin, NotifierMixin, { folderService: Ember.inject.service('folder'), + templateService: Ember.inject.service('template'), publicFolders: [], protectedFolders: [], privateFolders: [], + savedTemplates: [], hasPublicFolders: false, hasProtectedFolders: false, hasPrivateFolders: false, newFolder: "", + showScrollTool: false, + showingDocument: false, + showingList: true, - didInsertElement() { + init() { this._super(...arguments); - if (this.session.authenticated) { - this.addTooltip(document.getElementById("add-folder-button")); + + let _this = this; + this.get('templateService').getSavedTemplates().then(function(saved) { + let emptyTemplate = { + id: "0", + title: "Empty", + description: "An empty canvas for your words", + img: "template-blank", + }; + + saved.forEach(function(t) { + t.img = "template-saved"; + }); + + saved.unshiftObject(emptyTemplate); + _this.set('savedTemplates', saved); + }); + }, + + didRender() { + if (this.get('folderService').get('canEditCurrentFolder')) { + this.addTooltip(document.getElementById("start-document-button")); } }, + didInsertElement() { + this.eventBus.subscribe('resized', this, 'positionTool'); + this.eventBus.subscribe('scrolled', this, 'positionTool'); + }, + didReceiveAttrs() { let folders = this.get('folders'); @@ -65,7 +96,37 @@ export default Ember.Component.extend(TooltipMixin, { this.destroyTooltips(); }, + positionTool() { + if (this.get('isDestroyed') || this.get('isDestroying')) { + return; + } + + let s = $(".scroll-space-tool"); + let windowpos = $(window).scrollTop(); + + if (windowpos >= 300) { + this.set('showScrollTool', true); + s.addClass("stuck-space-tool"); + s.css('left', parseInt($(".zone-sidebar").css('width')) - 18 + 'px'); + } else { + this.set('showScrollTool', false); + s.removeClass("stuck-space-tool"); + } + }, + + navigateToDocument(document) { + this.attrs.showDocument(this.get('folder'), document); + }, + actions: { + scrollTop() { + this.set('showScrollTool', false); + + $("html,body").animate({ + scrollTop: 0 + }, 500, "linear"); + }, + addFolder() { var folderName = this.get('newFolder'); @@ -78,6 +139,30 @@ export default Ember.Component.extend(TooltipMixin, { this.set('newFolder', ""); return true; - } + }, + + showDocument() { + this.set('showingDocument', true); + this.set('showingList', false); + }, + + showList() { + this.set('showingDocument', false); + this.set('showingList', true); + }, + + onEditTemplate(template) { + this.navigateToDocument(template); + }, + + onDocumentTemplate(id /*, title, type*/ ) { + let self = this; + + this.send("showNotification", "Creating"); + + this.get('templateService').importSavedTemplate(this.folder.get('id'), id).then(function(document) { + self.navigateToDocument(document); + }); + } } }); diff --git a/app/app/components/folder/start-document.js b/app/app/components/folder/start-document.js index 30638575b..93a60577d 100644 --- a/app/app/components/folder/start-document.js +++ b/app/app/components/folder/start-document.js @@ -14,108 +14,21 @@ import NotifierMixin from '../../mixins/notifier'; export default Ember.Component.extend(NotifierMixin, { localStorage: Ember.inject.service(), - tagName: 'span', - selectedTemplate: { - id: "0" - }, canEditTemplate: "", - drop: null, - appMeta: Ember.inject.service(), - - didReceiveAttrs() { - this.send('setTemplate', this.get('savedTemplates')[0]); - }, - - willDestroyElement() { - if (is.not.null(this.get('drop'))) { - this.get('drop').destroy(); - this.set('drop', null); - } - }, actions: { - setTemplate(chosen) { - if (is.undefined(chosen)) { - return; - } - - this.set('selectedTemplate', chosen); - this.set('canEditTemplate', chosen.id !== "0" ? "Edit" : ""); - - let templates = this.get('savedTemplates'); - - templates.forEach(template => { - Ember.set(template, 'selected', template.id === chosen.id); - }); - }, - - editTemplate() { - let template = this.get('selectedTemplate'); - + editTemplate(template) { this.audit.record('edited-saved-template'); this.attrs.onEditTemplate(template); return true; }, - startDocument() { - let template = this.get('selectedTemplate'); - + startDocument(template) { this.audit.record('used-saved-template'); this.attrs.onDocumentTemplate(template.id, template.title, "private"); - return true; - }, - - onOpenCallback() { - if (is.not.null(this.get('drop'))) { - return; - } - - let self = this; - let folderId = this.get('folder.id'); - let url = this.get('appMeta.endpoint'); - let importUrl = `${url}/import/folder/${folderId}`; - - Dropzone.options.uploadDocuments = false; - - let dzone = new Dropzone("#upload-documents", { - headers: { - 'Authorization': 'Bearer ' + self.get('session.session.content.authenticated.token') - }, - url: importUrl, - method: "post", - paramName: 'attachment', - acceptedFiles: ".doc,.docx,.txt,.md,.markdown", - clickable: true, - maxFilesize: 10, - parallelUploads: 3, - uploadMultiple: false, - addRemoveLinks: false, - autoProcessQueue: true, - - init: function () { - this.on("success", function (document) { - self.attrs.onDocumentImported(document.name, document); - }); - this.on("error", function (x) { - console.log("Conversion failed for ", x.name, " obj ", x); // TODO proper error handling - }); - - this.on("queuecomplete", function () {}); - - this.on("addedfile", function (file) { - self.attrs.onDocumentImporting(file.name); - self.audit.record('converted-document'); - }); - } - }); - - dzone.on("complete", function (file) { - dzone.removeFile(file); - }); - - this.set('drop', dzone); + return true; } } -}); \ No newline at end of file +}); diff --git a/app/app/helpers/document/file-icon.js b/app/app/helpers/document/file-icon.js index 1d1d69049..5a0221914 100644 --- a/app/app/helpers/document/file-icon.js +++ b/app/app/helpers/document/file-icon.js @@ -107,7 +107,7 @@ export function documentFileIcon(params) { case "xslt": } - return new Ember.Handlebars.SafeString(html); + return new Ember.String.htmlSafe(html); } export default Ember.Helper.helper(documentFileIcon); diff --git a/app/app/models/.gitkeep b/app/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/app/pods/customize/template.hbs b/app/app/pods/customize/template.hbs index ae1e4594d..b386b6ecb 100644 --- a/app/app/pods/customize/template.hbs +++ b/app/app/pods/customize/template.hbs @@ -1,12 +1,8 @@ {{#layout/zone-container}} {{layout/zone-navigation}} - - {{#layout/zone-header title="Documize Settings" message="General options, space management, user management"}} - {{layout/button-home}} - {{/layout/zone-header}} - {{#layout/zone-sidebar}} + {{back-to-home}}
    {{#link-to 'customize.general' activeClass='selected' class="option" tagName="li"}}General{{/link-to}} diff --git a/app/app/pods/document/index/controller.js b/app/app/pods/document/index/controller.js index d73cbf8a6..ea79455d6 100644 --- a/app/app/pods/document/index/controller.js +++ b/app/app/pods/document/index/controller.js @@ -193,15 +193,42 @@ export default Ember.Controller.extend(NotifierMixin, { }); }, - onAddPage(page) { - let self = this; - - this.get('documentService').addPage(this.get('model.id'), page).then(function (newPage) { - self.transitionToRoute('document.edit', - self.get('folder.id'), - self.get('folder.slug'), - self.get('model.id'), - self.get('model.slug'), + onAddSection(section) { + this.audit.record("added-section"); + this.audit.record("added-section-" + section.get('contentType')); + + let page = { + documentId: this.get('model.id'), + title: `${section.get('title')} Section`, + level: 1, + sequence: 2048, + body: "", + contentType: section.get('contentType') + }; + + let data = this.get('store').normalize('page', page); + let pageData = this.get('store').push(data); + + let meta = { + documentId: this.get('model.id'), + rawBody: "", + config: "" + }; + + let pageMeta = this.get('store').normalize('page-meta', meta); + let pageMetaData = this.get('store').push(pageMeta); + + let model = { + page: pageData, + meta: pageMetaData + }; + + this.get('documentService').addPage(this.get('model.id'), model).then((newPage) => { + this.transitionToRoute('document.edit', + this.get('folder.id'), + this.get('folder.slug'), + this.get('model.id'), + this.get('model.slug'), newPage.id); }); }, diff --git a/app/app/pods/document/index/template.hbs b/app/app/pods/document/index/template.hbs index a9fd74eed..4554f0ba2 100644 --- a/app/app/pods/document/index/template.hbs +++ b/app/app/pods/document/index/template.hbs @@ -2,24 +2,22 @@ {{layout/zone-navigation}} - {{#layout/zone-header title=model.name message=model.excerpt}} - {{document/document-toolbar document=model pages=pages folder=folder owner=owner - isEditor=isEditor users=users - onSaveTemplate=(action 'onSaveTemplate') - onDocumentChange=(action 'onDocumentChange') - onAttachmentUpload=(action 'onAttachmentUpload') - onDocumentDelete=(action 'onDocumentDelete')}} - {{/layout/zone-header}} - {{#layout/zone-sidebar}} {{document/document-sidebar document=model meta=meta folder=folder pages=pages page=page owner=owner isEditor=isEditor - onAddPage=(action 'onAddPage') + onAddSection=(action 'onAddSection') changePageSequence=(action 'onPageSequenceChange') changePageLevel=(action 'onPageLevelChange') gotoPage=(action 'gotoPage')}} {{/layout/zone-sidebar}} {{#layout/zone-content}} + {{document/document-toolbar document=model pages=pages folder=folder owner=owner + isEditor=isEditor users=users + onSaveTemplate=(action 'onSaveTemplate') + onDocumentChange=(action 'onDocumentChange') + onAttachmentUpload=(action 'onAttachmentUpload') + onDocumentDelete=(action 'onDocumentDelete')}} + {{document/document-view document=model pages=pages attachments=attachments folder=folder folders=folders isEditor=isEditor onAttachmentDeleted=(action 'onAttachmentDeleted') diff --git a/app/app/pods/folders/folder/template.hbs b/app/app/pods/folders/folder/template.hbs index 0e8d010dc..e99781d3e 100644 --- a/app/app/pods/folders/folder/template.hbs +++ b/app/app/pods/folders/folder/template.hbs @@ -2,22 +2,21 @@ {{layout/zone-navigation}} - {{#layout/zone-header title=model.folder.name message="A space provides a place for related content"}} + {{#layout/zone-sidebar}} + {{folder/folders-list folders=model.folders folder=model.folder + onFolderAdd=(action 'onFolderAdd') + showDocument=(action 'showDocument')}} + {{/layout/zone-sidebar}} + + {{#layout/zone-content}} {{folder/folder-toolbar folders=model.folders folder=model.folder hasSelectedDocuments=hasSelectedDocuments refresh=(action 'refresh') onDeleteDocument=(action 'onDeleteDocument') - onMoveDocument=(action 'onMoveDocument') - showDocument=(action 'showDocument')}} - {{/layout/zone-header}} + onMoveDocument=(action 'onMoveDocument')}} - {{#layout/zone-sidebar}} - {{folder/folders-list folders=model.folders onFolderAdd=(action 'onFolderAdd')}} - {{/layout/zone-sidebar}} - - {{#layout/zone-content}} {{folder/documents-list documents=model.documents folder=model.folder isFolderOwner=isFolderOwner onDocumentsChecked=(action 'onDocumentsChecked') }} {{/layout/zone-content}} diff --git a/app/app/pods/folders/settings/route.js b/app/app/pods/folders/settings/route.js index 008ccf081..f44e2dbcf 100644 --- a/app/app/pods/folders/settings/route.js +++ b/app/app/pods/folders/settings/route.js @@ -113,7 +113,6 @@ export default Ember.Route.extend(NotifierMixin, { }, onRemove(moveId) { - this.get('folderService').remove(this.folder.get('id'), moveId).then(() => { /* jshint ignore:line */ this.showNotification("Deleted"); this.get('localStorage').clearSessionItem('folder'); @@ -125,8 +124,7 @@ export default Ember.Route.extend(NotifierMixin, { }); }, - onShare: function (invitation) { - + onShare: function(invitation) { this.get('folderService').share(this.folder.get('id'), invitation).then(() => { this.showNotification("Shared"); }); diff --git a/app/app/pods/folders/settings/template.hbs b/app/app/pods/folders/settings/template.hbs index 121c5013e..2104aafde 100644 --- a/app/app/pods/folders/settings/template.hbs +++ b/app/app/pods/folders/settings/template.hbs @@ -2,16 +2,8 @@ {{layout/zone-navigation}} - {{#layout/zone-header title=model.name message="Settings, sharing, permissions and deletion"}} - {{#link-to 'folders.folder' model.id model.slug}} -
    - arrow_back -
    space
    -
    - {{/link-to}} - {{/layout/zone-header}} - {{#layout/zone-sidebar}} + {{back-to-space folder=model}}
    • General
      • diff --git a/app/app/pods/profile/template.hbs b/app/app/pods/profile/template.hbs index f01bedae0..976577a94 100644 --- a/app/app/pods/profile/template.hbs +++ b/app/app/pods/profile/template.hbs @@ -2,11 +2,8 @@ {{layout/zone-navigation}} - {{#layout/zone-header title=session.user.fullname message="Your Documize profile"}} - {{layout/button-home}} - {{/layout/zone-header}} - {{#layout/zone-sidebar}} + {{back-to-home}}
      {{session.user.initials}}
      diff --git a/app/app/routes/application.js b/app/app/routes/application.js index 82dc16d42..7998a1f1a 100644 --- a/app/app/routes/application.js +++ b/app/app/routes/application.js @@ -22,12 +22,12 @@ export default Ember.Route.extend(ApplicationRouteMixin, { session: service(), beforeModel(transition) { + // start TODO: ugly hack let MutationObserver = window.MutationObserver || window.WebKitMutationObserver; - let observer = new MutationObserver(function(/*mutations, observer*/) { // fired when a mutation occurs // console.log(mutations, observer); - $("#zone-sidebar").css('height', $(document).height() - $("#zone-navigation").height() - $("#zone-header").height() - 35); + $("#zone-sidebar").css('height', $(document).height() - $("#zone-navigation").height()); }); observer.observe(document, { @@ -35,6 +35,7 @@ export default Ember.Route.extend(ApplicationRouteMixin, { attributes: false, childList: true }); + // end TODO: ugly hack return this.get('appMeta').boot(transition.targetName).then(data => { if (this.get('session.session.authenticator') !== "authenticator:documize" && data.allowAnonymousAccess) { @@ -46,8 +47,7 @@ export default Ember.Route.extend(ApplicationRouteMixin, { }, actions: { - willTransition: function ( /*transition*/ ) { - $("#zone-sidebar").css('height', 'auto'); + willTransition: function( /*transition*/ ) { Mousetrap.reset(); }, diff --git a/app/app/services/app-meta.js b/app/app/services/app-meta.js index cb6ad43a8..fcc8342e4 100644 --- a/app/app/services/app-meta.js +++ b/app/app/services/app-meta.js @@ -34,7 +34,7 @@ export default Ember.Service.extend({ return [this.get('endpoint'), endpoint].join('/'); }, - boot(/*requestedUrl*/) { + boot(requestedUrl) { // jshint ignore:line let dbhash; if (is.not.null(document.head.querySelector("[property=dbhash]"))) { dbhash = document.head.querySelector("[property=dbhash]").content; diff --git a/app/app/services/document.js b/app/app/services/document.js index de3f093af..f17717fab 100644 --- a/app/app/services/document.js +++ b/app/app/services/document.js @@ -189,7 +189,6 @@ export default Ember.Service.extend({ // document meta referes to number of views, edits, approvals, etc. getMeta(documentId) { - return this.get('ajax').request(`documents/${documentId}/meta`, { method: "GET" }); diff --git a/app/app/services/event-bus.js b/app/app/services/event-bus.js index 58301200d..2894c81c4 100644 --- a/app/app/services/event-bus.js +++ b/app/app/services/event-bus.js @@ -1,17 +1,29 @@ // Copyright 2016 Documize Inc. . All rights reserved. // -// This software (Documize Community Edition) is licensed under +// This software (Documize Community Edition) is licensed under // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // // You can operate outside the AGPL restrictions by purchasing // Documize Enterprise Edition and obtaining a commercial license -// by contacting . +// by contacting . // // https://documize.com import Ember from 'ember'; export default Ember.Service.extend(Ember.Evented, { + init() { + let _this = this; + + window.addEventListener("scroll", _.throttle(function() { + _this.publish('scrolled', null); + }, 100)); + + window.addEventListener("resize", _.debounce(function() { + _this.publish('resized', null); + }, 100)); + }, + publish: function() { return this.trigger.apply(this, arguments); }, @@ -23,4 +35,4 @@ export default Ember.Service.extend(Ember.Evented, { unsubscribe: function() { return this.off.apply(this, arguments); } -}); \ No newline at end of file +}); diff --git a/app/app/styles/app.scss b/app/app/styles/app.scss index 2d73151f9..98de9fe2b 100644 --- a/app/app/styles/app.scss +++ b/app/app/styles/app.scss @@ -17,17 +17,16 @@ @import "view/layout.scss"; @import "view/page-search.scss"; @import "view/page-documents.scss"; -@import "view/page-folder-settings.scss"; @import "view/page-settings.scss"; @import "view/page-auth.scss"; @import "view/page-onboard.scss"; @import "view/page-exceptions.scss"; -@import "view/document/toolbar.scss"; @import "view/document/sidebar.scss"; @import "view/document/content.scss"; @import "view/document/wysiwyg.scss"; @import "view/document/editor.scss"; @import "view/document/wizard.scss"; +@import "view/common.scss"; @import "vendor.scss"; @import "responsive.scss"; @import "print.scss"; diff --git a/app/app/styles/base.scss b/app/app/styles/base.scss index e3e1d8a0c..bc6c6ecf0 100644 --- a/app/app/styles/base.scss +++ b/app/app/styles/base.scss @@ -17,6 +17,7 @@ .text-left { text-align: left; } .text-right { text-align: right; } .text-center { text-align: center; } +.center { margin: 0 auto; } .bold { font-weight: bold; } .italic { font-style: italic; } .text-uppercase { text-transform: uppercase; } @@ -52,7 +53,7 @@ a { text-shadow: 1px 1px 1px rgba(0,0,0,0.004); a:hover, a:focus { - text-decoration: underline; + text-decoration: none; } } diff --git a/app/app/styles/color.scss b/app/app/styles/color.scss index a444b4c4e..37cf0a983 100644 --- a/app/app/styles/color.scss +++ b/app/app/styles/color.scss @@ -10,26 +10,26 @@ // https://documize.com $color-off-white: #f5f5f5; -$color-off-black: #333333; +$color-off-black: #393939; $color-black: #000000; $color-white: #ffffff; -$color-primary: #115a97; +$color-primary: #2667af; $color-red: #d04134; $color-green: #4caf50; -$color-blue: #115a97; +$color-blue: #2667af; $color-gray: #8b9096; $color-goldy: #cc9933; $color-header: #f3f5f8; $color-link: #0092d3; -$color-border: #e1e1e1; +$color-border: #f3f5f8; $color-input: #5a5a5a; $color-stroke: #e1e1e1; $color-tooltip: #a1a1a1; $color-toast: #4c4c4c; -$color-checkbox: #115a97; +$color-checkbox: #2667af; $color-card-active: #f7fcff; $color-chip: #98A2AB; @@ -37,39 +37,39 @@ $color-chip: #dff0f9; $color-chip-border: #daeaf3; $color-chip-text: #1b88e3; -.background-color-white { - background-color: $color-white; -} .color-white { - color: $color-white; + color: $color-white !important; } .color-off-white { - color: $color-off-white; + color: $color-off-white !important; } .color-black { - color: $color-black; + color: $color-black !important; } .color-off-black { - color: $color-off-black; -} -.background-color-primary { - background-color: $color-primary; + color: $color-off-black !important; } .color-primary { - color: $color-primary; + color: $color-primary !important; } .color-link { - color: $color-link; + color: $color-link !important; } .color-blue { - color: $color-blue; + color: $color-blue !important; } .color-red { - color: $color-red; + color: $color-red !important; } .color-green { - color: $color-green; + color: $color-green !important; } .color-gray { - color: $color-gray; + color: $color-gray !important; +} +.background-color-white { + background-color: $color-white !important; +} +.background-color-primary { + background-color: $color-primary !important; } diff --git a/app/app/styles/functions.scss b/app/app/styles/functions.scss index 5282693a4..1f06bdc39 100644 --- a/app/app/styles/functions.scss +++ b/app/app/styles/functions.scss @@ -137,3 +137,32 @@ $opacity-ie: $opacity * 100; filter: alpha(opacity=$opacity-ie); //IE8 } + +@keyframes fadein { + from { opacity: 0; } + to { opacity: 1; } +} + +/* Firefox < 16 */ +@-moz-keyframes fadein { + from { opacity: 0; } + to { opacity: 1; } +} + +/* Safari, Chrome and Opera > 12.1 */ +@-webkit-keyframes fadein { + from { opacity: 0; } + to { opacity: 1; } +} + +/* Internet Explorer */ +@-ms-keyframes fadein { + from { opacity: 0; } + to { opacity: 1; } +} + +/* Opera < 12.1 */ +@-o-keyframes fadein { + from { opacity: 0; } + to { opacity: 1; } +} diff --git a/app/app/styles/view/common.scss b/app/app/styles/view/common.scss new file mode 100644 index 000000000..ef57b6024 --- /dev/null +++ b/app/app/styles/view/common.scss @@ -0,0 +1,21 @@ +.space-button { + width: 100%; +} + +.space-name { + max-width: 90%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} + +.back-to-home-button { + width: 100%; +} + +.back-to-home-name { + max-width: 90%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} diff --git a/app/app/styles/view/document/content.scss b/app/app/styles/view/document/content.scss index 609b88c10..6d3d74813 100644 --- a/app/app/styles/view/document/content.scss +++ b/app/app/styles/view/document/content.scss @@ -20,7 +20,7 @@ > .list { margin: 0; - padding: 7px; + padding: 7px 0; > .item { color: $color-off-black; @@ -31,7 +31,6 @@ padding-bottom: 10px; > .icon { - vertical-align: text-top; margin-right: 10px; } @@ -43,16 +42,16 @@ } > .file { - font-size: 0.9rem; + font-size: 1rem; } } > .action { float: right; - margin-top: -8px; + margin-top: -2px; margin-right: 5px; @extend .cursor-pointer; - opacity: 0.3; + opacity: 0.5; @extend .transition-all; display: none; color: $color-stroke; diff --git a/app/app/styles/view/document/sidebar.scss b/app/app/styles/view/document/sidebar.scss index 5b967c883..04de515e9 100644 --- a/app/app/styles/view/document/sidebar.scss +++ b/app/app/styles/view/document/sidebar.scss @@ -1,9 +1,10 @@ .document-sidebar { @extend .no-select; + width: 100%; > .summary-line { color: $color-gray; - margin: 20px 0 30px 0; + margin: 30px 0; >.items { padding: 0; @@ -43,12 +44,54 @@ } } } + + > .active { + > .metric { + color: $color-link; + } + } } } - .stick { + .stuck-toc { position: fixed; - top: 10px; + top: 20px; + -webkit-animation: fadein 1s; /* Safari, Chrome and Opera > 12.1 */ + -moz-animation: fadein 1s; /* Firefox < 16 */ + -ms-animation: fadein 1s; /* Internet Explorer */ + -o-animation: fadein 1s; /* Opera < 12.1 */ + animation: fadein 1s; + } + + .section-tool { + position: absolute; + top: 150px; + right: -18px; + z-index: 999; + } + + .scroll-tool { + position: absolute; + top: 150px; + right: -18px; + z-index: 888; + -webkit-animation: fadein 1s; /* Safari, Chrome and Opera > 12.1 */ + -moz-animation: fadein 1s; /* Firefox < 16 */ + -ms-animation: fadein 1s; /* Internet Explorer */ + -o-animation: fadein 1s; /* Opera < 12.1 */ + animation: fadein 1s; + } + + .stuck-tool { + position: fixed !important; + top: 150px !important; + right: 0; + left: 0; + -webkit-animation: fadein 1s; /* Safari, Chrome and Opera > 12.1 */ + -moz-animation: fadein 1s; /* Firefox < 16 */ + -ms-animation: fadein 1s; /* Internet Explorer */ + -o-animation: fadein 1s; /* Opera < 12.1 */ + animation: fadein 1s; } .close-action { diff --git a/app/app/styles/view/document/toolbar.scss b/app/app/styles/view/document/toolbar.scss deleted file mode 100644 index 44db54582..000000000 --- a/app/app/styles/view/document/toolbar.scss +++ /dev/null @@ -1,8 +0,0 @@ -.document-toolbar { - .space-name { - max-width: 200px; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } -} \ No newline at end of file diff --git a/app/app/styles/view/document/wizard.scss b/app/app/styles/view/document/wizard.scss index cd7d777df..531bb1c74 100644 --- a/app/app/styles/view/document/wizard.scss +++ b/app/app/styles/view/document/wizard.scss @@ -1,9 +1,8 @@ .section-wizard { - margin: 30px; + margin: 20px 0 30px 0; > .canvas { padding: 0; - margin: 30px 0; > .list { margin: 0; @@ -11,61 +10,55 @@ > .item { list-style: none; - float: left; cursor: pointer; - width: 400px; - height: 80px; - background-color: $color-white; - border: 1px solid $color-border; - border-radius: 3px; - margin: 0 30px 30px 0; + padding: 10px 0; + margin: 5px 0; + @include ease-in(); &:hover { - background-color: $color-card-active; - border: 1px solid $color-border; - transition: 0.2s all ease; + @include ease-in(); + + > .details { + > .title { + color: $color-primary; + } + + > .desc { + color: $color-primary; + } + } } .icon { text-align: center; display: inline-block; + width: 50px; > .img { + float: left; text-align: center; - margin: 17px 10px 0 20px; display: inline-block; - height: 45px; - width: 45px; + height: 40px; + width: 40px; } } > .details { vertical-align: top; display: inline-block; + width: 80%; > .title { font-size: 1rem; font-weight: bold; color: $color-off-black; - margin-top: 18px; letter-spacing: 0.5px; - - .preview { - font-size: 0.7rem; - color: $color-goldy; - display: inline-block; - margin-left: 10px; - } } > .desc { color: $color-gray; - font-size: 0.8rem; + font-size: 0.9rem; margin-top: 5px; - max-width: 300px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; } } } diff --git a/app/app/styles/view/document/wysiwyg.scss b/app/app/styles/view/document/wysiwyg.scss index 56874af7a..2baebd3aa 100644 --- a/app/app/styles/view/document/wysiwyg.scss +++ b/app/app/styles/view/document/wysiwyg.scss @@ -45,8 +45,8 @@ h1 { - font-size: 2em; - font-weight: bold; + font-size: 1.6em; + font-family: open_sansregular; color:$color-off-black; margin: 30px 0 20px 0; } @@ -134,7 +134,7 @@ border-width: 2px; } th { - background: #e6e6e6; + background: #efefef; } } } diff --git a/app/app/styles/view/layout.scss b/app/app/styles/view/layout.scss index 1fc0f2363..d40286313 100644 --- a/app/app/styles/view/layout.scss +++ b/app/app/styles/view/layout.scss @@ -9,7 +9,8 @@ margin: 0; width: 100%; font-size: 1rem; - padding: 15px 40px 15px 40px; + padding: 10px 40px 10px 40px; + .content { > .title { padding-left: 15px; @@ -49,6 +50,7 @@ } } } + .header-button { display: inline-block; position: relative; @@ -63,14 +65,21 @@ vertical-align: middle; background-color: $color-white; text-align: center; + &:hover { @extend .z-depth-1; } + + &:before { + border-radius: 0; + } + > .material-icons { color: $color-primary; text-align: center; font-size: 1.4em; } + > .initials { color: $color-primary; text-align: center; @@ -79,15 +88,12 @@ line-height: 2.6rem; font-family: open_sansregular; } - &:before { - border-radius: 0; - } } } .zone-header { background-color: $color-header; - padding: 0 40px 0 40px; + padding: 30px 40px 30px 40px; > .info { padding: 20px 0 20px 0; > .title { @@ -106,10 +112,10 @@ } .zone-sidebar { + background-color: $color-header; height: 100%; min-height: 100%; - padding: 0 40px 0 40px; - border-right: 1px solid $color-border; + padding: 40px 40px 0 40px; float: left; } diff --git a/app/app/styles/view/page-documents.scss b/app/app/styles/view/page-documents.scss index 6a541785a..175cd9402 100644 --- a/app/app/styles/view/page-documents.scss +++ b/app/app/styles/view/page-documents.scss @@ -1,12 +1,39 @@ +.space-tools { + .doc-tool { + position: absolute; + top: 150px; + right: -18px; + z-index: 999; + } -.folders-list { - > .add-space-action { - text-align: center; - margin-bottom: 30px; + .scroll-space-tool { + position: absolute; + top: 150px; + right: -18px; + z-index: 888; + -webkit-animation: fadein 1s; /* Safari, Chrome and Opera > 12.1 */ + -moz-animation: fadein 1s; /* Firefox < 16 */ + -ms-animation: fadein 1s; /* Internet Explorer */ + -o-animation: fadein 1s; /* Opera < 12.1 */ + animation: fadein 1s; } + .stuck-space-tool { + position: fixed !important; + top: 150px !important; + right: 0; + left: 0; + -webkit-animation: fadein 1s; /* Safari, Chrome and Opera > 12.1 */ + -moz-animation: fadein 1s; /* Firefox < 16 */ + -ms-animation: fadein 1s; /* Internet Explorer */ + -o-animation: fadein 1s; /* Opera < 12.1 */ + animation: fadein 1s; + } +} + +.folders-list { > .section { - margin: 0 0 20px 0; + margin: 30px 0 10px 0; > .heading { font-size: 0.9rem; @@ -57,6 +84,7 @@ width: 100%; position: relative; transition: .3s; + border-bottom: 1px solid $color-border; &:hover { > .link { @@ -145,11 +173,6 @@ } } -.upload-container { - text-align: center; - margin: 2rem 0; -} - .no-documents { margin-top: 50px; text-align: center; @@ -172,3 +195,67 @@ } } } + +.templates-list { + margin: 0; + + > .list { + margin: 0; + padding: 0; + + > .item { + list-style: none; + cursor: pointer; + padding: 10px 5px; + margin: 5px 0; + @include ease-in(); + + &:hover { + @include ease-in(); + + > .details { + > .title { + color: $color-primary; + } + + > .desc { + color: $color-primary; + } + } + } + + .icon { + text-align: center; + display: inline-block; + width: 50px; + + > .img { + float: left; + text-align: center; + display: inline-block; + height: 40px; + width: 40px; + } + } + + > .details { + vertical-align: top; + display: inline-block; + width: 80%; + + > .title { + font-size: 1rem; + font-weight: bold; + color: $color-off-black; + letter-spacing: 0.5px; + } + + > .desc { + color: $color-gray; + font-size: 0.9rem; + margin-top: 5px; + } + } + } + } +} diff --git a/app/app/styles/view/page-folder-settings.scss b/app/app/styles/view/page-folder-settings.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/app/styles/widget/widget-button.scss b/app/app/styles/widget/widget-button.scss index 31bff6e72..30c575a6e 100644 --- a/app/app/styles/widget/widget-button.scss +++ b/app/app/styles/widget/widget-button.scss @@ -50,7 +50,7 @@ transition: .3s; cursor: pointer; vertical-align: middle; - border: 1px solid $color-gray; + border: 1px solid $color-stroke; text-align: center; @extend .no-select; @include ease-in(); @@ -61,8 +61,9 @@ } i { - color: $color-gray; + color: $color-stroke; text-align: center; + width: 100%; } &:before { diff --git a/app/app/styles/widget/widget-sidebar-menu.scss b/app/app/styles/widget/widget-sidebar-menu.scss index a309f1a07..c1240d8b3 100644 --- a/app/app/styles/widget/widget-sidebar-menu.scss +++ b/app/app/styles/widget/widget-sidebar-menu.scss @@ -1,5 +1,5 @@ .sidebar-menu { - margin: 30px 0; + margin: 30px 0 0 0; > .options { padding: 0; @@ -11,7 +11,7 @@ list-style: none; cursor: pointer; @extend .no-select; - color: $color-gray; + color: $color-off-black; &:hover { color: $color-link; diff --git a/app/app/templates/components/back-to-home.hbs b/app/app/templates/components/back-to-home.hbs new file mode 100644 index 000000000..c46394f15 --- /dev/null +++ b/app/app/templates/components/back-to-home.hbs @@ -0,0 +1,6 @@ +{{#link-to 'application' }} +
      + arrow_back +
      home
      +
      +{{/link-to}} diff --git a/app/app/templates/components/back-to-space.hbs b/app/app/templates/components/back-to-space.hbs new file mode 100644 index 000000000..b6e10d5d0 --- /dev/null +++ b/app/app/templates/components/back-to-space.hbs @@ -0,0 +1,6 @@ +{{#link-to 'folders.folder' folder.id folder.slug}} +
      + arrow_back +
      {{folder.name}}
      +
      +{{/link-to}} diff --git a/app/app/templates/components/document/document-sidebar.hbs b/app/app/templates/components/document/document-sidebar.hbs index 24c0499d6..dfc0ba773 100644 --- a/app/app/templates/components/document/document-sidebar.hbs +++ b/app/app/templates/components/document/document-sidebar.hbs @@ -1,22 +1,24 @@
      + {{back-to-space folder=folder}} + {{#if session.authenticated}}
      diff --git a/app/app/templates/components/folder/folder-toolbar.hbs b/app/app/templates/components/folder/folder-toolbar.hbs index 4f443662f..fdb5b20fb 100644 --- a/app/app/templates/components/folder/folder-toolbar.hbs +++ b/app/app/templates/components/folder/folder-toolbar.hbs @@ -1,60 +1,54 @@ -
      - {{#if hasSelectedDocuments}} -
      - folder -
      -
      -
      - delete -
      - {{#dropdown-dialog target="delete-documents-button" position="bottom right" button="Delete" color="flat-red" onAction=(action 'deleteDocuments')}} -

      Are you sure you want to delete selected documents?

      -

      There is no undo!

      - {{/dropdown-dialog}} - {{#dropdown-dialog target="move-documents-button" position="bottom right" button="Move" color="flat-blue" onAction=(action 'moveDocuments')}} -

      Select destination space

      -
        - {{#each movedFolderOptions as |folder|}} -
      • - {{#if folder.selected}} - radio_button_checked - {{else}} - radio_button_unchecked - {{/if}} -  {{ folder.name }} -
        • - {{/each}} -
      - {{/dropdown-dialog}} - {{else}} - {{#if isFolderOwner}} - {{#link-to 'folders.settings' folder.id folder.slug (query-params tab="tabShare")}} -
      - share -
      - {{/link-to}} -
      - {{#link-to 'folders.settings' folder.id folder.slug}} -
      - settings -
      - {{/link-to}} - {{/if}} - {{#if folderService.canEditCurrentFolder}} +{{#if showToolbar}} + +{{/if}} + +
      diff --git a/app/app/templates/components/folder/folders-list.hbs b/app/app/templates/components/folder/folders-list.hbs index 10c9fb127..373c2fe47 100644 --- a/app/app/templates/components/folder/folders-list.hbs +++ b/app/app/templates/components/folder/folders-list.hbs @@ -1,22 +1,48 @@ -
      -
      +
      + {{#if showingDocument}} +
      + close +
      + + {{folder/start-document + savedTemplates=savedTemplates + folder=folder + onEditTemplate=(action 'onEditTemplate') + onDocumentTemplate=(action 'onDocumentTemplate')}} + {{/if}} + + {{#if showScrollTool}} +
      + vertical_align_top +
      + {{/if}} + + {{#if showingList}} + {{#if folderService.canEditCurrentFolder}} +
      + add +
      + {{/if}} + {{/if}} +
      + +
      + {{#if showingList}} {{#if session.isEditor}} -
    {{/if}} -
+ {{/if}} + + + - + diff --git a/app/app/templates/components/folder/start-document.hbs b/app/app/templates/components/folder/start-document.hbs index eb7e0f234..a527bf210 100644 --- a/app/app/templates/components/folder/start-document.hbs +++ b/app/app/templates/components/folder/start-document.hbs @@ -1,20 +1,19 @@ -{{#dropdown-dialog target="start-document-button" position="bottom right" button="Start" color="flat-green" onAction=(action 'startDocument') button2=canEditTemplate color2="flat-blue" onAction2=(action 'editTemplate') onOpenCallback=(action 'onOpenCallback')}} -
-
Import Word / Markdown
-
+

{{folder.name}}

-

Or use a template:

- -