From 62c3cd03ad6fde2c80fb56a4f0b8991b66f33ada Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Mon, 20 May 2019 10:39:48 +0100 Subject: [PATCH] [WIP] Improve master layout for different devices + product growth We have two pressing needs: 1. Improve experience on real estate challenged devices. 2. Make room for product feature-set growth. To hit these targets, we need to develop better UX through smarter on-screen space management. --- ...master-sidebar.js => master-navigation.js} | 2 +- gui/app/components/layout/master-toolbar.js | 18 + gui/app/components/ui/ui-spacer.js | 4 +- gui/app/pods/auth/share/template.hbs | 2 +- gui/app/pods/customize/template.hbs | 4 +- gui/app/pods/document/index/template.hbs | 12 +- gui/app/pods/document/revisions/template.hbs | 4 +- gui/app/pods/document/section/template.hbs | 14 +- gui/app/pods/document/settings/template.hbs | 4 +- gui/app/pods/folder/block/template.hbs | 2 +- gui/app/pods/folder/settings/template.hbs | 4 +- gui/app/pods/folders/template.hbs | 244 ++++++----- gui/app/pods/search/template.hbs | 4 +- gui/app/pods/updates/template.hbs | 4 +- gui/app/styles/core/layout/all.scss | 2 +- .../{master-internal.scss => bars.scss} | 409 ++++++------------ .../components/customize/auth-settings.hbs | 2 +- .../components/customize/change-log.hbs | 2 +- .../components/customize/license-key.hbs | 4 +- .../components/customize/space-admin.hbs | 4 +- .../components/customize/space-labels.hbs | 4 +- .../components/customize/user-admin.hbs | 4 +- .../components/customize/user-groups.hbs | 8 +- .../components/customize/user-list.hbs | 8 +- .../components/document/document-meta.hbs | 2 +- .../components/document/page-heading.hbs | 4 +- .../document/section-attachment.hbs | 6 +- .../components/document/settings-category.hbs | 2 +- .../components/document/settings-tag.hbs | 4 +- .../document/sidebar-attachment.hbs | 6 +- .../components/document/sidebar-meta.hbs | 4 +- .../components/document/sidebar-toc.hbs | 2 +- .../components/document/view-content.hbs | 8 +- .../components/document/view-revision.hbs | 4 +- .../components/folder/documents-list.hbs | 14 +- .../components/folder/settings-category.hbs | 4 +- .../folder/settings-permissions.hbs | 10 +- .../components/folder/space-sidebar.hbs | 4 +- .../components/layout/logo-heading.hbs | 2 +- .../components/layout/master-content.hbs | 2 +- ...ster-sidebar.hbs => master-navigation.hbs} | 57 ++- .../components/layout/master-toolbar.hbs | 6 + .../components/onboard/share-folder.hbs | 4 +- .../components/search/search-results.hbs | 12 +- .../components/search/search-view.hbs | 2 +- .../components/section/jira/type-editor.hbs | 6 +- .../section/plantuml/type-editor.hbs | 8 +- .../section/tabular/type-editor.hbs | 2 +- .../components/setup/documize-setup.hbs | 6 +- .../components/spaces/space-list.hbs | 6 +- .../components/user/forgot-password.hbs | 2 +- 51 files changed, 433 insertions(+), 525 deletions(-) rename gui/app/components/layout/{master-sidebar.js => master-navigation.js} (98%) create mode 100644 gui/app/components/layout/master-toolbar.js rename gui/app/styles/core/layout/{master-internal.scss => bars.scss} (51%) rename gui/app/templates/components/layout/{master-sidebar.hbs => master-navigation.hbs} (73%) create mode 100644 gui/app/templates/components/layout/master-toolbar.hbs diff --git a/gui/app/components/layout/master-sidebar.js b/gui/app/components/layout/master-navigation.js similarity index 98% rename from gui/app/components/layout/master-sidebar.js rename to gui/app/components/layout/master-navigation.js index 4b5f6e52..18eb2c41 100644 --- a/gui/app/components/layout/master-sidebar.js +++ b/gui/app/components/layout/master-navigation.js @@ -17,7 +17,7 @@ import Component from '@ember/component'; export default Component.extend(Modals, { tagName: 'div', - classNames: ['master-sidebar-container', 'non-printable'], + classNames: ['master-navigation', 'non-printable'], selectedItem: '', folderService: service('folder'), appMeta: service(), diff --git a/gui/app/components/layout/master-toolbar.js b/gui/app/components/layout/master-toolbar.js new file mode 100644 index 00000000..5bcac8a5 --- /dev/null +++ b/gui/app/components/layout/master-toolbar.js @@ -0,0 +1,18 @@ +// 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 Modals from '../../mixins/modal'; +import Component from '@ember/component'; + +export default Component.extend(Modals, { + tagName: 'div', + classNames: ['master-navigation', 'non-printable'], +}); diff --git a/gui/app/components/ui/ui-spacer.js b/gui/app/components/ui/ui-spacer.js index 6469b559..017a0fa3 100644 --- a/gui/app/components/ui/ui-spacer.js +++ b/gui/app/components/ui/ui-spacer.js @@ -19,7 +19,9 @@ export default Component.extend({ size: 500, calcClass: computed(function() { - switch(this.size) { + let size = parseInt(this.size, 10); + + switch(size) { case 100: return 'spacer-100'; diff --git a/gui/app/pods/auth/share/template.hbs b/gui/app/pods/auth/share/template.hbs index dd34e50f..947ad643 100644 --- a/gui/app/pods/auth/share/template.hbs +++ b/gui/app/pods/auth/share/template.hbs @@ -1,5 +1,5 @@ {{#layout/master-sidebar hideNavigation=true}} - {{ui/ui-spacer size=300}} +
welcome to documize

Let's set up your account and you started

diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs index 5b7ed3c8..38208883 100644 --- a/gui/app/pods/customize/template.hbs +++ b/gui/app/pods/customize/template.hbs @@ -1,5 +1,5 @@ {{#layout/master-sidebar selectedItem="settings"}} - {{ui/ui-spacer size=300}} +
administration
@@ -68,4 +68,4 @@ {{#layout/master-content}} {{outlet}} -{{/layout/master-content}} \ No newline at end of file +{{/layout/master-content}} diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs index c126e5b8..6a55d2e3 100644 --- a/gui/app/pods/document/index/template.hbs +++ b/gui/app/pods/document/index/template.hbs @@ -1,5 +1,5 @@ {{#layout/master-sidebar}} - {{ui/ui-spacer size=100}} +
{{document/sidebar-meta @@ -13,7 +13,7 @@ contributionStatus=contributionStatus approvalStatus=approvalStatus}} - {{ui/ui-spacer size=300}} +
{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}} @@ -29,7 +29,7 @@
- {{ui/ui-spacer size=200}} + {{#if (eq sidebarTab "toc")}} {{document/sidebar-toc @@ -85,7 +85,7 @@ approvalStatus=approvalStatus}} {{#if contributionStatus}} - {{ui/ui-spacer size=200}} +
{{contributionStatus}} @@ -93,7 +93,7 @@
{{else}} {{#if approvalStatus}} - {{ui/ui-spacer size=200}} +
{{approvalStatus}} @@ -102,7 +102,7 @@ {{/if}} {{/if}} - {{ui/ui-spacer size=300}} +
diff --git a/gui/app/pods/document/revisions/template.hbs b/gui/app/pods/document/revisions/template.hbs index 449cf691..f196307b 100644 --- a/gui/app/pods/document/revisions/template.hbs +++ b/gui/app/pods/document/revisions/template.hbs @@ -1,12 +1,12 @@ {{#layout/master-sidebar}} - {{ui/ui-spacer size=300}} +
{{#link-to "document.index"}} {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} {{/link-to}} - {{ui/ui-spacer size=400}} +
REVISIONS
diff --git a/gui/app/pods/document/section/template.hbs b/gui/app/pods/document/section/template.hbs index 2e18719a..2fe1a4da 100644 --- a/gui/app/pods/document/section/template.hbs +++ b/gui/app/pods/document/section/template.hbs @@ -1,5 +1,5 @@ {{#layout/master-sidebar}} - {{ui/ui-spacer size=300}} +
{{#link-to "document.index" model.folder.id model.folder.slug model.document.id model.document.slug}} @@ -9,16 +9,16 @@ {{/layout/master-sidebar}} {{#layout/master-content}} - {{document/document-editor - document=model.document - folder=model.folder - page=model.page + {{document/document-editor + document=model.document + folder=model.folder + page=model.page meta=model.meta attachments=model.attachments onCancel=(action "onCancel") onAction=(action "onAction")}} - {{document/section-attachment uploadLabel="Upload Attachments" - editMode=true page=model.page document=model.document + {{document/section-attachment uploadLabel="Upload Attachments" + editMode=true page=model.page document=model.document files=model.attachments onAttachmentUpload=(action "onAttachmentUpload") onAttachmentDelete=(action "onAttachmentDelete")}} diff --git a/gui/app/pods/document/settings/template.hbs b/gui/app/pods/document/settings/template.hbs index 7d905222..1efd2ea8 100644 --- a/gui/app/pods/document/settings/template.hbs +++ b/gui/app/pods/document/settings/template.hbs @@ -1,11 +1,11 @@ {{#layout/master-sidebar}} - {{ui/ui-spacer size=300}} +
{{#link-to "document.index"}} {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}} {{/link-to}} - {{ui/ui-spacer size=400}} +
Document Options
diff --git a/gui/app/pods/folder/block/template.hbs b/gui/app/pods/folder/block/template.hbs index 52f08e16..a364840d 100644 --- a/gui/app/pods/folder/block/template.hbs +++ b/gui/app/pods/folder/block/template.hbs @@ -1,5 +1,5 @@ {{#layout/master-sidebar}} - {{ui/ui-spacer size=300}} +
{{#link-to "folder.settings"}} {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Space Settings"}} diff --git a/gui/app/pods/folder/settings/template.hbs b/gui/app/pods/folder/settings/template.hbs index e96e5b2c..7c29aa01 100644 --- a/gui/app/pods/folder/settings/template.hbs +++ b/gui/app/pods/folder/settings/template.hbs @@ -1,12 +1,12 @@ {{#layout/master-sidebar}} - {{ui/ui-spacer size=300}} +
{{#link-to "folder.index"}} {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Space"}} {{/link-to}} - {{ui/ui-spacer size=400}} +
space management
diff --git a/gui/app/pods/folders/template.hbs b/gui/app/pods/folders/template.hbs index a43a3278..b63ba58d 100644 --- a/gui/app/pods/folders/template.hbs +++ b/gui/app/pods/folders/template.hbs @@ -1,138 +1,148 @@ -{{#layout/master-sidebar selectedItem="spaces"}} - {{ui/ui-spacer size=300}} - -
-
filter
-
-
- -
All ({{model.spaces.length}})
-
-
- -
Public ({{publicSpaces.length}})
-
- {{#if session.authenticated}} -
- -
Protected ({{protectedSpaces.length}})
-
-
- -
Personal ({{personalSpaces.length}})
-
- {{/if}} -
+ + +
- - {{ui/ui-spacer size=300}} - -
-
label
- {{#if labels}} -
- {{#each labels as |label|}} - {{#if (gt label.count 0)}} -
- -
{{label.name}} ({{label.count}})
-
- {{/if}} - {{/each}} -
- {{else}} -
No labels
+
+
+
+ {{#if (or session.isEditor session.isAdmin)}} + {{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true tooltip="New space"}} + {{#if session.isEditor}} + {{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green onClick=(action "onShowModal")}} + {{ui/ui-toolbar-label label="SPACE" color=constants.Color.Green onClick=(action "onShowModal")}} + {{/if}} + {{/ui/ui-toolbar}} {{/if}}
-{{/layout/master-sidebar}} + -{{#layout/master-content}} -
-
- {{layout/logo-heading - title=appMeta.title - desc=appMeta.message - logo=true}} -
-
- {{#if (or session.isEditor session.isAdmin)}} - {{#ui/ui-toolbar dark=false light=true raised=true large=true bordered=true tooltip="New space"}} - {{#if session.isEditor}} - {{ui/ui-toolbar-icon icon=constants.Icon.Plus color=constants.Color.Green onClick=(action "onShowModal")}} - {{ui/ui-toolbar-label label="SPACE" color=constants.Color.Green onClick=(action "onShowModal")}} +
+
+
+ {{yield}} + + + +
+
filter
+
+
+ +
All ({{model.spaces.length}})
+
+
+ +
Public ({{publicSpaces.length}})
+
+ {{#if session.authenticated}} +
+ +
Protected ({{protectedSpaces.length}})
+
+
+ +
Personal ({{personalSpaces.length}})
+
{{/if}} - {{/ui/ui-toolbar}} - {{/if}} +
+
+ + + +
+
label
+ {{#if labels}} +
+ {{#each labels as |label|}} + {{#if (gt label.count 0)}} +
+ +
{{label.name}} ({{label.count}})
+
+ {{/if}} + {{/each}} +
+ {{else}} +
No labels
+ {{/if}} +
- {{ui/ui-spacer size=400}} +
+ {{layout/logo-heading title=appMeta.title desc=appMeta.message logo=true}} + - {{spaces/space-list spaces=selectedSpaces labels=labels}} + {{spaces/space-list spaces=selectedSpaces labels=labels}} - \ No newline at end of file +
diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs index ae9c4f1b..eaf0f5d0 100644 --- a/gui/app/templates/components/customize/user-list.hbs +++ b/gui/app/templates/components/customize/user-list.hbs @@ -1,6 +1,6 @@
{{#if isAuthProviderKeycloak}} - {{ui/ui-spacer size=300}} + {{#if syncInProgress}} {{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="Keycloak user sync running..."}} {{else}} @@ -9,7 +9,7 @@ {{/if}} {{#if (or isAuthProviderLDAP c)}} - {{ui/ui-spacer size=300}} + {{#if syncInProgress}} {{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="LDAP user sync running..."}} {{else}} @@ -17,7 +17,7 @@ {{/if}} {{/if}} - {{ui/ui-spacer size=300}} +
Permissions Explained @@ -40,7 +40,7 @@
Can login and use Documize
- {{ui/ui-spacer size=300}} +
{{focus-input type="text" class="form-control" placeholder="filter users" value=filter key-up=(action "onFilterChange")}} diff --git a/gui/app/templates/components/document/document-meta.hbs b/gui/app/templates/components/document/document-meta.hbs index 6c8882ad..adfacb9c 100644 --- a/gui/app/templates/components/document/document-meta.hbs +++ b/gui/app/templates/components/document/document-meta.hbs @@ -1,4 +1,4 @@ -{{ui/ui-spacer size=300}} +
CATEGORY / TAG
diff --git a/gui/app/templates/components/document/page-heading.hbs b/gui/app/templates/components/document/page-heading.hbs index f089bee1..f224d6e9 100644 --- a/gui/app/templates/components/document/page-heading.hbs +++ b/gui/app/templates/components/document/page-heading.hbs @@ -73,7 +73,7 @@ {{focus-input type="text" value=docSearchFilter class="form-control" placeholder="a OR b, x AND y, 'phrase mat*'"}}
- {{ui/ui-spacer size=100}} +
{{#if emptySearch}}

No matching documents found.

@@ -191,4 +191,4 @@
-{{/if}} \ No newline at end of file +{{/if}} diff --git a/gui/app/templates/components/document/section-attachment.hbs b/gui/app/templates/components/document/section-attachment.hbs index 1331134f..e331b029 100644 --- a/gui/app/templates/components/document/section-attachment.hbs +++ b/gui/app/templates/components/document/section-attachment.hbs @@ -1,5 +1,5 @@ {{#if editMode}} - {{ui/ui-spacer size=200}} + {{ui/ui-button color=constants.Color.Gray label=uploadLabel id=uploadId}} {{/if}} @@ -17,7 +17,7 @@ {{#attach-popover class="ember-attacher-popper" hideOn="escapekey, clickout" showOn="click" isShown=false}}

Are you sure you want to delete this file?

- {{ui/ui-spacer size=100}} + {{ui/ui-button light=false label=constants.Label.Delete @@ -28,7 +28,7 @@ {{/ui/ui-toolbar-icon}} {{/ui/ui-toolbar}}
- {{/if}} + {{/if}} {{/if}} {{/each}} diff --git a/gui/app/templates/components/document/settings-category.hbs b/gui/app/templates/components/document/settings-category.hbs index 75b466fb..f0c6614c 100644 --- a/gui/app/templates/components/document/settings-category.hbs +++ b/gui/app/templates/components/document/settings-category.hbs @@ -6,7 +6,7 @@ {{#if categories}} {{ui/ui-list-picker items=categories nameField="category" singleSelect=false}} - {{ui/ui-spacer size=300}} + {{ui/ui-button color=constants.Color.Green diff --git a/gui/app/templates/components/document/settings-tag.hbs b/gui/app/templates/components/document/settings-tag.hbs index d5c39b3a..e7264f31 100644 --- a/gui/app/templates/components/document/settings-tag.hbs +++ b/gui/app/templates/components/document/settings-tag.hbs @@ -12,10 +12,10 @@
{{input type="text" id=(concat "add-tag-field-" tag.number) class="form-control mousetrap tag-input" placeholder="Tag name" value=tag.value}}
- {{ui/ui-spacer size=200}} + {{/each}} -{{ui/ui-spacer size=300}} + {{ui/ui-button color=constants.Color.Green diff --git a/gui/app/templates/components/document/sidebar-attachment.hbs b/gui/app/templates/components/document/sidebar-attachment.hbs index a2a8a751..be004859 100644 --- a/gui/app/templates/components/document/sidebar-attachment.hbs +++ b/gui/app/templates/components/document/sidebar-attachment.hbs @@ -1,9 +1,9 @@
attachments
{{#if canEdit}}
- {{ui/ui-spacer size=100}} + {{ui/ui-button color=constants.Color.Gray label="Upload" id="upload-document-files"}} - {{ui/ui-spacer size=100}} +
{{/if}} @@ -23,7 +23,7 @@ {{#attach-popover class="ember-attacher-popper" hideOn="escapekey, clickout" showOn="click" isShown=false}}

Are you sure you want to delete this file?

- {{ui/ui-spacer size=100}} + {{ui/ui-button light=false label=constants.Label.Delete diff --git a/gui/app/templates/components/document/sidebar-meta.hbs b/gui/app/templates/components/document/sidebar-meta.hbs index f1589b95..01070aa7 100644 --- a/gui/app/templates/components/document/sidebar-meta.hbs +++ b/gui/app/templates/components/document/sidebar-meta.hbs @@ -3,7 +3,7 @@ {{ui/ui-button light=true color=constants.Color.Yellow uppercase=false icon=constants.Icon.ArrowLeft label=space.name stretch=true truncate=true}} {{/link-to}} - {{ui/ui-spacer size=200}} + {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
VERSION
@@ -29,7 +29,7 @@ {{/if}} {{/if}} - {{ui/ui-spacer size=200}} + {{/if}}
STATUS
diff --git a/gui/app/templates/components/document/sidebar-toc.hbs b/gui/app/templates/components/document/sidebar-toc.hbs index f4a370b7..6ce15fb8 100644 --- a/gui/app/templates/components/document/sidebar-toc.hbs +++ b/gui/app/templates/components/document/sidebar-toc.hbs @@ -17,7 +17,7 @@
{{else}} - {{ui/ui-spacer size=100}} + {{/if}}
diff --git a/gui/app/templates/components/document/view-content.hbs b/gui/app/templates/components/document/view-content.hbs index f4f5bf99..a40911b6 100644 --- a/gui/app/templates/components/document/view-content.hbs +++ b/gui/app/templates/components/document/view-content.hbs @@ -1,6 +1,6 @@ {{#if hasPages}} {{#each pages key="id" as |item|}} - {{ui/ui-spacer size=100}} + {{document/document-page roles=roles pages=pages @@ -21,7 +21,7 @@ onMovePage=(action "onMovePage") onDeletePage=(action "onDeletePage") onSavePageAsBlock=(action "onSavePageAsBlock") - onPageLevelChange=(action onPageLevelChange) + onPageLevelChange=(action onPageLevelChange) onPageSequenceChange=(action onPageSequenceChange) onShowSectionWizard=(action "onShowSectionWizard")}} {{/each}} @@ -41,7 +41,7 @@
Thanks for the feedback!
{{else}}
{{folder.likes}}
- {{ui/ui-spacer size=200}} +
{{ui/ui-button color=constants.Color.Yellow light=true label="Yes, thanks!" onClick=(action "onVote" 1)}} {{ui/ui-button-gap}} @@ -64,4 +64,4 @@ show=showInsertSectionModal beforePage=newSectionLocation onInsertSection=(action onInsertSection)}} -{{/if}} \ No newline at end of file +{{/if}} diff --git a/gui/app/templates/components/document/view-revision.hbs b/gui/app/templates/components/document/view-revision.hbs index a90e9842..5a42358f 100644 --- a/gui/app/templates/components/document/view-revision.hbs +++ b/gui/app/templates/components/document/view-revision.hbs @@ -6,7 +6,7 @@ {{#if hasDiff}}

{{revision.title}}

Changed by {{revision.firstname}} {{revision.lastname}}

- {{ui/ui-spacer size=200}} +
{{{diff}}}
@@ -14,7 +14,7 @@
{{#if canRollback}} - {{ui/ui-spacer size=400}} + {{ui/ui-button color=constants.Color.Red icon=constants.Icon.TimeBack light=true label=constants.Label.Restore onClick=(action "onShowModal")}} {{/if}} diff --git a/gui/app/templates/components/folder/documents-list.hbs b/gui/app/templates/components/folder/documents-list.hbs index 61c4c7cf..ef972826 100644 --- a/gui/app/templates/components/folder/documents-list.hbs +++ b/gui/app/templates/components/folder/documents-list.hbs @@ -7,7 +7,7 @@ {{ui/ui-toolbar-icon icon=constants.Icon.All color=constants.Color.Gray tooltip="Comfort" selected=(eq viewDensity "2") onClick=(action "onSwitchView" "2")}} {{ui/ui-toolbar-label label="—" color=constants.Color.Gray tooltip="Compact" - selected=(eq viewDensity "3") onClick=(action "onSwitchView" "3")}} + selected=(eq viewDensity "3") onClick=(action "onSwitchView" "3")}} {{/ui/ui-toolbar}} {{#ui/ui-button @@ -16,11 +16,11 @@ uppercase=false color=constants.Color.Gray label=constants.Label.Sort}} - + {{#attach-popover class="ember-attacher-popper" hideOn="click" showOn="click" isShown=false placement="bottom-end" as |attacher|}}
- {{ui/ui-spacer size=100}} +
    @@ -36,7 +36,7 @@
- {{ui/ui-spacer size=100}} +
    @@ -49,7 +49,7 @@
- {{ui/ui-spacer size=300}} + {{ui/ui-button light=true @@ -61,7 +61,7 @@ {{/ui/ui-button}}
- {{ui/ui-spacer size=200}} +
    {{#each documents key="id" as |document|}} @@ -129,4 +129,4 @@ {{#if showLockout}} {{ui/empty-state icon=constants.Icon.Preview message="Space permissions are preventing you from viewing and creating documents"}} -{{/if}} \ No newline at end of file +{{/if}} diff --git a/gui/app/templates/components/folder/settings-category.hbs b/gui/app/templates/components/folder/settings-category.hbs index cf20dd99..cad96132 100644 --- a/gui/app/templates/components/folder/settings-category.hbs +++ b/gui/app/templates/components/folder/settings-category.hbs @@ -16,7 +16,7 @@
-{{ui/ui-spacer size=400}} +
@@ -98,4 +98,4 @@ {{/each}}
-{{/ui/ui-dialog}} \ No newline at end of file +{{/ui/ui-dialog}} diff --git a/gui/app/templates/components/folder/settings-permissions.hbs b/gui/app/templates/components/folder/settings-permissions.hbs index c6ab671e..91f239f1 100644 --- a/gui/app/templates/components/folder/settings-permissions.hbs +++ b/gui/app/templates/components/folder/settings-permissions.hbs @@ -22,7 +22,7 @@
Manage and delete space
- {{ui/ui-spacer size=200}} +
Document Permissions Explained @@ -55,7 +55,7 @@
-{{ui/ui-spacer size=300}} +
{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Person @@ -67,7 +67,7 @@ onClick=(action "onShowInviteModal")}}
-{{ui/ui-spacer size=300}} +
@@ -139,7 +139,7 @@
-{{ui/ui-spacer size=200}} + {{ui/ui-button color=constants.Color.Green light=true icon=constants.Icon.Locked label=constants.Label.Save onClick=(action "onSave")}} @@ -150,7 +150,7 @@
Add users to this space
{{input id="user-search" type="text" class="form-control mousetrap" placeholder="Search for users by firstname, lastname, email" value=searchText key-up=(action "onSearch")}} - {{ui/ui-spacer size=200}} +
{{#each filteredUsers as |user|}} diff --git a/gui/app/templates/components/folder/space-sidebar.hbs b/gui/app/templates/components/folder/space-sidebar.hbs index 4c6f4704..531a01dd 100644 --- a/gui/app/templates/components/folder/space-sidebar.hbs +++ b/gui/app/templates/components/folder/space-sidebar.hbs @@ -1,4 +1,4 @@ -{{ui/ui-spacer size=300}} +
filter
@@ -40,7 +40,7 @@
-{{ui/ui-spacer size=200}} +
category
diff --git a/gui/app/templates/components/layout/logo-heading.hbs b/gui/app/templates/components/layout/logo-heading.hbs index 94123588..bb2047c5 100644 --- a/gui/app/templates/components/layout/logo-heading.hbs +++ b/gui/app/templates/components/layout/logo-heading.hbs @@ -18,4 +18,4 @@ {{layout/page-desc desc=desc}}
-{{ui/ui-spacer size=200}} \ No newline at end of file + diff --git a/gui/app/templates/components/layout/master-content.hbs b/gui/app/templates/components/layout/master-content.hbs index 0df17443..c32e9378 100644 --- a/gui/app/templates/components/layout/master-content.hbs +++ b/gui/app/templates/components/layout/master-content.hbs @@ -1,4 +1,4 @@
{{yield}}
-{{ui/ui-spacer size=300}} \ No newline at end of file + diff --git a/gui/app/templates/components/layout/master-sidebar.hbs b/gui/app/templates/components/layout/master-navigation.hbs similarity index 73% rename from gui/app/templates/components/layout/master-sidebar.hbs rename to gui/app/templates/components/layout/master-navigation.hbs index 1da0864b..04681f16 100644 --- a/gui/app/templates/components/layout/master-sidebar.hbs +++ b/gui/app/templates/components/layout/master-navigation.hbs @@ -1,54 +1,60 @@ -
-
-
+
+
+
{{#unless hideNavigation}} {{#link-to "folders" class=(if (eq selectedItem "spaces") "option selected" "option")}} - -
spaces
+ + {{#attach-tooltip showDelay=1000}}Spaces{{/attach-tooltip}} + {{/link-to}} {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} {{#if session.viewDashboard}} {{#link-to "action" class=(if (eq selectedItem "actions") "option selected" "option")}} - -
actions
+ + {{#attach-tooltip showDelay=1000}}Actions{{/attach-tooltip}} + {{/link-to}} {{#link-to "activity" class=(if (eq selectedItem "activity") "option selected" "option")}} - -
activity
+ + {{#attach-tooltip showDelay=1000}}Activity{{/attach-tooltip}} + {{/link-to}} {{/if}} {{#if session.viewAnalytics}} {{#link-to "analytics" class=(if (eq selectedItem "analytics") "option selected" "option")}} - -
reports
+ + {{#attach-tooltip showDelay=1000}}Reports{{/attach-tooltip}} + {{/link-to}} {{/if}} {{/if}} {{#if (and session.authenticated session.isAdmin)}} {{#link-to "customize.general" class=(if (eq selectedItem "settings") "option selected" "option")}} - -
Settings
+ + {{#attach-tooltip showDelay=1000}}Settings{{/attach-tooltip}} + {{/link-to}} {{/if}} {{#link-to "search" class=(if (eq selectedItem "search") "option selected" "option")}} - -
search
+ + {{#attach-tooltip showDelay=1000}}Search{{/attach-tooltip}} + {{/link-to}} {{/unless}}
-
+
{{#if session.isAdmin}} {{#unless appMeta.valid}} -
- +
+ {{#attach-tooltip}}Invalid product plan{{/attach-tooltip}}
{{/unless}} {{/if}} {{#if session.authenticated}} {{#if hasPins}} -
+
{{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
@@ -69,7 +75,7 @@
{{/if}}
-
+
{{session.user.initials}} {{#if hasWhatsNew}}
@@ -112,16 +118,7 @@ {{/link-to}} {{/if}} -
-
-
- {{yield}} -
-
+ diff --git a/gui/app/templates/components/layout/master-toolbar.hbs b/gui/app/templates/components/layout/master-toolbar.hbs new file mode 100644 index 00000000..f48eaa3a --- /dev/null +++ b/gui/app/templates/components/layout/master-toolbar.hbs @@ -0,0 +1,6 @@ +
+
+ {{yield}} +
+
+ diff --git a/gui/app/templates/components/onboard/share-folder.hbs b/gui/app/templates/components/onboard/share-folder.hbs index 7b3de3b5..e075aa49 100644 --- a/gui/app/templates/components/onboard/share-folder.hbs +++ b/gui/app/templates/components/onboard/share-folder.hbs @@ -8,7 +8,7 @@
- {{ui/ui-spacer size=300}} + {{ui/ui-button id="stage-1-next" color=constants.Color.Green light=true icon=constants.Icon.ArrowRight label=constants.Label.Next}}
@@ -24,7 +24,7 @@ Re-type your chosen password
- {{ui/ui-spacer size=300}} + {{ui/ui-button id="stage-2-next" color=constants.Color.Green light=true icon=constants.Icon.ArrowRight label=constants.Label.SignIn}}
diff --git a/gui/app/templates/components/search/search-results.hbs b/gui/app/templates/components/search/search-results.hbs index 28ff7618..1053d358 100644 --- a/gui/app/templates/components/search/search-results.hbs +++ b/gui/app/templates/components/search/search-results.hbs @@ -8,11 +8,11 @@ uppercase=false color=constants.Color.Gray label=constants.Label.Sort}} - + {{#attach-popover class="ember-attacher-popper" hideOn="click" showOn="click" isShown=false placement="bottom-end" as |attacher|}}
- {{ui/ui-spacer size=100}} +
    @@ -28,7 +28,7 @@
- {{ui/ui-spacer size=100}} +
    @@ -41,7 +41,7 @@
- {{ui/ui-spacer size=300}} + {{ui/ui-button light=true @@ -53,7 +53,7 @@ {{/ui/ui-button}}
- {{ui/ui-spacer size=200}} + {{/if}}
{{resultPhrase}}
@@ -78,4 +78,4 @@ {{/each}} -
\ No newline at end of file +
diff --git a/gui/app/templates/components/search/search-view.hbs b/gui/app/templates/components/search/search-view.hbs index 28c824cb..ae565c43 100644 --- a/gui/app/templates/components/search/search-view.hbs +++ b/gui/app/templates/components/search/search-view.hbs @@ -10,7 +10,7 @@ {{#if validSearch}} {{search/search-results results=results keywords=keywords}} {{else}} - {{ui/ui-spacer size=300}} +

Your search query is too short

{{/if}}
diff --git a/gui/app/templates/components/section/jira/type-editor.hbs b/gui/app/templates/components/section/jira/type-editor.hbs index 24c0496c..8eb85d38 100644 --- a/gui/app/templates/components/section/jira/type-editor.hbs +++ b/gui/app/templates/components/section/jira/type-editor.hbs @@ -8,7 +8,7 @@ {{#link-to "customize.integrations"}} {{ui/ui-button color=constants.Color.Green light=true label="Configure Jira Connector"}} {{/link-to}} - {{ui/ui-spacer size=300}} + {{else}} {{#unless authenticated}}

Your Documize administrator needs to provide Jira connection details before usage.

@@ -23,10 +23,10 @@ {{ui/ui-button color=constants.Color.Yellow light=true label=constants.Label.Preview submit=true onClick=(action "onPreview")}} - {{ui/ui-spacer size=300}} + > {{{issuesGrid}}} {{else}} - {{ui/ui-spacer size=300}} +

Jira connector not authenticated

{{/if}} {{/section/base-editor}} diff --git a/gui/app/templates/components/section/plantuml/type-editor.hbs b/gui/app/templates/components/section/plantuml/type-editor.hbs index 1ddfdeef..167eed6b 100644 --- a/gui/app/templates/components/section/plantuml/type-editor.hbs +++ b/gui/app/templates/components/section/plantuml/type-editor.hbs @@ -9,7 +9,7 @@
- {{ui/ui-spacer size=200}} +

Insert sample diagrams:

@@ -26,16 +26,16 @@

- {{ui/ui-spacer size=200}} + {{ui/ui-button color=constants.Color.Yellow light=true label=previewButtonCaption onClick=(action "onPreview")}} - {{ui/ui-spacer size=200}} +
- {{ui/ui-spacer size=200}} + {{/section/base-editor}} diff --git a/gui/app/templates/components/section/tabular/type-editor.hbs b/gui/app/templates/components/section/tabular/type-editor.hbs index cd12e933..913bc6da 100644 --- a/gui/app/templates/components/section/tabular/type-editor.hbs +++ b/gui/app/templates/components/section/tabular/type-editor.hbs @@ -17,7 +17,7 @@ onClick=(action "onShowImportModal")}}
- {{ui/ui-spacer size=300}} +
{{{pageBody}}} diff --git a/gui/app/templates/components/setup/documize-setup.hbs b/gui/app/templates/components/setup/documize-setup.hbs index 9af6d1e5..d5cb932a 100644 --- a/gui/app/templates/components/setup/documize-setup.hbs +++ b/gui/app/templates/components/setup/documize-setup.hbs @@ -1,12 +1,12 @@
Documize Setup - {{ui/ui-spacer size=300}} +

Installation Guide

Review the installation instructions and recommended database tuning guide

- {{ui/ui-spacer size=300}} +
@@ -35,5 +35,5 @@ {{ui/ui-button submit=true color=constants.Color.Green light=true label=buttonLabel onClick=(action "save")}} - {{ui/ui-spacer size=300}} +
diff --git a/gui/app/templates/components/spaces/space-list.hbs b/gui/app/templates/components/spaces/space-list.hbs index ae4a5669..0d6bdda2 100644 --- a/gui/app/templates/components/spaces/space-list.hbs +++ b/gui/app/templates/components/spaces/space-list.hbs @@ -1,5 +1,5 @@
- +
{{#ui/ui-toolbar dark=false light=false raised=false large=false bordered=false}} {{ui/ui-toolbar-icon icon=constants.Icon.Blocks color=constants.Color.Gray tooltip="Complete" @@ -7,11 +7,11 @@ {{ui/ui-toolbar-icon icon=constants.Icon.All color=constants.Color.Gray tooltip="Comfort" selected=(eq viewDensity "2") onClick=(action "onSwitchView" "2")}} {{ui/ui-toolbar-label label="—" color=constants.Color.Gray tooltip="Compact" - selected=(eq viewDensity "3") onClick=(action "onSwitchView" "3")}} + selected=(eq viewDensity "3") onClick=(action "onSwitchView" "3")}} {{/ui/ui-toolbar}}
- {{ui/ui-spacer size=200}} +
    {{#each spaces as |space|}} diff --git a/gui/app/templates/components/user/forgot-password.hbs b/gui/app/templates/components/user/forgot-password.hbs index c708809c..189c0c9b 100644 --- a/gui/app/templates/components/user/forgot-password.hbs +++ b/gui/app/templates/components/user/forgot-password.hbs @@ -12,6 +12,6 @@ {{ui/ui-button color=constants.Color.Yellow light=true label=constants.Label.Reset onClick=(action "forgot")}} {{/if}} - {{ui/ui-spacer size=400}} + {{#link-to "auth.login"}}Click here to sign in{{/link-to}}