diff --git a/domain/mail/document-approver.html b/domain/mail/document-approver.html index cf2f2ed3..057524a8 100644 --- a/domain/mail/document-approver.html +++ b/domain/mail/document-approver.html @@ -76,7 +76,7 @@ background-color: #f6f6f6; - View document + View document diff --git a/domain/mail/email.html b/domain/mail/email.html index 6fd9f862..e16a1fb3 100644 --- a/domain/mail/email.html +++ b/domain/mail/email.html @@ -87,7 +87,7 @@ background-color: #f6f6f6; - Click here to access Documize + Click here to access Documize diff --git a/domain/mail/invite-existing-user.html b/domain/mail/invite-existing-user.html index 9461c547..6827197e 100644 --- a/domain/mail/invite-existing-user.html +++ b/domain/mail/invite-existing-user.html @@ -72,7 +72,7 @@ background-color: #f6f6f6; - Click here to access Documize + Click here to access Documize diff --git a/domain/mail/invite-new-user.html b/domain/mail/invite-new-user.html index ead957e2..b88392f2 100644 --- a/domain/mail/invite-new-user.html +++ b/domain/mail/invite-new-user.html @@ -82,7 +82,7 @@ background-color: #f6f6f6; - Click here to access Documize + Click here to access Documize diff --git a/domain/mail/password-reset.html b/domain/mail/password-reset.html index 5e0b727c..d9febd5e 100644 --- a/domain/mail/password-reset.html +++ b/domain/mail/password-reset.html @@ -79,7 +79,7 @@ background-color: #f6f6f6; - Click here to reset your password + Click here to reset your password diff --git a/domain/mail/share-space-existing-user.html b/domain/mail/share-space-existing-user.html index c4f4466c..6dba93a3 100644 --- a/domain/mail/share-space-existing-user.html +++ b/domain/mail/share-space-existing-user.html @@ -75,7 +75,7 @@ background-color: #f6f6f6; - Login to Documize + Login to Documize diff --git a/domain/mail/share-space-new-user.html b/domain/mail/share-space-new-user.html index d5f028f8..04564606 100644 --- a/domain/mail/share-space-new-user.html +++ b/domain/mail/share-space-new-user.html @@ -81,7 +81,7 @@ background-color: #f6f6f6; - Go to Documize + Go to Documize diff --git a/gui/app/components/folder/settings-templates.js b/gui/app/components/folder/settings-templates.js deleted file mode 100644 index 5c62df30..00000000 --- a/gui/app/components/folder/settings-templates.js +++ /dev/null @@ -1,37 +0,0 @@ -// 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 { inject as service } from '@ember/service'; -import { computed } from '@ember/object'; -import stringUtil from '../../utils/string'; -import AuthMixin from '../../mixins/auth'; -import Notifier from '../../mixins/notifier'; -import Component from '@ember/component'; - -export default Component.extend(AuthMixin, Notifier, { - spaceSvc: service('folder'), - - isSpaceAdmin: computed('permissions', function() { - return this.get('permissions.spaceOwner') || this.get('permissions.spaceManage'); - }), - - actions: { - onOpenTemplate(id) { - if (is.empty(id)) { - return; - } - let template = this.get('templates').findBy('id', id) - - let slug = stringUtil.makeSlug(template.get('title')); - this.get('router').transitionTo('document', this.get('space.id'), this.get('space.slug'), id, slug); - } - } -}); diff --git a/gui/app/components/layout/bottom-bar.js b/gui/app/components/layout/bottom-bar.js deleted file mode 100644 index d5fcd8da..00000000 --- a/gui/app/components/layout/bottom-bar.js +++ /dev/null @@ -1,62 +0,0 @@ -// 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 $ from 'jquery'; -import { inject as service } from '@ember/service'; -import Component from '@ember/component'; - -export default Component.extend({ - classNames: ['layout-footer', 'non-printable'], - tagName: 'footer', - appMeta: service(), - showWait: false, - showDone: false, - showMessage: false, - message: '', - - init() { - this._super(...arguments); - this.eventBus.subscribe('notifyUser', this, 'processNotification'); - }, - - processNotification(msg) { - if (this.get('isDestroyed') || this.get('isDestroying')) return; - - if (msg === 'wait') { - this.set('showWait', true); - this.set('showMessage', false); - this.set('showDone', false); - } - - if (msg === 'done') { - $('.progress-done').removeClass('zoomOut').addClass('zoomIn'); - this.set('showWait', false); - this.set('showMessage', false); - this.set('showDone', true); - - setTimeout(function() { - $('.progress-done').removeClass('zoomIn').addClass('zoomOut'); - }, 3000); - } - - if (msg !== 'done' && msg !== 'wait') { - $('.progress-notification').removeClass('zoomOut').addClass('zoomIn'); - this.set('showWait', false); - this.set('showDone', false); - this.set('showMessage', true); - this.set('message', msg); - - setTimeout(function() { - $('.progress-notification').removeClass('zoomIn').addClass('zoomOut'); - }, 3000); - } - } -}); diff --git a/gui/app/components/layout/middle-zone-content.js b/gui/app/components/layout/middle-zone-content.js deleted file mode 100644 index 4bcd425f..00000000 --- a/gui/app/components/layout/middle-zone-content.js +++ /dev/null @@ -1,18 +0,0 @@ -// 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 $ from 'jquery'; -import Component from '@ember/component'; - -export default Component.extend({ - classNames: ['layout-content'], - tagName: 'article' -}); diff --git a/gui/app/components/layout/middle-zone-sidebar.js b/gui/app/components/layout/middle-zone-sidebar.js deleted file mode 100644 index f5907c7a..00000000 --- a/gui/app/components/layout/middle-zone-sidebar.js +++ /dev/null @@ -1,32 +0,0 @@ -// 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 Component from '@ember/component'; - -export default Component.extend({ - tagName: 'nav', - classNames: ['layout-sidebar', 'non-printable'], - classNameBindings: ['scrollable:sidebar-scroll'], - scrollable: false, - - didInsertElement() { - this._super(...arguments); - // let sb = this.$().overlayScrollbars({ scrollbars: { autoHide: 'leave' }}); - // this.set('scrollbars', sb); - }, - - willDestroyElement() { - this._super(...arguments); - - // let sb = this.get('scrollbars'); - // sb.destroy(); - } -}); diff --git a/gui/app/components/layout/middle-zone.js b/gui/app/components/layout/middle-zone.js deleted file mode 100644 index c9ddc68b..00000000 --- a/gui/app/components/layout/middle-zone.js +++ /dev/null @@ -1,18 +0,0 @@ -// 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 $ from 'jquery'; -import Component from '@ember/component'; - -export default Component.extend({ - classNames: ['layout-body'], - tagName: 'main' -}); diff --git a/gui/app/components/layout/top-bar.js b/gui/app/components/layout/top-bar.js deleted file mode 100644 index bf4fb3bf..00000000 --- a/gui/app/components/layout/top-bar.js +++ /dev/null @@ -1,126 +0,0 @@ -// 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 $ from 'jquery'; -import { notEmpty } from '@ember/object/computed'; -import { inject as service } from '@ember/service' -import ModalMixin from '../../mixins/modal'; -import Component from '@ember/component'; - -export default Component.extend(ModalMixin, { - classNames: ['layout-header', 'non-printable'], - tagName: 'header', - folderService: service('folder'), - appMeta: service(), - session: service(), - store: service(), - pinned: service(), - enableLogout: true, - hasPins: notEmpty('pins'), - hasSpacePins: notEmpty('spacePins'), - hasDocumentPins: notEmpty('documentPins'), - hasWhatsNew: false, - newsContent: '', - - init() { - this._super(...arguments); - let constants = this.get('constants'); - - this.pins = []; - - if (this.get('appMeta.authProvider') !== constants.AuthProvider.Documize) { - let config = this.get('appMeta.authConfig'); - config = JSON.parse(config); - this.set('enableLogout', !config.disableLogout); - } - - this.get('session').hasWhatsNew().then((v) => { - this.set('hasWhatsNew', v); - }); - - let version = this.get('appMeta.version'); - let edition = this.get('appMeta.edition').toLowerCase(); - - let self = this; - let cacheBuster = + new Date(); - $.ajax({ - url: `https://storage.googleapis.com/documize/news/${edition}/${version}.html?cb=${cacheBuster}`, - type: 'GET', - dataType: 'html', - success: function (response) { - if (self.get('isDestroyed') || self.get('isDestroying')) return; - self.set('newsContent', response); - } - }); - }, - - didInsertElement() { - this._super(...arguments); - - if (this.get("session.authenticated")) { - this.eventBus.subscribe('pinChange', this, 'setupPins'); - this.setupPins(); - } - }, - - setupPins() { - if (this.get('isDestroyed') || this.get('isDestroying')) return; - - this.get('pinned').getUserPins().then((pins) => { - if (this.get('isDestroyed') || this.get('isDestroying')) { - return; - } - this.set('pins', pins); - this.set('spacePins', pins.filterBy('isSpace', true)); - this.set('documentPins', pins.filterBy('isDocument', true)); - }); - }, - - willDestroyElement() { - this._super(...arguments); - - this.eventBus.unsubscribe('pinChange'); - }, - - actions: { - jumpToPin(pin) { - let folderId = pin.get('spaceId'); - let documentId = pin.get('documentId'); - - if (_.isEmpty(documentId)) { - // jump to space - let folder = this.get('store').peekRecord('folder', folderId); - this.get('router').transitionTo('folder', folderId, folder.get('slug')); - } else { - // jump to doc - let folder = this.get('store').peekRecord('folder', folderId); - this.get('router').transitionTo('document', folderId, folder.get('slug'), documentId, 'document'); - } - }, - - onShowWhatsNewModal() { - this.modalOpen("#whats-new-modal", { "show": true }); - - if (this.get('newsContent.length') > 0) { - this.get('session').seenNewVersion(); - this.set('hasWhatsNew', false); - } - }, - - onBilling() { - if (!this.get('session.isAdmin')) { - return; - } - - this.get('router').transitionTo('customize.billing'); - } - } -}); diff --git a/gui/app/components/ui/ui-button.js b/gui/app/components/ui/ui-button.js index edcd14da..469c4280 100644 --- a/gui/app/components/ui/ui-button.js +++ b/gui/app/components/ui/ui-button.js @@ -37,6 +37,7 @@ export default Component.extend({ // Prepare button class name let bc = 'dmz-button'; + if (this.themed) { bc += '-theme'; } else { diff --git a/gui/app/components/ui/ui-radio.js b/gui/app/components/ui/ui-radio.js deleted file mode 100644 index 9a1b74c6..00000000 --- a/gui/app/components/ui/ui-radio.js +++ /dev/null @@ -1,29 +0,0 @@ -// 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 Component from '@ember/component'; - -export default Component.extend({ - tagName: 'span', - value: '', - onClick: null, - - actions: { - onCheck() { - if (this.get('onClick') !== null) { - let cb = this.get('onClick'); - cb(this.get('value')); - } else { - this.set('selected', !this.get('selected')); - } - } - } -}); diff --git a/gui/app/constants/constants.js b/gui/app/constants/constants.js index 68a3b9fc..0e8c7341 100644 --- a/gui/app/constants/constants.js +++ b/gui/app/constants/constants.js @@ -273,6 +273,7 @@ let constants = EmberObject.extend({ Authenticate: 'Authenticate', Cancel: 'Cancel', Close: 'Close', + Copy: 'Copy', Delete: 'Delete', Export: 'Export', File: 'File', @@ -281,6 +282,7 @@ let constants = EmberObject.extend({ Join: 'Join', Leave: 'Leave', Next: 'Next', + Publish: 'Publish', Remove: 'Remove', Reset: 'Reset', Restore: 'Restore', diff --git a/gui/app/styles/core/all.scss b/gui/app/styles/core/all.scss index 628b9e56..7cf04250 100644 --- a/gui/app/styles/core/all.scss +++ b/gui/app/styles/core/all.scss @@ -30,21 +30,16 @@ .background-color-theme-100 { background-color: $theme-100; } @import "reset.scss"; -@import "font.scss"; @import "icon.scss"; @import "mixins.scss"; @import "layout/all.scss"; @import "util.scss"; @import "text.scss"; @import "bootstrap.scss"; - - @import "view/common.scss"; @import "widget/widget.scss"; @import "ui/all.scss"; -@import "view/toolbar.scss"; @import "view/all.scss"; - @import "vendor/all.scss"; @import "print.scss"; @import "news.scss"; diff --git a/gui/app/styles/core/bootstrap.scss b/gui/app/styles/core/bootstrap.scss index 3c58ea81..8e73cc79 100644 --- a/gui/app/styles/core/bootstrap.scss +++ b/gui/app/styles/core/bootstrap.scss @@ -53,8 +53,6 @@ $input-focus-border-color: map-get($gray-shades, 600); $input-focus-color: $color-black-light-1; $input-placeholder-color: map-get($gray-shades, 600); $input-focus-border-color: map-get($gray-shades, 200); -$input-btn-focus-width: .2rem; -$input-btn-focus-color: rgba($theme-500, .25); // form labels .form-group { @@ -96,8 +94,8 @@ $link-hover-decoration: none; // Optional @import "node_modules/bootstrap/scss/reboot"; @import "node_modules/bootstrap/scss/grid"; -@import "node_modules/bootstrap/scss/buttons"; -@import "node_modules/bootstrap/scss/button-group"; +// @import "node_modules/bootstrap/scss/buttons"; +// @import "node_modules/bootstrap/scss/button-group"; @import "node_modules/bootstrap/scss/forms"; @import "node_modules/bootstrap/scss/custom-forms"; @import "node_modules/bootstrap/scss/input-group"; diff --git a/gui/app/styles/core/font.scss b/gui/app/styles/core/font.scss deleted file mode 100644 index 4ebda61c..00000000 --- a/gui/app/styles/core/font.scss +++ /dev/null @@ -1,15 +0,0 @@ -// .font-fixed-width { -// font-family: 'courier new', courier; -// } - -// $font-regular: Helvetica; -// $font-semibold: Helvetica; -// $font-light: Helvetica; - -@font-face { - font-family: "Material Icons"; - font-style: normal; - font-weight: 400; - src: url("font/icons/MaterialIcons-Regular.eot"); - src: local('Material Icons'), local('MaterialIcons-Regular'), url("font/icons/MaterialIcons-Regular.woff2") format('woff2'), url("font/icons/MaterialIcons-Regular.woff") format('woff'), url("font/icons/MaterialIcons-Regular.ttf") format('truetype'); -} diff --git a/gui/app/styles/core/layout/all.scss b/gui/app/styles/core/layout/all.scss index 75156bc9..464c266e 100644 --- a/gui/app/styles/core/layout/all.scss +++ b/gui/app/styles/core/layout/all.scss @@ -3,10 +3,3 @@ @import "headings.scss"; @import "master-internal.scss"; @import "sidebar.scss"; - -@import "layout-master.scss"; -@import "layout-topbar.scss"; -@import "layout-sidebar.scss"; -@import "layout-footer.scss"; -@import "layout-content.scss"; - diff --git a/gui/app/styles/core/layout/layout-content.scss b/gui/app/styles/core/layout/layout-content.scss deleted file mode 100644 index a315fce5..00000000 --- a/gui/app/styles/core/layout/layout-content.scss +++ /dev/null @@ -1,32 +0,0 @@ -.content-zone { - > .explainer-header { - color: map-get($gray-shades, 600); - font-size: 1.5rem; - font-weight: 500; - } - - > .explainer-text { - margin: 3px 0; - padding: 0; - color: map-get($gray-shades, 600); - font-size: 1.1rem; - } - - > .explainer-list { - margin: 5px 20px; - padding: 0; - color: map-get($gray-shades, 600); - - > li { - margin: 0; - padding: 0; - font-size: 1.1rem; - list-style: square; - } - - } - - > .explainer-gap { - margin-bottom: 3rem; - } -} diff --git a/gui/app/styles/core/layout/layout-footer.scss b/gui/app/styles/core/layout/layout-footer.scss deleted file mode 100644 index df208a6b..00000000 --- a/gui/app/styles/core/layout/layout-footer.scss +++ /dev/null @@ -1,51 +0,0 @@ -footer { - background-color: $theme-100; - color: map-get($gray-shades, 600); - font-weight: 500; - font-size: 1rem; - padding: 5px 2rem; -} - -.footer { - display: flex; - overflow: hidden; - - a, a:visited { - @include ease-in(); - color: map-get($gray-shades, 600); - text-decoration: none; - - &:hover { - text-decoration: underline; - } - } - - > .progress { - display: inline-block; - text-align: right; - - > img { - padding: 0; - margin: 0; - height: 20px; - width: 20px; - } - } - - > .progress-done { - background-color: map-get($green-shades, 600); - color: $color-white; - text-align: center; - font-size: 1rem; - height: 20px; - width: 20px; - @include border-radius(20px); - } - - > .progress-notification { - display: inline-block; - font-size: 1rem; - color: map-get($green-shades, 600); - font-weight: 500; - } -} diff --git a/gui/app/styles/core/layout/layout-master.scss b/gui/app/styles/core/layout/layout-master.scss deleted file mode 100644 index 10a37229..00000000 --- a/gui/app/styles/core/layout/layout-master.scss +++ /dev/null @@ -1,153 +0,0 @@ -$break-1: 900px; -$break-2: 1200px; -$break-3: 1400px; -$break-4: 1600px; -$break-5: 1800px; - -.layout-header, .layout-footer { - flex: 0 0 auto; - width: 100%; -} - -.layout-body { - display: flex; - flex: 1 0 auto; - flex-direction: column; - padding: 2rem; -} - -.layout-content { - margin-top: 2rem; -} - -.layout-sidebar { - order: -1; - background-color: map-get($gray-shades, 200); - padding: 1rem; -} - -footer { - margin: auto auto 0 auto; - bottom: 0; - z-index: 888; - @include sticky(); -} - -@media (min-width: $break-1) { - .layout-body { - flex-direction: row; - } - - .layout-sidebar { - flex: 0 0 200px; - width: 200px; - height: calc(100vh - 140px); - @include sticky(); - top: 2rem; - } - - .layout-content { - flex: 0 1 700px; - padding: 0 2rem; - margin: 0; - max-width: 700px; - } -} - -@media (min-width: $break-2) { - .layout-body { - flex-direction: row; - } - - .layout-sidebar { - flex: 0 0 300px; - width: 300px; - } - - .layout-content { - flex: 0 1 1000px; - margin: 0; - padding: 0 2rem 0 3rem; - max-width: 1000px; - } -} - -@media (min-width: $break-3) { - .layout-body { - flex-direction: row; - } - - .layout-sidebar { - flex: 0 0 400px; - width: 400px; - } - - .layout-content { - flex: 0 1 1000px; - margin: 0; - padding: 0 0 0 3rem; - max-width: 1000px; - } -} - -@media (min-width: $break-4) { - .layout-body { - flex-direction: row; - } - - .layout-sidebar { - flex: 0 0 450px; - width: 450px; - } - - .layout-content { - flex: 0 1 1200px; - margin: 0; - padding: 0 2rem 0 3rem; - max-width: 1200px; - } -} - -@media (min-width: $break-5) { - .layout-body { - flex-direction: row; - } - - .layout-sidebar { - flex: 0 0 500px; - width: 500px; - } - - .layout-content { - flex: 0 1 1300px; - margin: 0; - padding: 0 2rem 0 4rem; - max-width: 1300px; - } -} - -@media (max-width: 576px) { - footer { - position: relative; - bottom: auto; - } -} - -/** - * Conditional CSS for Edge 12+. - * @link: https://jeffclayton.wordpress.com/2015/04/07/css-hacks-for-windows-10-and-spartan-browser-preview/ - */ - @supports (-ms-ime-align:auto) { - // For IE/Edge footer must be at bottom as sticky/flex is not quite supported. - .layout-footer, footer { - position: relative !important; - } -} - -/** - * Conditional CSS for IE 8+ (and old Firefox 1.x). - * @link: https://jeffclayton.wordpress.com/2015/04/07/css-hacks-for-windows-10-and-spartan-browser-preview/ - */ -@media screen\0 { - /* Conditional IE styles */ -} diff --git a/gui/app/styles/core/layout/layout-sidebar.scss b/gui/app/styles/core/layout/layout-sidebar.scss deleted file mode 100644 index 3ebfb37f..00000000 --- a/gui/app/styles/core/layout/layout-sidebar.scss +++ /dev/null @@ -1,59 +0,0 @@ -.sidebar { - padding: 1rem; -} - -.sidebar-center { - text-align: center; -} - -.sidebar-scroll { - padding: 1rem; - overflow-x: hidden; - overflow-y: auto; -} - -.sidebar-white { - background-color: $color-white; - margin: 10px 10px; - - @media (min-width: $break-1) { - margin: 10px 10px; - height: calc(100vh - 204px); - overflow-x: hidden; - overflow-y: auto; - } - @media (min-width: $break-2) { - margin: 10px 10px; - } - @media (min-width: $break-3) { - margin: 20px 20px; - } - @media (min-width: $break-4) { - margin: 20px 20px; - } - @media (min-width: $break-5) { - margin: 20px 20px; - } -} - -.sidebar-view-switcher { - color: $theme-500; - background-color: map-get($gray-shades, 600); - padding: 5px 20px; - text-align: center; - height: 50px; - - > i { - font-size: 2rem; - cursor: pointer; - @include ease-in(); - - &:hover { - color: $color-link; - } - } - - > .divider { - margin: 0 10px; - } -} diff --git a/gui/app/styles/core/layout/layout-topbar.scss b/gui/app/styles/core/layout/layout-topbar.scss deleted file mode 100644 index c8306a8c..00000000 --- a/gui/app/styles/core/layout/layout-topbar.scss +++ /dev/null @@ -1,86 +0,0 @@ -#top-bar { - padding: 0 !important; -} - -.top-bar { - background-color: $theme-500; - color: $color-white; - padding: 0 2rem; - font-size: 1rem; - height: 50px; - - > .items { - margin: 0; - padding: 0; - height: 50px; - - > .item { - list-style: none; - display: inline-block; - margin: 0 30px 0 0; - padding: 0; - font-size: 1.2rem; - letter-spacing: 0.1rem; - font-weight: 700; - white-space: nowrap; - cursor: pointer; - - > .logo { - height: 35px; - width: 35px; - } - - > .link, .link:visited { - @include ease-in(); - color: $color-white; - - &:hover { - color: darken($color-white, 15%); - } - } - - > .selected { - background-color: $theme-500 !important; - color: $theme-500 !important; - padding: 5px 10px !important; - - &:hover { - color: darken($theme-500, 15%) !important; - } - } - } - } - - > .buttons { - height: 50px; - float: right; - - > .button-icon-gap { - margin-left: 20px; - } - } - - > .hamburger { - @include ease-in(); - @include border-radius(3px); - background-color: $theme-500; - border: 1px solid $theme-100; - - > i { - font-size: 1.8rem; - line-height: 2.1rem; - padding: 0px 3px 0px 3px; - color: $theme-100; - cursor: pointer; - vertical-align: sub; - } - - &:hover { - background-color: $theme-100; - - > i { - color: $theme-500; - } - } - } -} diff --git a/gui/app/styles/core/mixins.scss b/gui/app/styles/core/mixins.scss index 0d5d5c0e..50146b10 100644 --- a/gui/app/styles/core/mixins.scss +++ b/gui/app/styles/core/mixins.scss @@ -7,6 +7,15 @@ position: sticky; } +@mixin card() { + background-color: $color-card; + box-shadow: 1px 1px 3px 0px rgba(211,211,211,1); + + &:hover { + background-color: map-get($gray-shades, 100); + } +} + @mixin border-radius($radius) { -webkit-border-radius: $radius; @@ -37,32 +46,3 @@ border-bottom-left-radius: $radius; border-bottom-right-radius: $radius; } - -@mixin ease-in() -{ - // -webkit-transition: all 0.30s ease-in-out; - // -moz-transition: all 0.30s ease-in-out; - // -ms-transition: all 0.30s ease-in-out; - // -o-transition: all 0.30s ease-in-out; - // transition: all 0.30s ease-in-out; -} - -@mixin content-container($pad-tb: 25px, $pad-lr: 50px) { - @include border-radius(2px); - padding: $pad-tb $pad-lr; - box-shadow: 0 0 0 0.75pt map-get($gray-shades, 200),0 0 3pt 0.75pt map-get($gray-shades, 200); - background-color: $color-white; -} - -@mixin card() { - background-color: $color-card; - box-shadow: 1px 1px 3px 0px rgba(211,211,211,1); - - &:hover { - background-color: map-get($gray-shades, 100); - } -} - -@mixin shadow() { - box-shadow: 1px 1px 3px 0px rgba(211,211,211,1); -} diff --git a/gui/app/styles/core/section/trello.scss b/gui/app/styles/core/section/trello.scss index 444919b5..ddc7f030 100644 --- a/gui/app/styles/core/section/trello.scss +++ b/gui/app/styles/core/section/trello.scss @@ -24,11 +24,11 @@ color: #4c4c4c; font-size: 14px; display: inline-block; - vertical-align: text-top; + vertical-align: middle; } .section-trello-list-checkbox { - vertical-align: text-top; + vertical-align: middle; margin-right: 10px; } diff --git a/gui/app/styles/core/view/common.scss b/gui/app/styles/core/view/common.scss index e75caa7c..451f0352 100644 --- a/gui/app/styles/core/view/common.scss +++ b/gui/app/styles/core/view/common.scss @@ -20,7 +20,7 @@ display: block; } - > .material-icons { + > .dicon { font-size: 5rem; color: map-get($gray-shades, 200); } @@ -33,7 +33,6 @@ margin: 5rem 0; } - .theme-picker { display : block; margin-bottom: 10px; @@ -52,7 +51,6 @@ cursor: default; border: 7px solid map-get($gray-shades, 300); @include border-radius(3px); - @include ease-in(); &:hover { border: 7px solid map-get($gray-shades, 600); diff --git a/gui/app/styles/core/view/customize.scss b/gui/app/styles/core/view/customize.scss index a84581ee..54db2f74 100644 --- a/gui/app/styles/core/view/customize.scss +++ b/gui/app/styles/core/view/customize.scss @@ -207,7 +207,6 @@ > .item { margin: 15px 0; padding: 15px 0; - @include ease-in(); font-size: 1.2rem; color: $theme-500; } @@ -255,7 +254,6 @@ } > .upload-backup-file { - @include ease-in(); margin: 50px 0 10px 0; > .dz-preview, .dz-processing { diff --git a/gui/app/styles/core/view/document/add-section.scss b/gui/app/styles/core/view/document/add-section.scss index f07de2f5..448a8558 100644 --- a/gui/app/styles/core/view/document/add-section.scss +++ b/gui/app/styles/core/view/document/add-section.scss @@ -19,7 +19,6 @@ padding: 0; > .item { - @include ease-in(); @include border-radius(3px); list-style: none; cursor: pointer; @@ -65,7 +64,6 @@ padding: 0; > .item { - @include ease-in(); @include border-radius(3px); list-style: none; cursor: pointer; @@ -83,8 +81,7 @@ } > .actions { - @include ease-in(); - position: absolute; + position: absolute; top: 10px; right: 8px; } diff --git a/gui/app/styles/core/view/document/copy-move.scss b/gui/app/styles/core/view/document/copy-move.scss index ef95d3c4..f57e3510 100644 --- a/gui/app/styles/core/view/document/copy-move.scss +++ b/gui/app/styles/core/view/document/copy-move.scss @@ -5,17 +5,19 @@ width: 100%; > .document { - @include ease-in(); - margin: 0 0 5px 0; + margin: 0 0 15px 0; padding: 10px 15px; - color: map-get($gray-shades, 600); + color: map-get($gray-shades, 700); background-color: map-get($gray-shades, 100); + border: 1px solid map-get($gray-shades, 200); cursor: pointer; position: relative; list-style-type: none; &:hover { - color: $color-black; + > .title, > .space, > .snippet { + color: map-get($gray-shades, 800); + } } > .title { @@ -24,7 +26,6 @@ } > .space { - color : map-get($gray-shades, 600); font-size: 0.8rem; font-style: italic; font-weight: bold; @@ -32,24 +33,26 @@ } > .snippet { - color : map-get($gray-shades, 600); font-size: 0.9rem; } - > .material-icons { + > .dicon { position: absolute; top: 10px; right: 10px; - color: $color-white; + color: map-get($yellow-shades, 800); + font-weight: 700; + font-size: 1.3rem; } } > .selected { - background-color: $color-link !important; - > .title, .space, .snippet { - color: $color-white !important; + color: map-get($yellow-shades, 800) !important; } + + background-color: map-get($yellow-shades, 100) !important; + border: 1px solid map-get($yellow-shades, 300) !important; } } } diff --git a/gui/app/styles/core/view/document/section-editor.scss b/gui/app/styles/core/view/document/section-editor.scss index b283bcdf..15b2f5df 100644 --- a/gui/app/styles/core/view/document/section-editor.scss +++ b/gui/app/styles/core/view/document/section-editor.scss @@ -10,7 +10,7 @@ height: 500px; overflow-y: auto; - .icon { + .dicon { margin-right: 5px; height: 15px; width: 15px; @@ -20,4 +20,3 @@ .block-editor { margin-top: 3rem; } - diff --git a/gui/app/styles/core/view/document/view-activity.scss b/gui/app/styles/core/view/document/view-activity.scss index e428c470..43d5ad91 100644 --- a/gui/app/styles/core/view/document/view-activity.scss +++ b/gui/app/styles/core/view/document/view-activity.scss @@ -14,7 +14,6 @@ width: 100%; > .item { - @include ease-in(); list-style: none; padding: 10px 0; margin: 5px 0; @@ -36,7 +35,6 @@ } > .details { - @include ease-in(); vertical-align: top; display: inline-block; diff --git a/gui/app/styles/core/view/import.scss b/gui/app/styles/core/view/import.scss index c6a374e2..042d7d50 100644 --- a/gui/app/styles/core/view/import.scss +++ b/gui/app/styles/core/view/import.scss @@ -1,5 +1,6 @@ .import-zone { margin: 3rem 1rem; + text-align: center; .dz-preview, .dz-processing { display: none !important; diff --git a/gui/app/styles/core/view/search.scss b/gui/app/styles/core/view/search.scss index 4f4f463c..f72ec1a0 100644 --- a/gui/app/styles/core/view/search.scss +++ b/gui/app/styles/core/view/search.scss @@ -30,7 +30,6 @@ > .document { @include card(); - @include ease-in(); list-style-type: none; overflow: hidden; position: relative; @@ -44,7 +43,6 @@ } > a { - @include ease-in(); display: block; position: relative; padding: 15px 20px; diff --git a/gui/app/styles/core/view/space.scss b/gui/app/styles/core/view/space.scss index bb016638..92115d67 100644 --- a/gui/app/styles/core/view/space.scss +++ b/gui/app/styles/core/view/space.scss @@ -172,6 +172,10 @@ margin: 0; padding: 10px 15px; text-align: center; + + > .dicon { + color: map-get($gray-shades, 700); + } } > td:first-child { diff --git a/gui/app/styles/core/view/toolbar.scss b/gui/app/styles/core/view/toolbar.scss deleted file mode 100644 index 89f963b5..00000000 --- a/gui/app/styles/core/view/toolbar.scss +++ /dev/null @@ -1,30 +0,0 @@ -.toolbar { - margin: 30px 0 0 0; - - > .links { - display: inlne-block; - - > .link, div > .link { - color: map-get($gray-shades, 600); - font-size: 1.1rem; - font-weight: bold; - display: inline-block; - margin-right: 30px; - cursor: pointer; - text-transform: uppercase; - @include ease-in(); - - &:hover { - color: $color-link; - } - } - - > .selected, div > .link { - color: $color-link; - } - } - - > .buttons { - float: right; - } -} diff --git a/gui/app/styles/core/widget/widget-avatar.scss b/gui/app/styles/core/widget/widget-avatar.scss index daf8aab7..e6af8989 100644 --- a/gui/app/styles/core/widget/widget-avatar.scss +++ b/gui/app/styles/core/widget/widget-avatar.scss @@ -2,7 +2,6 @@ color: $color-white; background-color: map-get($gray-shades, 600); @include border-radius(20px); - @include ease-in(); padding: 10px 0 0 0; letter-spacing: 1px; text-align: center; @@ -14,7 +13,6 @@ color: $color-white; background-color: map-get($gray-shades, 600); @include border-radius(100px); - @include ease-in(); height: 100px; width: 100px; font-size: 30px; diff --git a/gui/app/styles/core/widget/widget-button.scss b/gui/app/styles/core/widget/widget-button.scss deleted file mode 100644 index bb35a4e0..00000000 --- a/gui/app/styles/core/widget/widget-button.scss +++ /dev/null @@ -1,198 +0,0 @@ -// Copyright (c) 2015 Documize Inc. -.button-gap { - width: 5px; - margin: 0; - padding: 0; - display: inline-block; - @extend .no-select; -} - -.button-icon-white { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: $color-white; - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: darken($color-white, 15%); - } - } -} - -.button-icon-gray { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: map-get($gray-shades, 300); - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: darken(map-get($gray-shades, 300), 15%); - } - } -} - -.button-icon-gold { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: map-get($yellow-shades, 700); - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: darken(map-get($yellow-shades, 700), 5%); - } - } -} - -.button-icon-danger { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: map-get($gray-shades, 300); - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: map-get($red-shades, 700); - } - } -} - -.button-icon-blue { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: map-get($gray-shades, 800); - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: map-get($gray-shades, 600); - } - } -} - -.button-icon-red { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: map-get($red-shades, 700); - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: map-get($red-shades, 400); - } - } -} - -.button-icon-green { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: map-get($green-shades, 600); - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: map-get($green-shades, 700); - } - } -} - -.button-icon-black { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: $color-black-light-1; - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: darken($color-black-light-1, 5%); - } - } -} - -.button-icon-theme { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: $theme-500; - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: darken($theme-500, 5%); - } - } -} - -.button-icon-theme-light { - display: inline-block; - cursor: default; - @include ease-in(); - - > i { - color: $theme-100; - font-size: 2rem; - @include ease-in(); - } - - &:hover { - > i { - color: darken($theme-100, 5%); - } - } -} -.button-icon-small { - > i { - font-size: 1.3rem; - } -} - -.button-icon-gap { - display: inline-block; - margin-left: 5px; -} diff --git a/gui/app/styles/core/widget/widget-checkbox.scss b/gui/app/styles/core/widget/widget-checkbox.scss index 9addbcf8..b5262864 100644 --- a/gui/app/styles/core/widget/widget-checkbox.scss +++ b/gui/app/styles/core/widget/widget-checkbox.scss @@ -6,7 +6,7 @@ white-space: nowrap; margin: 0 0 5px 0; - > .material-icons { + > .dicon{ font-size: 1.5rem; color: map-get($gray-shades, 600); vertical-align: top; diff --git a/gui/app/styles/core/widget/widget-list-picker.scss b/gui/app/styles/core/widget/widget-list-picker.scss index 0eb3ea59..a326cd96 100644 --- a/gui/app/styles/core/widget/widget-list-picker.scss +++ b/gui/app/styles/core/widget/widget-list-picker.scss @@ -25,7 +25,6 @@ } > .text-header { - @include ease-in(); font-size: 1.3rem; font-weight: 600; margin-bottom: 5px; @@ -36,7 +35,6 @@ } > .text { - @include ease-in(); font-size: 1rem; font-weight: 400; overflow: hidden; @@ -45,7 +43,7 @@ width: 80%; } - > .material-icons { + > .dicon { position: absolute; top: 10px; right: 10px; diff --git a/gui/app/styles/core/widget/widget-radio.scss b/gui/app/styles/core/widget/widget-radio.scss deleted file mode 100644 index d633aba2..00000000 --- a/gui/app/styles/core/widget/widget-radio.scss +++ /dev/null @@ -1,35 +0,0 @@ -.ui-radio { - vertical-align: bottom; - cursor: pointer; - font-size: 1.1rem; - overflow: hidden; - white-space: nowrap; - margin: 0 0 5px 0; - - > .material-icons { - font-size: 1.5rem; - color: map-get($gray-shades, 600); - vertical-align: top; - margin-right: 5px; - } - - > .selected { - color: map-get($gray-shades, 800); - } - - &:hover { - color: map-get($gray-shades, 800); - } - - > .text { - display: inline-block; - font-size: 1.1rem; - vertical-align: sub; - color: $color-black-light-1; - } -} - -.ui-radio-selected { - color: map-get($gray-shades, 800); -} - diff --git a/gui/app/styles/core/widget/widget-symbol.scss b/gui/app/styles/core/widget/widget-symbol.scss index 12c5fc4b..471f462a 100644 --- a/gui/app/styles/core/widget/widget-symbol.scss +++ b/gui/app/styles/core/widget/widget-symbol.scss @@ -9,7 +9,7 @@ text-align: center; background-color: map-get($gray-shades, 300); - > .material-icons { + > .dicons { font-size: 22px; margin-top: 20px; color: map-get($gray-shades, 600); diff --git a/gui/app/styles/core/widget/widget-tabnav.scss b/gui/app/styles/core/widget/widget-tabnav.scss index 32529bcf..0676b762 100644 --- a/gui/app/styles/core/widget/widget-tabnav.scss +++ b/gui/app/styles/core/widget/widget-tabnav.scss @@ -4,7 +4,6 @@ font-size: 0; > .tab { - @include ease-in(); @extend .text-truncate; display: inline-block; margin: 0; diff --git a/gui/app/styles/core/widget/widget.scss b/gui/app/styles/core/widget/widget.scss index 49fd41e3..a6ce521c 100644 --- a/gui/app/styles/core/widget/widget.scss +++ b/gui/app/styles/core/widget/widget.scss @@ -1,20 +1,4 @@ // Copyright (c) 2015 Documize Inc. -// Material Design icons from https://design.google.com/icons/ - -.material-icons { - font-family: "Material Icons"; - font-weight: normal; - font-style: normal; - font-size: 1.2rem; - display: inline-block; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - -moz-osx-font-smoothing: grayscale; - font-feature-settings: "liga"; -} .transition-shadow { transition: box-shadow 0.25s; @@ -83,11 +67,9 @@ } @import "widget-avatar"; -@import "widget-button"; @import "widget-checkbox"; @import "widget-list-picker"; @import "widget-notification"; -@import "widget-radio"; @import "widget-symbol"; @import "widget-table"; @import "widget-tabnav"; diff --git a/gui/app/templates/components/customize/auth-settings.hbs b/gui/app/templates/components/customize/auth-settings.hbs index da0d30e7..e6c64eec 100644 --- a/gui/app/templates/components/customize/auth-settings.hbs +++ b/gui/app/templates/components/customize/auth-settings.hbs @@ -6,21 +6,21 @@
Documize
Built-in email/password
{{#if isDocumizeProvider}} - check + {{/if}}
  • Keycloak
    Via authentication server
    {{#if isKeycloakProvider}} - check + {{/if}}
  • LDAP
    Connect to LDAP/ Active Directory
    {{#if isLDAPProvider}} - check + {{/if}}
    • diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs index f897493c..713d90f1 100644 --- a/gui/app/templates/components/customize/user-list.hbs +++ b/gui/app/templates/components/customize/user-list.hbs @@ -224,6 +224,7 @@
    {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Close dismiss=true}} + {{ui/ui-button-gap}} {{ui/ui-button color=constants.Color.Red light=true label=constants.Label.Delete onClick=(action "onBulkDelete")}}
    diff --git a/gui/app/templates/components/document/add-section.hbs b/gui/app/templates/components/document/add-section.hbs index b4e0da92..47a30122 100644 --- a/gui/app/templates/components/document/add-section.hbs +++ b/gui/app/templates/components/document/add-section.hbs @@ -58,7 +58,7 @@
    - + {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}}
    diff --git a/gui/app/templates/components/document/content-linker.hbs b/gui/app/templates/components/document/content-linker.hbs index c2d9849d..a0c9b06e 100644 --- a/gui/app/templates/components/document/content-linker.hbs +++ b/gui/app/templates/components/document/content-linker.hbs @@ -37,7 +37,7 @@ {{item.title}} {{#if item.selected}} - check + {{/if}} {{/each}} @@ -66,7 +66,7 @@ {{item.title}}
    {{item.context}} {{#if item.selected}} - check + {{/if}} {{/each}} @@ -76,7 +76,7 @@ {{item.title}}
    {{item.context}} {{#if item.selected}} - check + {{/if}} {{/each}} @@ -87,7 +87,7 @@ {{item.title}} {{#if item.selected}} - check + {{/if}} {{/each}} @@ -112,8 +112,9 @@
    - - + {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Close dismiss=true}} + {{ui/ui-button-gap}} + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Insert onClick=(action "onInsertLink")}}
    diff --git a/gui/app/templates/components/document/page-heading.hbs b/gui/app/templates/components/document/page-heading.hbs index a3abced1..1cd6db46 100644 --- a/gui/app/templates/components/document/page-heading.hbs +++ b/gui/app/templates/components/document/page-heading.hbs @@ -67,9 +67,10 @@
    - {{focus-input type="text" value=docSearchFilter class="form-control mb-4" placeholder="a OR b, x AND y, 'phrase mat*'"}} + {{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.

    {{/if}} @@ -80,7 +81,7 @@
    {{result.space}}
    {{result.excerpt}}
    {{#if result.selected}} - check + {{/if}} {{/each}} @@ -88,8 +89,9 @@
    - - + {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}} + {{ui/ui-button-gap}} + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Copy onClick=(action "onCopyPage")}}
    @@ -104,9 +106,9 @@
    - {{focus-input type="text" value=docSearchFilter class="form-control mb-4" placeholder="a OR b, x AND y, 'phrase mat*'"}} + {{focus-input type="text" value=docSearchFilter class="form-control" placeholder="a OR b, x AND y, 'phrase mat*'"}}
    -
    +
    {{#if emptySearch}}

    No matching documents found.

    {{/if}} @@ -117,7 +119,7 @@
    {{result.space}}
    {{result.excerpt}}
    {{#if result.selected}} - check + {{/if}} {{/each}} @@ -125,8 +127,9 @@
    - - + {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}} + {{ui/ui-button-gap}} + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Copy onClick=(action "onMovePage")}}
    @@ -150,8 +153,9 @@
    - - + {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}} + {{ui/ui-button-gap}} + {{ui/ui-button color=constants.Color.Delete light=true label=constants.Label.Delete onClick=(action "onDeletePage")}}
    @@ -176,8 +180,9 @@
    - - + {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}} + {{ui/ui-button-gap}} + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Publish onClick=(action "onSavePageAsBlock")}}
    diff --git a/gui/app/templates/components/folder/documents-list.hbs b/gui/app/templates/components/folder/documents-list.hbs index d49f0411..3c14ffdd 100644 --- a/gui/app/templates/components/folder/documents-list.hbs +++ b/gui/app/templates/components/folder/documents-list.hbs @@ -56,9 +56,9 @@ {{/ui/ui-dialog}} {{#if showAdd}} - {{ui/empty-state icon="direct" message="Add documents via + DOCUMENT"}} + {{ui/empty-state icon=constants.Icon.ArrowUp message="Add documents via + DOCUMENT"}} {{/if}} {{#if showLockout}} - {{ui/empty-state icon="visibility" message="Space permissions are preventing you from viewing and creating documents"}} + {{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 diff --git a/gui/app/templates/components/folder/settings-category.hbs b/gui/app/templates/components/folder/settings-category.hbs index 4eb91733..cf20dd99 100644 --- a/gui/app/templates/components/folder/settings-category.hbs +++ b/gui/app/templates/components/folder/settings-category.hbs @@ -87,29 +87,12 @@
      {{#each categoryPermissions as |permission|}}
    • -
      - {{#if (eq permission.who "role")}} - - people - - {{else}} - {{#if (eq permission.whoId constants.EveryoneUserId)}} - - language - - {{else}} - - person - - {{/if}} - {{/if}} -  {{permission.name}} - {{#if (eq permission.whoId session.user.id)}} - (you) - {{/if}} -
      + {{permission.name}} + {{#if (eq permission.whoId session.user.id)}} + (you) + {{/if}} {{#if permission.selected}} - check + {{/if}}
      • {{/each}} diff --git a/gui/app/templates/components/folder/settings-permissions.hbs b/gui/app/templates/components/folder/settings-permissions.hbs index b1f73f7c..d77ed64c 100644 --- a/gui/app/templates/components/folder/settings-permissions.hbs +++ b/gui/app/templates/components/folder/settings-permissions.hbs @@ -97,7 +97,7 @@ {{#each spacePermissions as |permission|}} - more_vert + {{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
      Grant all @@ -105,25 +105,17 @@
      {{/attach-popover}} {{#if (eq permission.who "role")}} - - people - -  {{permission.name}} - ({{permission.members}}) - + +  {{permission.name}} ({{permission.members}}) {{else}} {{#if (eq permission.whoId constants.EveryoneUserId)}} - - language - +  {{permission.name}} {{else}} - - person - -  {{permission.name}} + +  {{permission.name}} {{#if (eq permission.whoId session.user.id)}} - (you) +  (you) {{/if}} {{/if}} diff --git a/gui/app/templates/components/folder/settings-templates.hbs b/gui/app/templates/components/folder/settings-templates.hbs deleted file mode 100644 index 6a6ed8b4..00000000 --- a/gui/app/templates/components/folder/settings-templates.hbs +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      Templates provide predefined content for new documents
      - {{#each templates as |item|}} -
      -

      {{item.title}}

      -

      {{item.description}}

      - -
      - {{/each}} -
      \ No newline at end of file diff --git a/gui/app/templates/components/folder/space-toolbar.hbs b/gui/app/templates/components/folder/space-toolbar.hbs index 8843ee50..786e25ef 100644 --- a/gui/app/templates/components/folder/space-toolbar.hbs +++ b/gui/app/templates/components/folder/space-toolbar.hbs @@ -66,10 +66,10 @@ {{#each templates as |item|}}
    • - {{item.title}}
      {{item.description}} + {{item.name}}
      {{item.excerpt}}
      {{#if item.selected}} - check + {{/if}}
      • {{/each}} @@ -79,6 +79,7 @@
      {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}} + {{ui/ui-button-gap}} {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Add onClick=(action "onAddTemplateDoc")}}
      @@ -90,7 +91,7 @@
      Import Files
      -
      {{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}} + {{ui/ui-button-gap}} {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Export onClick=(action "onExport")}}
      diff --git a/gui/app/templates/components/layout/bottom-bar.hbs b/gui/app/templates/components/layout/bottom-bar.hbs deleted file mode 100644 index 2312e9e8..00000000 --- a/gui/app/templates/components/layout/bottom-bar.hbs +++ /dev/null @@ -1,23 +0,0 @@ -
      -
      -
      - Documize {{appMeta.version}} -
      - {{yield}} -
      -
      -
      - {{#if showWait}} -
      - -
      - {{/if}} - {{#if showDone}} -
      ✓
      - {{/if}} - {{#if showMessage}} -
      {{message}}
      - {{/if}} -
      -
      -
      diff --git a/gui/app/templates/components/layout/middle-zone-content.hbs b/gui/app/templates/components/layout/middle-zone-content.hbs deleted file mode 100644 index 889d9eea..00000000 --- a/gui/app/templates/components/layout/middle-zone-content.hbs +++ /dev/null @@ -1 +0,0 @@ -{{yield}} diff --git a/gui/app/templates/components/layout/middle-zone-sidebar.hbs b/gui/app/templates/components/layout/middle-zone-sidebar.hbs deleted file mode 100644 index fb5c4b15..00000000 --- a/gui/app/templates/components/layout/middle-zone-sidebar.hbs +++ /dev/null @@ -1 +0,0 @@ -{{yield}} \ No newline at end of file diff --git a/gui/app/templates/components/layout/middle-zone.hbs b/gui/app/templates/components/layout/middle-zone.hbs deleted file mode 100644 index fb5c4b15..00000000 --- a/gui/app/templates/components/layout/middle-zone.hbs +++ /dev/null @@ -1 +0,0 @@ -{{yield}} \ No newline at end of file diff --git a/gui/app/templates/components/layout/top-bar.hbs b/gui/app/templates/components/layout/top-bar.hbs deleted file mode 100644 index 5e47bdb5..00000000 --- a/gui/app/templates/components/layout/top-bar.hbs +++ /dev/null @@ -1,213 +0,0 @@ -
      -
      - -
      -
      -
        -
      • - -
        • - {{#if (eq appMeta.edition constants.Product.CommunityEdition)}} -
      • - {{#link-to "folders" class=(if (eq selectItem "spaces") "link selected" "link")}}SPACES{{/link-to}} -
        • - {{/if}} - {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} - {{#if session.viewDashboard}} -
      • - {{#link-to "dashboard" class=(if (eq selectItem "dashboard") "link selected" "link")}}ACTIONS{{/link-to}} -
        • - {{/if}} - {{#if session.viewAnalytics}} -
      • - {{#link-to "analytics" class=(if (eq selectItem "analytics") "link selected" "link")}}ANALYTICS{{/link-to}} -
        • - {{/if}} -
      • - {{#link-to "folders" class=(if (eq selectItem "spaces") "link selected" "link")}}SPACES{{/link-to}} -
        • - {{/if}} - {{yield}} -
      -
      - -
      - -
      - {{#if (eq appMeta.edition constants.Product.CommunityEdition)}} - {{#link-to "folders" class="dropdown-item"}}Spaces{{/link-to}} - {{/if}} - {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} - {{#link-to "folders" class="dropdown-item"}}Spaces{{/link-to}} - {{#if session.viewDashboard}} - {{#link-to "dashboard" class="dropdown-item"}}Actions{{/link-to}} - {{/if}} - {{#if session.viewAnalytics}} - {{#link-to "analytics" class="dropdown-item"}}Analytics{{/link-to}} - {{/if}} - {{/if}} -
      -
      -
      - -
      -
      -
      - {{#unless appMeta.valid}} -
      -
      - report -
      -
      -
      - {{/unless}} - -
      - {{#link-to "search" class="button-icon-white" }} - search - {{/link-to}} -
      - {{#if session.authenticated}} - {{#if hasPins}} -
      -
      - -
      - {{#if hasSpacePins}} -
      Spaces
      - {{#each spacePins as |pin|}} - {{pin.pin}} - {{/each}} - {{/if}} - {{#if hasDocumentPins}} -
      Documents
      - {{#each documentPins as |pin|}} - {{pin.pin}} - {{/each}} - {{/if}} -
      -
      - {{/if}} - -
      -
      - -
      - -
      -
      - -{{#if session.authenticated}} - - - -{{/if}} diff --git a/gui/app/templates/components/search/search-results.hbs b/gui/app/templates/components/search/search-results.hbs index d62d6298..75a90608 100644 --- a/gui/app/templates/components/search/search-results.hbs +++ b/gui/app/templates/components/search/search-results.hbs @@ -13,9 +13,6 @@
      {{result.space}}
      {{result.excerpt}}
      {{folder/document-tags documentTags=result.tags}} - {{#if result.template}} - - {{/if}} {{/link-to}} {{/each}} diff --git a/gui/app/templates/components/section/github/type-editor.hbs b/gui/app/templates/components/section/github/type-editor.hbs index 44ed88a4..27578bab 100644 --- a/gui/app/templates/components/section/github/type-editor.hbs +++ b/gui/app/templates/components/section/github/type-editor.hbs @@ -34,25 +34,12 @@
      {{ui/ui-list-picker items=config.lists nameField="repo" singleSelect=true}} - - {{!--
      - {{#each config.lists as |list|}} -
      - {{#if list.included}} - check_box - {{else}} - check_box_outline_blank - {{/if}} - {{list.repo}} {{#if list.private}}(private){{/if}} -
      - {{/each}} -
      --}}
      {{else}}
      -
      Authenticate
      +
      Authenticate
      {{/if}}
      diff --git a/gui/app/templates/components/section/papertrail/type-editor.hbs b/gui/app/templates/components/section/papertrail/type-editor.hbs index dcca381b..4046f9c8 100644 --- a/gui/app/templates/components/section/papertrail/type-editor.hbs +++ b/gui/app/templates/components/section/papertrail/type-editor.hbs @@ -14,13 +14,7 @@ {{focus-input id="papertrail-apitoken" type="password" value=config.APIToken class="form-control"}} API Token (from your profile)
      -
      - {{#if authenticated}} - Re-Authenticate - {{else}} - Authenticate - {{/if}} -
      + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Authenticate onClick=(action "auth")}}
      diff --git a/gui/app/templates/components/section/trello/type-editor.hbs b/gui/app/templates/components/section/trello/type-editor.hbs index 2bb5fa75..765f4be4 100644 --- a/gui/app/templates/components/section/trello/type-editor.hbs +++ b/gui/app/templates/components/section/trello/type-editor.hbs @@ -22,9 +22,9 @@ {{#each config.lists as |list|}}
      {{#if list.included}} - check_box + {{else}} - check_box_outline_blank + {{/if}} {{list.name}}
      @@ -39,8 +39,10 @@ {{/if}} {{else}} {{#if session.isGlobalAdmin}} - {{#link-to "customize.integrations" class="btn btn-outline-secondary bold-700"}} - Configure Trello Connector + {{#link-to "customize.integrations"}} + {{ui/ui-button color=constants.Color.Yellow light=true + label="Configure Trello Connector"}} + {{/link-to}} {{else}}

      Your Documize administrator needs to configure Trello before usage.

      diff --git a/gui/app/templates/components/setup/documize-setup.hbs b/gui/app/templates/components/setup/documize-setup.hbs index c3b60dac..ada888f9 100644 --- a/gui/app/templates/components/setup/documize-setup.hbs +++ b/gui/app/templates/components/setup/documize-setup.hbs @@ -1,7 +1,8 @@

      Let's setup Documize

      Database: {{model.dbname}}

      -
      + {{ui/ui-spacer size=300}} +
      {{focus-input id="siteTitle" type="text" value=model.title class=(if hasEmptyTitleError "form-control is-invalid" "form-control")}} @@ -27,6 +28,7 @@ {{input id="adminPassword" type="password" value=model.password class=(if hasEmptyPasswordError "form-control is-invalid" "form-control")}} Pick something strong and unique that you don't use anywhere else
      - + {{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/ui/empty-state.hbs b/gui/app/templates/components/ui/empty-state.hbs index d0c39ca6..46853236 100644 --- a/gui/app/templates/components/ui/empty-state.hbs +++ b/gui/app/templates/components/ui/empty-state.hbs @@ -1,4 +1,4 @@
      - {{glypth}} +

      {{message}}

      diff --git a/gui/app/templates/components/ui/ui-checkbox.hbs b/gui/app/templates/components/ui/ui-checkbox.hbs index fc200113..664d77ca 100644 --- a/gui/app/templates/components/ui/ui-checkbox.hbs +++ b/gui/app/templates/components/ui/ui-checkbox.hbs @@ -1,8 +1,8 @@
      {{#if selected}} - check_box + {{else}} - check_box_outline_blank + {{/if}}
      {{yield}}
      diff --git a/gui/app/templates/components/ui/ui-dialog.hbs b/gui/app/templates/components/ui/ui-dialog.hbs index 11d8e786..0e39bbe2 100644 --- a/gui/app/templates/components/ui/ui-dialog.hbs +++ b/gui/app/templates/components/ui/ui-dialog.hbs @@ -9,6 +9,7 @@
      {{ui/ui-button color=constants.Color.Gray light=true label=cancelCaption dismiss=true onClick=(action "onCancel")}} + {{ui/ui-button-gap}} {{ui/ui-button color=buttonColor light=true label=confirmCaption onClick=(action "onAction")}}
      diff --git a/gui/app/templates/components/ui/ui-list-picker.hbs b/gui/app/templates/components/ui/ui-list-picker.hbs index a029b0ab..5071f31a 100644 --- a/gui/app/templates/components/ui/ui-list-picker.hbs +++ b/gui/app/templates/components/ui/ui-list-picker.hbs @@ -4,7 +4,7 @@
    • {{get item nameField}}
      {{#if item.selected}} - check + {{/if}}
      • {{/each}} diff --git a/gui/app/templates/components/ui/ui-radio.hbs b/gui/app/templates/components/ui/ui-radio.hbs deleted file mode 100644 index f0889f24..00000000 --- a/gui/app/templates/components/ui/ui-radio.hbs +++ /dev/null @@ -1,8 +0,0 @@ -
      - {{#if selected}} - radio_button_checked - {{else}} - radio_button_unchecked - {{/if}} -
      {{yield}}
      -
      diff --git a/gui/app/templates/components/user/user-profile.hbs b/gui/app/templates/components/user/user-profile.hbs index 11b4184f..98ba80cc 100644 --- a/gui/app/templates/components/user/user-profile.hbs +++ b/gui/app/templates/components/user/user-profile.hbs @@ -21,5 +21,5 @@ {{input id="confirmPassword" type="password" value=password.confirmation class=(if hasConfirmPasswordError "form-control is-invalid" "form-control")}} {{/if}} -
      Save
      + {{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Save onClick=(action "save")}} diff --git a/gui/public/assets/font/icons/MaterialIcons-Regular.eot b/gui/public/assets/font/icons/MaterialIcons-Regular.eot deleted file mode 100755 index 70508eba..00000000 Binary files a/gui/public/assets/font/icons/MaterialIcons-Regular.eot and /dev/null differ diff --git a/gui/public/assets/font/icons/MaterialIcons-Regular.ttf b/gui/public/assets/font/icons/MaterialIcons-Regular.ttf deleted file mode 100755 index 7015564a..00000000 Binary files a/gui/public/assets/font/icons/MaterialIcons-Regular.ttf and /dev/null differ diff --git a/gui/public/assets/font/icons/MaterialIcons-Regular.woff b/gui/public/assets/font/icons/MaterialIcons-Regular.woff deleted file mode 100755 index b648a3ee..00000000 Binary files a/gui/public/assets/font/icons/MaterialIcons-Regular.woff and /dev/null differ diff --git a/gui/public/assets/font/icons/MaterialIcons-Regular.woff2 b/gui/public/assets/font/icons/MaterialIcons-Regular.woff2 deleted file mode 100755 index 9fa21125..00000000 Binary files a/gui/public/assets/font/icons/MaterialIcons-Regular.woff2 and /dev/null differ