From e03bb4d6ee1a3750db4c9dba785294bfdbe6909b Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Fri, 24 Jun 2016 13:55:30 -0700 Subject: [PATCH 1/2] Document => Content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We add content to a space — content that can be words, tables, commits, contacts, tickets and more… --- app/app/components/dropdown-dialog.js | 3 +++ app/app/templates/components/dropdown-dialog.hbs | 2 +- .../templates/components/folder/folder-dashboard.hbs | 12 ++++++------ .../templates/components/folder/start-document.hbs | 2 +- app/app/utils/net.js | 1 - app/tests/index.html | 5 ++++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/app/components/dropdown-dialog.js b/app/app/components/dropdown-dialog.js index c63c9b1f..0b4b2f2d 100644 --- a/app/app/components/dropdown-dialog.js +++ b/app/app/components/dropdown-dialog.js @@ -54,6 +54,9 @@ export default Ember.Component.extend({ tetherOptions: { offset: self.offset, targetOffset: self.targetOffset + // optimizations: { + // moveElement: false + // } }, remove: true }); diff --git a/app/app/templates/components/dropdown-dialog.hbs b/app/app/templates/components/dropdown-dialog.hbs index 1bc2256d..6f201020 100644 --- a/app/app/templates/components/dropdown-dialog.hbs +++ b/app/app/templates/components/dropdown-dialog.hbs @@ -14,7 +14,7 @@ {{button2}} {{/if}} -
+
{{button}}
diff --git a/app/app/templates/components/folder/folder-dashboard.hbs b/app/app/templates/components/folder/folder-dashboard.hbs index ee354b80..7700b7a2 100644 --- a/app/app/templates/components/folder/folder-dashboard.hbs +++ b/app/app/templates/components/folder/folder-dashboard.hbs @@ -28,9 +28,9 @@ {{/dropdown-dialog}} {{else}} {{#if folderService.canEditCurrentFolder}} -
+
add -
Document
+
Content
{{/if}} {{#if isFolderOwner}} @@ -69,15 +69,15 @@
add
space
-
+
Create a new space for
all your documentation
add -
document
-
-
Start a new document or
import .doc .docx, .txt .md files
+
content
+
+
Start with a content template or
import .doc .docx, .txt .md files
{{/if}} diff --git a/app/app/templates/components/folder/start-document.hbs b/app/app/templates/components/folder/start-document.hbs index c62c9505..5d554ae9 100644 --- a/app/app/templates/components/folder/start-document.hbs +++ b/app/app/templates/components/folder/start-document.hbs @@ -1,6 +1,6 @@ {{#dropdown-dialog target="start-document-button" position="bottom right" button="Add" color="flat-green" onAction=(action 'startDocument') button2=canEditTemplate color2="flat-blue" onAction2=(action 'editTemplate') onOpenCallback=(action 'onOpenCallback')}}
-
Import Files
+
Import Word / Markdown

Or use a template:

diff --git a/app/app/utils/net.js b/app/app/utils/net.js index 4c36cb32..2ba35f64 100644 --- a/app/app/utils/net.js +++ b/app/app/utils/net.js @@ -40,7 +40,6 @@ function getAppUrl(domain) { } function isAjaxAccessError(reason) { - console.log(reason); if (typeof reason === "undefined") { return false; } diff --git a/app/tests/index.html b/app/tests/index.html index a955841e..514047e7 100644 --- a/app/tests/index.html +++ b/app/tests/index.html @@ -12,11 +12,14 @@ {{content-for "head"}} From 48a60f0fcdaf6a8c029ac16e7ee9afa73c23c1dd Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Fri, 24 Jun 2016 14:21:46 -0700 Subject: [PATCH 2/2] misc. fixes --- app/app/components/document/document-sidebar-toc.js | 3 ++- app/app/components/document/page-heading.js | 10 +++++++--- app/app/pods/document/index/controller.js | 1 - app/app/templates/components/document/page-heading.hbs | 8 +++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/app/components/document/document-sidebar-toc.js b/app/app/components/document/document-sidebar-toc.js index bd199a0d..e5dc1e87 100644 --- a/app/app/components/document/document-sidebar-toc.js +++ b/app/app/components/document/document-sidebar-toc.js @@ -67,6 +67,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { willDestroyElement() { this.eventBus.unsubscribe('documentPageAdded'); + this.destroyTooltips(); }, onDocumentPageAdded(pageId) { @@ -409,4 +410,4 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { this.attrs.gotoPage(id); }, }, -}); \ No newline at end of file +}); diff --git a/app/app/components/document/page-heading.js b/app/app/components/document/page-heading.js index 64b060b2..17194ad0 100644 --- a/app/app/components/document/page-heading.js +++ b/app/app/components/document/page-heading.js @@ -1,11 +1,11 @@ // 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 @@ -22,6 +22,10 @@ export default Ember.Component.extend(TooltipMixin, { } }, + willDestroyElement() { + this.destroyTooltips(); + }, + actions: { editPage(id) { this.attrs.onEditPage(id); @@ -31,4 +35,4 @@ export default Ember.Component.extend(TooltipMixin, { this.attrs.onDeletePage(id); }, } -}); \ No newline at end of file +}); diff --git a/app/app/pods/document/index/controller.js b/app/app/pods/document/index/controller.js index de491176..86663907 100644 --- a/app/app/pods/document/index/controller.js +++ b/app/app/pods/document/index/controller.js @@ -197,7 +197,6 @@ export default Ember.Controller.extend(NotifierMixin, { }, onDocumentDelete() { - console.log("deleting " + this.get('model.id')); let self = this; this.get('documentService').deleteDocument(this.get('model.id')).then(function() { diff --git a/app/app/templates/components/document/page-heading.hbs b/app/app/templates/components/document/page-heading.hbs index 016d16c0..e7aab772 100644 --- a/app/app/templates/components/document/page-heading.hbs +++ b/app/app/templates/components/document/page-heading.hbs @@ -7,11 +7,9 @@ mode_edit {{/link-to}} - {{#unless page.firstPage}} -
- delete -
- {{/unless}} +
+ delete +
{{/if}}