From 02102f9bf3a0772e82b4af34ec717941ad9a814c Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Wed, 12 Dec 2018 13:35:16 +0000 Subject: [PATCH] Provide icon rendering framework --- gui/app/components/spaces/space-list.js | 45 +--- gui/app/components/ui/ui-spacer.js | 47 ++++ gui/app/constants/constants.js | 19 ++ gui/app/pods/auth/login/template.hbs | 2 +- gui/app/pods/folders/controller.js | 25 ++ gui/app/pods/folders/route.js | 28 +- gui/app/pods/folders/template.hbs | 34 ++- gui/app/styles/core/all.scss | 7 +- gui/app/styles/core/base.scss | 196 -------------- gui/app/styles/core/icon.scss | 34 +-- gui/app/styles/core/layout/all.scss | 8 +- .../core/layout/{common.scss => grid.scss} | 64 +++-- gui/app/styles/core/layout/headings.scss | 12 + gui/app/styles/core/layout/sidebar.scss | 59 +++++ gui/app/styles/core/layout/spacing.scss | 71 +++++ gui/app/styles/core/mixins.scss | 13 +- gui/app/styles/core/reset.scss | 57 ++++ gui/app/styles/core/text.scss | 42 +++ gui/app/styles/core/util.scss | 88 ++++++ gui/app/styles/core/view/spaces.scss | 123 ++++++--- .../components/customize/change-log.hbs | 12 +- .../components/customize/general-settings.hbs | 2 +- .../customize/integration-settings.hbs | 2 +- .../components/customize/license-key.hbs | 2 +- .../components/customize/user-list.hbs | 250 +++++++++--------- .../components/document/settings-general.hbs | 2 +- .../components/document/settings-meta.hbs | 2 +- .../components/document/view-attachment.hbs | 2 +- .../components/document/view-content.hbs | 4 +- .../components/folder/documents-list.hbs | 2 +- .../components/folder/settings-category.hbs | 2 +- .../folder/settings-permissions.hbs | 6 +- .../components/folder/space-view.hbs | 2 +- .../components/layout/master-sidebar.hbs | 16 +- .../templates/components/layout/top-bar.hbs | 6 +- .../components/search/search-results.hbs | 2 +- .../components/section/jira/type-editor.hbs | 4 +- .../components/section/trello/type-editor.hbs | 2 +- .../components/spaces/space-list.hbs | 70 ++--- .../components/toolbar/for-space.hbs | 2 +- gui/app/templates/components/ui/ui-spacer.hbs | 0 .../components/user/forgot-password.hbs | 2 +- .../components/user/password-reset.hbs | 2 +- gui/public/assets/font/dmzui.eot | Bin 14432 -> 13904 bytes gui/public/assets/font/dmzui.svg | 27 +- gui/public/assets/font/dmzui.ttf | Bin 14276 -> 13748 bytes gui/public/assets/font/dmzui.woff | Bin 7508 -> 7332 bytes gui/public/assets/font/dmzui.woff2 | Bin 6100 -> 6004 bytes 48 files changed, 851 insertions(+), 546 deletions(-) create mode 100644 gui/app/components/ui/ui-spacer.js delete mode 100644 gui/app/styles/core/base.scss rename gui/app/styles/core/layout/{common.scss => grid.scss} (54%) create mode 100644 gui/app/styles/core/layout/headings.scss create mode 100644 gui/app/styles/core/layout/sidebar.scss create mode 100644 gui/app/styles/core/layout/spacing.scss create mode 100644 gui/app/styles/core/reset.scss create mode 100644 gui/app/styles/core/text.scss create mode 100644 gui/app/styles/core/util.scss create mode 100644 gui/app/templates/components/ui/ui-spacer.hbs diff --git a/gui/app/components/spaces/space-list.js b/gui/app/components/spaces/space-list.js index 14178693..9429c89f 100644 --- a/gui/app/components/spaces/space-list.js +++ b/gui/app/components/spaces/space-list.js @@ -9,51 +9,8 @@ // // https://documize.com -import NotifierMixin from '../../mixins/notifier'; import AuthMixin from '../../mixins/auth'; import Component from '@ember/component'; -export default Component.extend(NotifierMixin, AuthMixin, { - hasPublicFolders: false, - hasProtectedFolders: false, - hasPrivateFolders: false, - - init() { - this._super(...arguments); - this.publicFolders = []; - this.protectedFolders = []; - this.privateFolders = []; - }, - - didReceiveAttrs() { - this._super(...arguments); - - let constants = this.get('constants'); - let folders = this.get('spaces'); - let publicFolders = []; - let protectedFolders = []; - let privateFolders = []; - - _.each(folders, folder => { - if (folder.get('spaceType') === constants.SpaceType.Public) { - publicFolders.pushObject(folder); - } - if (folder.get('spaceType') === constants.SpaceType.Private) { - privateFolders.pushObject(folder); - } - if (folder.get('spaceType') === constants.SpaceType.Protected) { - protectedFolders.pushObject(folder); - } - }); - - this.set('publicFolders', publicFolders); - this.set('protectedFolders', protectedFolders); - this.set('privateFolders', privateFolders); - this.set('hasPublicFolders', this.get('publicFolders.length') > 0); - this.set('hasPrivateFolders', this.get('privateFolders.length') > 0); - this.set('hasProtectedFolders', this.get('protectedFolders.length') > 0); - }, - - actions: { - } +export default Component.extend(AuthMixin, { }); diff --git a/gui/app/components/ui/ui-spacer.js b/gui/app/components/ui/ui-spacer.js new file mode 100644 index 00000000..6469b559 --- /dev/null +++ b/gui/app/components/ui/ui-spacer.js @@ -0,0 +1,47 @@ +// 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 { computed } from '@ember/object'; +import Component from '@ember/component'; + +export default Component.extend({ + classNames: [], + classNameBindings: ['calcClass'], + + size: 500, + + calcClass: computed(function() { + switch(this.size) { + case 100: + return 'spacer-100'; + + case 200: + return 'spacer-200'; + + case 300: + return 'spacer-300'; + + case 400: + return 'spacer-400'; + + case 500: + return 'spacer-500'; + + case 600: + return 'spacer-600'; + + case 700: + return 'spacer-700'; + } + + return 'spacer-100'; + }), +}); diff --git a/gui/app/constants/constants.js b/gui/app/constants/constants.js index 66e77bf7..108ae893 100644 --- a/gui/app/constants/constants.js +++ b/gui/app/constants/constants.js @@ -195,11 +195,30 @@ let constants = EmberObject.extend({ }, Icon: { // eslint-disable-line ember/avoid-leaking-state-in-ember-objects + All: 'dicon-menu-8', + ArrowUp: 'dicon-arrow-up', + ArrowDown: 'dicon-arrow-down', + ArrowLeft: 'dicon-arrow-left', + ArrowRight: 'dicon-arrow-right', + Attachment: 'dicon-attachment', + BarChart: 'dicon-chart-bar-2', + Bookmark: 'dicon-bookmark', Delete: 'dicon-bin', + Edit: 'dicon-pen-2', + Filter: 'dicon-sort-tool', + Grid1: 'dicon-grid-interface', + Index: 'dicon-align-justify', + ListBullet: 'dicon-list-bullet-2', Print: 'dicon-print', + Pulse: 'dicon-pulse', Plus: 'dicon-e-add', Person: 'dicon-single-01', + People: 'dicon-multiple-19', + Remove: 'dicon-i-remove', + Search: 'dicon-magnifier', Settings: 'dicon-settings-gear', + Tag: 'dicon-delete-key', + World: 'dicon-globe', }, Color: { // eslint-disable-line ember/avoid-leaking-state-in-ember-objects diff --git a/gui/app/pods/auth/login/template.hbs b/gui/app/pods/auth/login/template.hbs index 75eaeb72..eca653c7 100644 --- a/gui/app/pods/auth/login/template.hbs +++ b/gui/app/pods/auth/login/template.hbs @@ -26,7 +26,7 @@ {{input type="password" value=password id="authPassword" class="form-control" autocomplete="current-password"}} {{/if}} - +
Invalid credentials
{{#if isAuthProviderDocumize}} {{#link-to "auth.forgot"}}Forgot your password?{{/link-to}} diff --git a/gui/app/pods/folders/controller.js b/gui/app/pods/folders/controller.js index 186f87e4..ab096d4f 100644 --- a/gui/app/pods/folders/controller.js +++ b/gui/app/pods/folders/controller.js @@ -27,6 +27,12 @@ export default Controller.extend(AuthMixin, Modals, { hasClone: notEmpty('clonedSpace.id'), clonedSpace: null, + selectedView: 'all', + selectedSpaces: null, + publicSpaces: null, + protectedSpaces: null, + personalSpaces: null, + actions: { onShowModal() { this.modalOpen('#add-space-modal', {'show': true}, '#new-space-name'); @@ -65,6 +71,25 @@ export default Controller.extend(AuthMixin, Modals, { this.get('folderService').setCurrentFolder(sp); this.transitionToRoute('folder', sp.get('id'), sp.get('slug')); }); + }, + + onSelect(view) { + this.set('selectedView', view); + + switch(view) { + case 'all': + this.set('selectedSpaces', this.get('model')); + break; + case 'public': + this.set('selectedSpaces', this.get('publicSpaces')); + break; + case 'protected': + this.set('selectedSpaces', this.get('protectedSpaces')); + break; + case 'personal': + this.set('selectedSpaces', this.get('personalSpaces')); + break; + } } } }); diff --git a/gui/app/pods/folders/route.js b/gui/app/pods/folders/route.js index 8864538d..60d563d0 100644 --- a/gui/app/pods/folders/route.js +++ b/gui/app/pods/folders/route.js @@ -29,7 +29,33 @@ export default Route.extend(AuthenticatedRouteMixin, { return this.get('folderService').getAll(); }, + setupController(controller, model) { + this._super(controller, model); + controller.set('selectedSpaces', model); + + let constants = this.get('constants'); + let publicSpaces = []; + let protectedSpaces = []; + let personalSpaces = []; + + _.each(model, space => { + if (space.get('spaceType') === constants.SpaceType.Public) { + publicSpaces.pushObject(space); + } + if (space.get('spaceType') === constants.SpaceType.Private) { + personalSpaces.pushObject(space); + } + if (space.get('spaceType') === constants.SpaceType.Protected) { + protectedSpaces.pushObject(space); + } + }); + + controller.set('publicSpaces', publicSpaces); + controller.set('protectedSpaces', protectedSpaces); + controller.set('personalSpaces', personalSpaces); + }, + activate() { this.get('browser').setTitle('Spaces'); - } + } }); diff --git a/gui/app/pods/folders/template.hbs b/gui/app/pods/folders/template.hbs index 756dda08..fdaf7134 100644 --- a/gui/app/pods/folders/template.hbs +++ b/gui/app/pods/folders/template.hbs @@ -1,4 +1,33 @@ {{#layout/master-sidebar selectedItem="spaces"}} + + {{#unless session.isMobile}} + {{ui/ui-spacer size=300}} + {{/unless}} + +
+
filter
+
+
+ +
All ({{model.length}})
+
+
+ +
Public ({{publicSpaces.length}})
+
+ {{#if session.authenticated}} +
+ +
Protected ({{protectedSpaces.length}})
+
+
+ +
Personal ({{personalSpaces.length}})
+
+ {{/if}} +
+
+ {{/layout/master-sidebar}} {{#layout/master-content}} @@ -7,7 +36,7 @@ {{layout/page-heading title=appMeta.title}} {{layout/page-desc desc=appMeta.message}} -
+
{{#if (or session.isEditor session.isAdmin)}} {{#ui/ui-toolbar dark=false light=true raised=true large=true bordered=true}} {{#if session.isEditor}} @@ -21,8 +50,9 @@
+ {{ui/ui-spacer size=400}} - {{spaces/space-list spaces=model}} + {{spaces/space-list spaces=selectedSpaces}} \ No newline at end of file diff --git a/gui/app/templates/components/customize/integration-settings.hbs b/gui/app/templates/components/customize/integration-settings.hbs index 24542f8a..50c181aa 100644 --- a/gui/app/templates/components/customize/integration-settings.hbs +++ b/gui/app/templates/components/customize/integration-settings.hbs @@ -46,7 +46,7 @@ {{/if}} -
Save
+
Save
\ No newline at end of file diff --git a/gui/app/templates/components/customize/license-key.hbs b/gui/app/templates/components/customize/license-key.hbs index 73e401cb..af1543d2 100644 --- a/gui/app/templates/components/customize/license-key.hbs +++ b/gui/app/templates/components/customize/license-key.hbs @@ -139,7 +139,7 @@

Let us know if you would like to close your account or cancel your subscription.

-

WARNING: All data will be deleted so please download a complete backup of all your data.

+

WARNING: All data will be deleted so please download a complete backup of all your data.

Requests can take up to 24 hours to process.

{{#link-to "customize.backup" class="btn btn-success"}}PERFORM BACKUP{{/link-to}}
diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs index 720354f2..02a90b1f 100644 --- a/gui/app/templates/components/customize/user-list.hbs +++ b/gui/app/templates/components/customize/user-list.hbs @@ -1,37 +1,38 @@
{{#if isAuthProviderKeycloak}} - {{#if syncInProgress}} -
Keycloak user sync running...
- {{else}} -
Sync with Keycloak
- {{/if}} + {{#if syncInProgress}} +
Keycloak user sync running...
+ {{else}} +
Sync with Keycloak
+ {{/if}} {{/if}} {{#if isAuthProviderLDAP}} - {{#if syncInProgress}} -
LDAP user sync running...
- {{else}} -
Sync with LDAP
- {{/if}} + {{#if syncInProgress}} +
LDAP user sync running...
+ {{else}} +
Sync with LDAP
+ {{/if}} {{/if}}
- Spaces + Spaces   — can add spaces, both personal and shared with others
- Visible -   — can see names of users and groups, can disable for external users like customers/partners + Visible +   — can see names of users and groups, can disable for external users + like customers/partners
- Admin + Admin   — can manage all aspects of Documize, like this screen
- Analytics + Analytics   — can view analytical reports
- Active + Active   — can login and use Documize
@@ -78,7 +79,8 @@ {{#if hasSelectedUsers}} - + {{/if}} Spaces @@ -92,83 +94,86 @@ {{#each users key="id" as |user|}} - - -
- {{#if user.me}} - check_box_outline_blank - {{else if user.selected}} - check_box + + +
+ {{#if user.me}} + check_box_outline_blank + {{else if user.selected}} + check_box + {{else}} + check_box_outline_blank + {{/if}} +
+
+
{{user.fullname}} +
+
+ {{#each user.groups as |group|}} + + {{group.name}}{{#if (not-eq group user.groups.lastObject)}}, {{/if}} + {{else}} - check_box_outline_blank - {{/if}} + <no groups> + {{/each}}
-
-
{{user.fullname}}
-
- {{#each user.groups as |group|}} - - {{group.name}}{{#if (not-eq group user.groups.lastObject)}}, {{/if}} - - {{else}} - <no groups> - {{/each}} -
-
- - - {{#if user.editor}} - check_box - {{else}} - check_box_outline_blank - {{/if}} - - - {{#if user.viewUsers}} - check_box - {{else}} - check_box_outline_blank - {{/if}} - - - {{#if user.me}} - check_box - {{else if user.admin}} - check_box - {{else}} - check_box_outline_blank - {{/if}} - - - {{#if user.analytics}} - check_box - {{else}} - check_box_outline_blank - {{/if}} - - - {{#if user.me}} - check_box - {{else if user.active}} - check_box - {{else}} - check_box_outline_blank - {{/if}} - - -
- mode_edit - {{#attach-tooltip showDelay=1000}}Edit user{{/attach-tooltip}} -
- {{#unless user.me}} -
-
- delete - {{#attach-tooltip showDelay=1000}}Delete user{{/attach-tooltip}} -
- {{/unless}} - - +
+ + + {{#if user.editor}} + check_box + {{else}} + check_box_outline_blank + {{/if}} + + + {{#if user.viewUsers}} + check_box + {{else}} + check_box_outline_blank + {{/if}} + + + {{#if user.me}} + check_box + {{else if user.admin}} + check_box + {{else}} + check_box_outline_blank + {{/if}} + + + {{#if user.analytics}} + check_box + {{else}} + check_box_outline_blank + {{/if}} + + + {{#if user.me}} + check_box + {{else if user.active}} + check_box + {{else}} + check_box_outline_blank + {{/if}} + + +
+ mode_edit + {{#attach-tooltip showDelay=1000}}Edit user{{/attach-tooltip}} +
+ {{#unless user.me}} +
+
+ delete + {{#attach-tooltip showDelay=1000}}Delete user{{/attach-tooltip}} +
+ {{/unless}} + + {{/each}} @@ -193,22 +198,22 @@ {{input id="edit-email" type="text" class="form-control" value=editUser.email}}
{{#if isAuthProviderDocumize}} -
-
-
- - {{input id="edit-password" type="password" class="form-control" value=password.password}} - Optional new password -
-
-
-
- - {{input id="edit-confirmPassword" type="password" class="form-control" value=password.confirmation}} - Confirm new password -
+
+
+
+ + {{input id="edit-password" type="password" class="form-control" value=password.password}} + Optional new password
+
+
+ + {{input id="edit-confirmPassword" type="password" class="form-control" value=password.confirmation}} + Confirm new password +
+
+
{{/if}}
@@ -220,8 +225,9 @@
-{{#ui/ui-dialog title="Delete User" confirmCaption="Delete" buttonType="btn-danger" show=showDeleteDialog onAction=(action "onDelete")}} -

Are you sure you want to delete {{deleteUser.fullname}}?

+{{#ui/ui-dialog title="Delete User" confirmCaption="Delete" buttonType="btn-danger" show=showDeleteDialog +onAction=(action "onDelete")}} +

Are you sure you want to delete {{deleteUser.fullname}}?

{{/ui/ui-dialog}}
-
\ No newline at end of file +
diff --git a/gui/app/templates/components/document/settings-general.hbs b/gui/app/templates/components/document/settings-general.hbs index bb252a36..ed03ab0b 100644 --- a/gui/app/templates/components/document/settings-general.hbs +++ b/gui/app/templates/components/document/settings-general.hbs @@ -15,7 +15,7 @@ Optional description explaining content
- +
diff --git a/gui/app/templates/components/document/settings-meta.hbs b/gui/app/templates/components/document/settings-meta.hbs index eb245c65..4de916ef 100644 --- a/gui/app/templates/components/document/settings-meta.hbs +++ b/gui/app/templates/components/document/settings-meta.hbs @@ -25,6 +25,6 @@

This space has no categories defined yet.

{{/unless}} - + diff --git a/gui/app/templates/components/document/view-attachment.hbs b/gui/app/templates/components/document/view-attachment.hbs index 7f10ae9e..c55aab41 100644 --- a/gui/app/templates/components/document/view-attachment.hbs +++ b/gui/app/templates/components/document/view-attachment.hbs @@ -1,7 +1,7 @@
{{#if canEdit}}
-
+ Attachments
+
+ Attachments
{{else}}
diff --git a/gui/app/templates/components/document/view-content.hbs b/gui/app/templates/components/document/view-content.hbs index f6f6285f..c0f16aa6 100644 --- a/gui/app/templates/components/document/view-content.hbs +++ b/gui/app/templates/components/document/view-content.hbs @@ -47,8 +47,8 @@ {{folder.likes}}
-    - +    +
{{else}}
Thanks for the feedback!
diff --git a/gui/app/templates/components/folder/documents-list.hbs b/gui/app/templates/components/folder/documents-list.hbs index 5a1fa0bb..5fc7a5b5 100644 --- a/gui/app/templates/components/folder/documents-list.hbs +++ b/gui/app/templates/components/folder/documents-list.hbs @@ -8,7 +8,7 @@
{{ document.excerpt }}
{{folder/document-tags documentTags=document.tags}} {{#if (not-eq document.lifecycle constants.Lifecycle.Live)}} - + {{/if}} {{/link-to}} diff --git a/gui/app/templates/components/folder/settings-category.hbs b/gui/app/templates/components/folder/settings-category.hbs index 522d27a9..1224d1c6 100644 --- a/gui/app/templates/components/folder/settings-category.hbs +++ b/gui/app/templates/components/folder/settings-category.hbs @@ -5,7 +5,7 @@
{{focus-input id="new-category-name" type="text" class="form-control mousetrap" placeholder="Category name" value=newCategory}}
- +
diff --git a/gui/app/templates/components/folder/settings-permissions.hbs b/gui/app/templates/components/folder/settings-permissions.hbs index 694d7f37..d28641f6 100644 --- a/gui/app/templates/components/folder/settings-permissions.hbs +++ b/gui/app/templates/components/folder/settings-permissions.hbs @@ -4,9 +4,9 @@
- +    - +
@@ -88,7 +88,7 @@
- +
diff --git a/gui/app/templates/components/folder/space-view.hbs b/gui/app/templates/components/folder/space-view.hbs index c6dd3a20..f41a6083 100644 --- a/gui/app/templates/components/folder/space-view.hbs +++ b/gui/app/templates/components/folder/space-view.hbs @@ -29,7 +29,7 @@ {{#if spaceSettings}}
- {{#link-to "folder.settings" space.id space.slug (query-params tab="categories") class="btn btn-secondary font-weight-bold"}}{{categoryLinkName}}{{/link-to}} + {{#link-to "folder.settings" space.id space.slug (query-params tab="categories") class="btn btn-secondary bold-700"}}{{categoryLinkName}}{{/link-to}}
{{/if}}
\ No newline at end of file diff --git a/gui/app/templates/components/layout/master-sidebar.hbs b/gui/app/templates/components/layout/master-sidebar.hbs index 5aeb2bf2..4b62075a 100644 --- a/gui/app/templates/components/layout/master-sidebar.hbs +++ b/gui/app/templates/components/layout/master-sidebar.hbs @@ -2,29 +2,29 @@
{{#link-to "folders" class=(if (eq selectedItem "spaces") "option selected" "option")}} - +
spaces
{{/link-to}} {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} {{#if session.viewDashboard}} {{#link-to "dashboard" class=(if (eq selectedItem "actions") "option selected" "option")}} - +
actions
{{/link-to}} {{#link-to "activity" class=(if (eq selectedItem "activity") "option selected" "option")}} - +
activity
{{/link-to}} {{/if}} {{#if session.viewAnalytics}} {{#link-to "analytics" class=(if (eq selectedItem "analytics") "option selected" "option")}} - +
reports
{{/link-to}} {{/if}} {{/if}} {{#link-to "search" class=(if (eq selectedItem "spaces") "option selected" "option")}} - +
search
{{/link-to}}
@@ -33,7 +33,7 @@ {{#if session.authenticated}} {{#if hasPins}}
- + {{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
{{#if hasSpacePins}} @@ -165,5 +165,7 @@ {{/if}}
- {{yield}} +
+ {{yield}} +
diff --git a/gui/app/templates/components/layout/top-bar.hbs b/gui/app/templates/components/layout/top-bar.hbs index 786276b5..5e47bdb5 100644 --- a/gui/app/templates/components/layout/top-bar.hbs +++ b/gui/app/templates/components/layout/top-bar.hbs @@ -110,7 +110,7 @@ {{#if session.isAdmin}} {{#link-to "customize.general" class="dropdown-item"}}Settings{{/link-to}} {{#unless appMeta.valid}} - {{#link-to "customize.billing" class="dropdown-item font-weight-bold color-red-600"}}Update Billing{{/link-to}} + {{#link-to "customize.billing" class="dropdown-item bold-700 color-red-600"}}Update Billing{{/link-to}} {{/unless}}
{{/if}} @@ -118,10 +118,10 @@
{{#if session.isGlobalAdmin}} {{#if appMeta.updateAvailable}} - {{#link-to "customize.product" class="dropdown-item font-weight-bold color-yellow-600"}}Update available{{/link-to}} + {{#link-to "customize.product" class="dropdown-item bold-700 color-yellow-600"}}Update available{{/link-to}} {{/if}} {{/if}} - What's New + What's New Help About {{#if enableLogout}} diff --git a/gui/app/templates/components/search/search-results.hbs b/gui/app/templates/components/search/search-results.hbs index 127187fa..411850de 100644 --- a/gui/app/templates/components/search/search-results.hbs +++ b/gui/app/templates/components/search/search-results.hbs @@ -14,7 +14,7 @@
{{result.excerpt}}
{{folder/document-tags documentTags=result.tags}} {{#if result.template}} - + {{/if}} {{/link-to}} diff --git a/gui/app/templates/components/section/jira/type-editor.hbs b/gui/app/templates/components/section/jira/type-editor.hbs index 5e2e0c9a..5fd4098d 100644 --- a/gui/app/templates/components/section/jira/type-editor.hbs +++ b/gui/app/templates/components/section/jira/type-editor.hbs @@ -3,7 +3,7 @@
{{#if session.isAdmin}} - {{#link-to "customize.integrations" class="btn btn-outline-secondary font-weight-bold"}} + {{#link-to "customize.integrations" class="btn btn-outline-secondary bold-700"}} Configure Jira Connector {{/link-to}} {{else}} @@ -22,7 +22,7 @@ {{focus-input id="jira-jql" type="text" value=config.jql class="form-control" placeholder="e.g. (status = resolved AND project = SysAdmin) OR assignee = bobsmith"}}
- +
diff --git a/gui/app/templates/components/section/trello/type-editor.hbs b/gui/app/templates/components/section/trello/type-editor.hbs index 7bed5144..17860fb3 100644 --- a/gui/app/templates/components/section/trello/type-editor.hbs +++ b/gui/app/templates/components/section/trello/type-editor.hbs @@ -34,7 +34,7 @@ {{/if}} {{else}} {{#if session.isGlobalAdmin}} - {{#link-to "customize.integrations" class="btn btn-outline-secondary font-weight-bold"}} + {{#link-to "customize.integrations" class="btn btn-outline-secondary bold-700"}} Configure Trello Connector {{/link-to}} {{else}} diff --git a/gui/app/templates/components/spaces/space-list.hbs b/gui/app/templates/components/spaces/space-list.hbs index 511bb6b1..40a781b5 100644 --- a/gui/app/templates/components/spaces/space-list.hbs +++ b/gui/app/templates/components/spaces/space-list.hbs @@ -1,39 +1,41 @@
-
EVERYONE
({{publicFolders.length}})
- {{#unless hasPublicFolders}} -

No global spaces

- {{/unless}} -
    - {{#each publicFolders as |folder|}} - {{#link-to "folder.index" folder.id folder.slug}} -
  • {{ folder.name }}
    • +
      + {{#each spaces as |space|}} + {{#link-to "folder.index" space.id space.slug}} +
    • +
      +
      {{space.name}}
      +
      Some description that is to be wired up to the backend
      +
      + {{#if (eq space.spaceType constants.SpaceType.Public)}} + + {{#attach-tooltip showDelay=1000}}Public space{{/attach-tooltip}} + + {{/if}} + {{#if (eq space.spaceType constants.SpaceType.Protected)}} + + {{#attach-tooltip showDelay=1000}}Protected space{{/attach-tooltip}} + + {{/if}} + {{#if (eq space.spaceType constants.SpaceType.Private)}} + + {{#attach-tooltip showDelay=1000}}Personal space{{/attach-tooltip}} + + {{/if}} +
      +
      +
      +
      +
      18
      +
      items
      +
      +
      +
      5
      +
      categories
      +
      +
      +
      • {{/link-to}} {{/each}}
    - - {{#if session.authenticated}} -
    TEAM
    ({{protectedFolders.length}})
    - {{#unless hasProtectedFolders}} -

    No team spaces

    - {{/unless}} -
      - {{#each protectedFolders as |folder|}} - {{#link-to "folder.index" folder.id folder.slug}} -
    • {{ folder.name }}
      • - {{/link-to}} - {{/each}} -
    - -
    PERSONAL
    ({{privateFolders.length}})
    - {{#unless hasPrivateFolders}} -

    No personal spaces

    - {{/unless}} -
      - {{#each privateFolders as |folder|}} - {{#link-to "folder.index" folder.id folder.slug}} -
    • {{ folder.name }}
      • - {{/link-to}} - {{/each}} -
    - {{/if}}
diff --git a/gui/app/templates/components/toolbar/for-space.hbs b/gui/app/templates/components/toolbar/for-space.hbs index 7a72fcdd..10fac662 100644 --- a/gui/app/templates/components/toolbar/for-space.hbs +++ b/gui/app/templates/components/toolbar/for-space.hbs @@ -3,7 +3,7 @@
{{#if permissions.documentAdd}}
- +
{{/if}}
diff --git a/gui/app/templates/components/user/password-reset.hbs b/gui/app/templates/components/user/password-reset.hbs index 45cf0966..7f80a11b 100644 --- a/gui/app/templates/components/user/password-reset.hbs +++ b/gui/app/templates/components/user/password-reset.hbs @@ -11,7 +11,7 @@ Please type your new password again
- + Passwords must match
diff --git a/gui/public/assets/font/dmzui.eot b/gui/public/assets/font/dmzui.eot index 24423419cd89ed5d884c73df46d088c884a1e443..8efa97f0bc3a729dc34ae3dd38df4b178c6ad37c 100644 GIT binary patch delta 1344 zcmX|=O>7ip7{~wfvD^Kc?#HaqBGjdYQfsHwExX0G&_XR~44THEaA=|fEW5S4-OY9> zEhcVEyqGjb7~{bZLOggvOge^uA;fqv#(3c1K?yM%3k#t9Gv(oXrDY<}L;E=IzI`tCuF5&1pbe1MvEpid(C^HXjA_9|7}+VtMu4LgAw> zAhZ+cyHYB+XA^5zCg|N3kuOm}*R>bu{tmIHRB5b?>6?F3f4@=wuv|Uk_IX|1K-)FS zFIL=@nsyR*>3Ij`nMJo!nCRT$hk&75RD4vcE;ZJs-u(i|UI&bzcS`HoI}VLrCRS%3 z-+m)L{uiQL0Dj8f`1HT%UDG-P<5)-1yQ_V!&3I+~1Mi9cesN=~HSh?=*4+Tb2z9ps z6W>zn1f2$;LMo;*YE(_BV`^q|lPWq@lB!!BQqxjl*Z+q`?RL^Rinp+g74H|r@oe+B z@0w99!o#<9jCsp}lg$|QMu7fPB?W{jrUd>TWecFeS7`y#rWvs4838QH2w)M-CIc4r2w>430qof;(C|R@ zqRAJ4Mf(J>s80Zko)y5NegV5FJ|}>s0|Hp;2w>@;0G93-Kt44jU|*ANo)^HTe%xUyr{N|0e!0 zQA^xRA~~C^B`+t}Qyr;SQ!V>N`$;;Teuc#PmVN{GXra>T8Sw+*hUx!f{i^xH$wA%! zIetR(UHevt|A#Xd=$Fm>I|bSYc29S3mo~CJccAyX4=uY?vNhONYjUz>+3@yfroFj= zg!f)%xBv2RTGz(C)43JzLGG}%RA@Bj7mG_yvEbIdH}h|2-Fm%x!8u#Ku;^rCl9UVQ v8cx=dq&{CPQ5KQxe9g)F_w#AZOB_7DEpobAU8uPA1t%M<6c*1rH0;2?d;~YC delta 1904 zcma)*TWDNW6o&t^&t=ZsGLy-qX=0O%N!s+1>1AdzsWq1|H33EY(AFk`(vHbAiB2v~ zCN`q&RM9@D73#q^Qx*E)gNn_F7AYlyh!1`6L25uBN)?fV6e+bt5$jsBsu%?Anfdl! zd+mR(fA4eoGJko-I0UcKtvP$!43RaOH(L9av| z)ce>A29{`b05%j1*LHnw%-!t{+`I|6ibesqMMmsVxinI*rC$cmJFXu0_~55Z&{<nJ8F8)~GO z0M~93z_ptNx?yl*C~*UD@fHDGyj1`fZxg`9*9+j{8w7Cib^%;`qX4SwZW3@O^_vB- z&lUl#B?>wOuu)t98*LT9M%x6i(RKlBv_k+JB?PchQUDvJ1h7x10QN}}C2GJ%T>{u> zrvNs(O8^_~62L}x3t%I9%NVdxj{r966~IP)0@x=bfP6~sJv1P|M)b`yV58jv*l0ii zoA9*}!*I1-+PlhD{ptn1pueGiu3t0O85!d-Dz)OMnM}d{#U@%`bQ*}MG6gI+%@M3tSy1)9h>Wh(Mk<*c- z$mN>Bn&Z)`XrZ>Fe9nH+DCxWf4fvJb-A2CiT_Meiu1WN%UM;m%wOF2JjWQehR660Y zqRm>eE1lY=wN4M(Uej!BoD12WX4~+FHU*DIYc$i!WYot>={Iz476+P|4Ab_`g}jE{ z?6E`ss^?5gtBGbZmvl?%x}hvxmAixAY2|&@d$e+WD5c78N6xMFRyKweEIaP@`%9u` z@!rb1)e#+mzC1n$oy4Y3vVmUSHabm$?)bg94|}i=k06IB%wir#>6D(@x@1>pdu!dl z0#9vgXR_|^CZv(FboaJ5>2!U6p20iNyag{m{(si2EG{3|a?mV4v?Hpt9_R7oywZA|E6Lu$+~`CxUYw4PjORw42+rn; z#fho0+4xv4TkvHIh3O;l(di>ox59kxaM3T>!o=8k(Uy2_#)+q%DSwly(ORODxv4oW bC{w&5o(zl?CPq1#pO`H=S34gt_=*1sXuE{d diff --git a/gui/public/assets/font/dmzui.svg b/gui/public/assets/font/dmzui.svg index bb5d042b..7b17c5c1 100644 --- a/gui/public/assets/font/dmzui.svg +++ b/gui/public/assets/font/dmzui.svg @@ -28,24 +28,9 @@ - - - - - @@ -169,12 +154,6 @@ - - @@ -199,6 +178,12 @@ + + diff --git a/gui/public/assets/font/dmzui.ttf b/gui/public/assets/font/dmzui.ttf index d3f7ce65732fddb88e59ed0a04b2401c0b6204db..112ba2197c9b06ae15146c640d6f3a1928b7c0cd 100644 GIT binary patch delta 1387 zcmX|=U1%It6vzK}X0q9@$$qv?W1FN&O=Fsgam|P3+s2e2MT)dmq*BIqn~lk4m(8?E zE4cXJTPU?76{Lvx;8SfeBc(_vrPLzgLj@nC_^^l%dY?*B2vyvklY`#jH)qb7x%YRu zbMM{K*9#Xrt22OF1MvFEqFXK=osR*=Pk{Bq+~T>@3;B;)f$%P%`${42o=UD=nWS%P z#880>hM``h=M7?Sq3ErS8uiCC-fxsYTr8b*yZzPRD4t}EqiOz?_URUR{=Bh;YR257!-X=oIBj|!HLA!Ux;x5_<88s=l{j} zKlQ(rrA*4hFt|#MKO4h3QhtZ}QqB7J)dl~u(d%C@-l}eHy#*e@+OYfDjsK zb`kQ#{5Q>Q{)%~s@;0G193VCk>`mcAf>rF484uyjNKJI9GC z-N4cb0W6&qz|tuJEPY7;OAiQO>9hcr(phJ~(t`r+Rp?m(qx6oBI^KX*BkF3^2pb2? ze)EWV*8IfWFl&}&by=@ip7p8qz4d3qV#6QZVw-JE_cUCX?j`8S)*zDi@$M##1R#Io4(l`9CeO2^zaD>{-8kTAk*0q+O39n3=VXC zchSxi3K@lrU7MP!*%|nL+l+sEf71WGZBOu3E^DYU|K7l=KQ%aEFXugPeraymnajHs z|L)+sIk!?NtvIJjD@#r;F3Dp4wCCh(Nh$S^5F8E$;H6SYQPq(I^ktSZp-y3R@rrmMn|K z54zQ8AN-1S;#;jg^uY%;hHb2Eh@puwJ~VzLrt;7SqQ;nsF^04Tm5Ar;X&-oLoZa8t zbI<+X^S}4b%!T7$WZsJAdjair0FRGMrDh7Rz55lQRsd6tO+I^U*X7_cU=0IJ!{h1H zXdruXfwZec`#2?((mE+#A{xf0a`Ok&=HFEBXX@XW%#5V={1ATza9^kX3sb528SM#t zPUG9DADK=~rF(YlELcGN6H2blWM*^MemQ>{Xgv?;wP%*1eO=HJr zpa9l}1h6(NfVCAu9xUD_fW?&pSWJ(I0gHDC#Rcu8m?$o&iejR;plXVV;(}@@Ccw38 z1#s;;fes8#1bMyzT)bWY7mo_y;tc}0_$~ole768DzDEET-z$LXI*kJEqP9r@``j%c znx~*y02{>wu+csNY_wkh8?^{vqk9CfQCt8UB?Pchs{rgWipjb0sUjSADThee0zIrITedWjFlG0V5C(EC$xgd&}Q0zZyIlJQrLJu7(Ce zr^037Y(;aS+Iq#v^C!+U`ky-A7W->!4b$?>`8|eJ=eGPM zWiOg8Efh{BujwwO>xOdas_?$=C#`TXFsKz4%34*y41TuVQ(PF;th6rs>-fCVy6u5P_dt4dA{WbLVk6_}k>jPa>0EANdTcf}mQH28 zscbfLA~u>iF?}nXOdrdYNH#k$HlDL2o}01HB%Uwyw1%|$@Kkzwjtj~V&xj>_W7&yO RPEJnD=Io)iM+|-{{{i07dJg~q diff --git a/gui/public/assets/font/dmzui.woff b/gui/public/assets/font/dmzui.woff index 9f047d9d61aae93dd09634196f74df76b7db386a..677a1793e5e36f2770e016031a0f5fcc77666d30 100644 GIT binary patch delta 6835 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 delta 7030 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 U)YxU}A|_Y0T7Ll@SM4(Z0I~yiasU7T diff --git a/gui/public/assets/font/dmzui.woff2 b/gui/public/assets/font/dmzui.woff2 index a9e5d08fa2c2932e3edf6ab0f26560e3044f06dc..d938316f060f85243e5e3d54869034487772cba1 100644 GIT binary patch literal 6004 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