From 7e14651998517b9939b3b5ca4d6493f2329b8f4f Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Sun, 20 Nov 2016 19:55:52 -0800 Subject: [PATCH] switch between docs and wiki layout Closes #60 --- README.md | 2 +- .../components/document/document-toolbar.js | 15 + app/app/components/folder/folders-list.js | 1 + app/app/models/document.js | 1 + app/app/styles/print.scss | 10 + app/app/styles/view/document/content.scss | 10 + .../components/document/document-toolbar.hbs | 6 + .../components/document/document-view.hbs | 2 +- app/app/utils/constants.js | 13 +- app/package.json | 2 +- core/api/endpoint/templates_endpoint.go | 21 +- core/api/entity/objects.go | 3 + core/api/request/document.go | 19 +- core/api/store/store.go | 1 + core/database/scripts/autobuild/db_00000.sql | 1 + core/database/scripts/autobuild/db_00007.sql | 2 + core/product.go | 2 +- embed/bindata_assetfs.go | 1213 +++++++++-------- 18 files changed, 704 insertions(+), 620 deletions(-) create mode 100644 core/database/scripts/autobuild/db_00007.sql diff --git a/README.md b/README.md index dfb31408..46e9ceff 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The mission is to bring software dev inspired features (refactoring, testing, li ## Latest version -v0.32.0 +v0.33.0 ## OS Support diff --git a/app/app/components/document/document-toolbar.js b/app/app/components/document/document-toolbar.js index baa3bc19..7e5c8535 100644 --- a/app/app/components/document/document-toolbar.js +++ b/app/app/components/document/document-toolbar.js @@ -28,6 +28,10 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { didReceiveAttrs() { this.set('saveTemplate.name', this.get('document.name')); this.set('saveTemplate.description', this.get('document.excerpt')); + + let doc = this.get('document'); + + this.set('layoutLabel', doc.get('layout') === 'doc' ? 'Wiki style' : 'Document style'); }, didRender() { @@ -53,6 +57,17 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { window.print(); }, + changeLayout() { + let doc = this.get('document'); + let layout = doc.get('layout') === 'doc' ? 'wiki' : 'doc'; + + doc.set('layout', layout); + + this.attrs.onSaveMeta(doc); + + this.set('layoutLabel', doc.get('layout') === 'doc' ? 'Wiki style' : 'Document style'); + }, + saveTemplate() { var name = this.get('saveTemplate.name'); var excerpt = this.get('saveTemplate.description'); diff --git a/app/app/components/folder/folders-list.js b/app/app/components/folder/folders-list.js index 24cbe931..8937f3d0 100644 --- a/app/app/components/folder/folders-list.js +++ b/app/app/components/folder/folders-list.js @@ -48,6 +48,7 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, { title: "Empty", description: "An empty canvas for your words", img: "template-blank", + layout: "doc", locked: true }; diff --git a/app/app/models/document.js b/app/app/models/document.js index b32b2545..91a6335d 100644 --- a/app/app/models/document.js +++ b/app/app/models/document.js @@ -25,6 +25,7 @@ export default Model.extend({ userId: attr('string'), tags: attr('string'), template: attr('boolean'), + layout: attr('string'), // client-side property selected: attr('boolean', { defaultValue: false }), diff --git a/app/app/styles/print.scss b/app/app/styles/print.scss index 0d42fd6f..48c49939 100644 --- a/app/app/styles/print.scss +++ b/app/app/styles/print.scss @@ -15,6 +15,10 @@ display: none !important; } + .zone-content { + padding: 0 !important; + } + .document-view { .attachment-zone, .document-summary, @@ -28,4 +32,10 @@ display: block !important; } } + + .doc-layout { + padding: 0 !important; + box-shadow: none !important; + margin: 0 !important; + } } diff --git a/app/app/styles/view/document/content.scss b/app/app/styles/view/document/content.scss index 1576f2e0..4d0cbbdb 100644 --- a/app/app/styles/view/document/content.scss +++ b/app/app/styles/view/document/content.scss @@ -1,3 +1,13 @@ +.wiki-layout { + +} + +.doc-layout { + padding: 60px 50px; + box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke; + margin: 30px 40px 50px 40px; +} + .document-view { .print-title { display: none; diff --git a/app/app/templates/components/document/document-toolbar.hbs b/app/app/templates/components/document/document-toolbar.hbs index aa7e769f..f4ddcc7c 100644 --- a/app/app/templates/components/document/document-toolbar.hbs +++ b/app/app/templates/components/document/document-toolbar.hbs @@ -38,7 +38,13 @@ {{#dropdown-menu target="document-toolbar-menu" position="bottom right" open="click" onOpenCallback=(action 'onMenuOpen') onCloseCallback=(action 'onMenuOpen')}}