From fd6b4c051b71c0a4e26ca65a1a3eb399806dd1ff Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Tue, 28 Nov 2017 11:32:14 +0000 Subject: [PATCH] restructure CSS files --- gui/app/components/folder/category-admin.js | 1 - gui/app/pods/customize/folders/controller.js | 41 ++------- gui/app/pods/customize/folders/template.hbs | 86 +++++++++---------- gui/app/pods/customize/template.hbs | 51 +++++------ gui/app/pods/profile/template.hbs | 8 ++ gui/app/styles/app.scss | 15 ++-- gui/app/styles/base.scss | 11 --- .../styles/view/{page-auth.scss => auth.scss} | 0 .../{page-customize.scss => customize.scss} | 28 +++--- .../{page-exceptions.scss => exceptions.scss} | 0 .../view/{page-onboard.scss => onboard.scss} | 0 .../view/{page-search.scss => search.scss} | 0 gui/app/styles/view/views.scss | 4 + .../components/customize/general-settings.hbs | 2 +- 14 files changed, 110 insertions(+), 137 deletions(-) rename gui/app/styles/view/{page-auth.scss => auth.scss} (100%) rename gui/app/styles/view/{page-customize.scss => customize.scss} (79%) rename gui/app/styles/view/{page-exceptions.scss => exceptions.scss} (100%) rename gui/app/styles/view/{page-onboard.scss => onboard.scss} (100%) rename gui/app/styles/view/{page-search.scss => search.scss} (100%) diff --git a/gui/app/components/folder/category-admin.js b/gui/app/components/folder/category-admin.js index 961e78c9..21a5f2e6 100644 --- a/gui/app/components/folder/category-admin.js +++ b/gui/app/components/folder/category-admin.js @@ -31,7 +31,6 @@ export default Component.extend(NotifierMixin, TooltipMixin, DropdownMixin, { this.load(); }, - willDestroyElement() { this._super(...arguments); this.removeTooltips(); diff --git a/gui/app/pods/customize/folders/controller.js b/gui/app/pods/customize/folders/controller.js index da8558fa..aa69c532 100644 --- a/gui/app/pods/customize/folders/controller.js +++ b/gui/app/pods/customize/folders/controller.js @@ -10,12 +10,10 @@ // https://documize.com import { inject as service } from '@ember/service'; - import Controller from '@ember/controller'; -import NotifierMixin from '../../../mixins/notifier'; -import DropdownMixin from '../../../mixins/dropdown'; +import TooltipMixin from '../../../mixins/tooltip'; -export default Controller.extend(NotifierMixin, DropdownMixin, { +export default Controller.extend(TooltipMixin, { folderService: service('folder'), folders: [], dropdown: null, @@ -33,34 +31,9 @@ export default Controller.extend(NotifierMixin, DropdownMixin, { } }.property('folders'), - - willDestroyElement() { - this._super(...arguments); - this.destroyDropdown(); - }, - actions: { - onShow(spaceId) { - this.set('deleteSpace.id', spaceId); - this.set('deleteSpace.name', ''); - $(".delete-space-dialog").css("display", "block"); - $('#delete-space-name').removeClass('error'); - - this.closeDropdown(); - - let dropOptions = Object.assign(this.get('dropDefaults'), { - target: $("#delete-space-button-" + spaceId)[0], - content: $(".delete-space-dialog")[0], - classes: 'drop-theme-basic', - position: "bottom right", - remove: false}); - - let drop = new Drop(dropOptions); - this.set('dropdown', drop); - }, - - onCancel() { - this.closeDropdown(); + onShow(id) { + this.set('deleteSpace.id', id); }, onDelete() { @@ -71,16 +44,16 @@ export default Controller.extend(NotifierMixin, DropdownMixin, { let spaceName = space.get('name'); if (spaceNameTyped !== spaceName || spaceNameTyped === '' || spaceName === '') { - $('#delete-space-name').addClass('error').focus(); + $('#delete-space-name').addClass('is-invalid').focus(); return; } - this.closeDropdown(); + $('#space-delete-modal').modal('hide'); + $('#space-delete-modal').modal('dispose'); this.get('folderService').delete(spaceId).then(() => { /* jshint ignore:line */ this.set('deleteSpace.id', ''); this.set('deleteSpace.name', ''); - this.showNotification("Deleted"); this.get('folderService').adminList().then((folders) => { let nonPrivateFolders = folders.rejectBy('folderType', 2); diff --git a/gui/app/pods/customize/folders/template.hbs b/gui/app/pods/customize/folders/template.hbs index dfa26f76..8e53a2ac 100644 --- a/gui/app/pods/customize/folders/template.hbs +++ b/gui/app/pods/customize/folders/template.hbs @@ -1,51 +1,47 @@ -
-
- - {{#if folders}} -
-
{{folders.length}} shared {{label}}
-
View and change shared space ownership
-
-
- {{#each folders as |folder|}} -
+{{#if folders}} +
+
+

{{folders.length}} shared {{label}}

+
+
+
+
+ {{#each folders as |folder|}} +
+
{{#link-to 'folder' folder.id folder.slug class="alt"}}{{folder.name}}{{/link-to}}
-
-
- delete +
+
+ delete
-
- {{/each}} -
- -
-
-

Are you sure you want to delete this space and all associated documents?

-
-
Please type the space name to confirm
- {{input type='text' id="delete-space-name" value=deleteSpace.name}} -
-
-
- cancel -
-
- delete -
-
-
-
- - {{else}} - -
-
{{folders.length}} shared {{label}}
-
There are no spaces to maintain
-
- - {{/if}} + {{/each}} +
-
+ + +{{else}} +

There are no spaces to maintain

+{{/if}} diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs index 396789b8..227266c8 100644 --- a/gui/app/pods/customize/template.hbs +++ b/gui/app/pods/customize/template.hbs @@ -1,25 +1,28 @@ -{{#layout/zone-container}} - {{#layout/zone-sidebar}} -
- {{layout/sidebar-intro title='Settings' message='Documize application settings'}} +{{layout/nav-bar}} + +
+ {{#toolbar/t-toolbar}} + {{#toolbar/t-links}} + {{#link-to "folders" class="link" tagName="li"}}SPACES{{/link-to}} + {{/toolbar/t-links}} + {{#toolbar/t-actions}} + {{/toolbar/t-actions}} + {{/toolbar/t-toolbar}} + +
+
+
    + {{#link-to 'customize.general' activeClass='selected' class="tab" tagName="li"}}General{{/link-to}} + {{#link-to 'customize.folders' activeClass='selected' class="tab" tagName="li"}}Spaces{{/link-to}} + {{#link-to 'customize.users' activeClass='selected' class="tab" tagName="li"}}Users{{/link-to}} + {{#if session.isGlobalAdmin}} + {{#link-to 'customize.global' activeClass='selected' class="tab" tagName="li"}}Global{{/link-to}} + {{#link-to 'customize.auth' activeClass='selected' class="tab" tagName="li"}}Authentication{{/link-to}} + {{/if}} +
-
-
-
    - {{#link-to 'customize.general' activeClass='selected' class="option" tagName="li"}}General{{/link-to}} - {{#link-to 'customize.folders' activeClass='selected' class="option" tagName="li"}}Spaces{{/link-to}} - {{#link-to 'customize.users' activeClass='selected' class="option" tagName="li"}}Users{{/link-to}} - {{#if session.isGlobalAdmin}} - {{#link-to 'customize.global' activeClass='selected' class="option" tagName="li"}}Global{{/link-to}} - {{#link-to 'customize.auth' activeClass='selected' class="option" tagName="li"}}Authentication{{/link-to}} - {{/if}} -
-
-
- {{/layout/zone-sidebar}} - {{#layout/zone-content}} -
- {{outlet}} -
- {{/layout/zone-content}} -{{/layout/zone-container}} +
+
+ {{outlet}} +
+
diff --git a/gui/app/pods/profile/template.hbs b/gui/app/pods/profile/template.hbs index c7de1b3a..48709a01 100644 --- a/gui/app/pods/profile/template.hbs +++ b/gui/app/pods/profile/template.hbs @@ -1,5 +1,13 @@ {{layout/nav-bar}}
+ {{#toolbar/t-toolbar}} + {{#toolbar/t-links}} + {{#link-to "folders" class="link" tagName="li"}}SPACES{{/link-to}} + {{/toolbar/t-links}} + {{#toolbar/t-actions}} + {{/toolbar/t-actions}} + {{/toolbar/t-toolbar}} + {{user-profile model=model save=(action 'save')}}
diff --git a/gui/app/styles/app.scss b/gui/app/styles/app.scss index b4570509..e2ec9e20 100644 --- a/gui/app/styles/app.scss +++ b/gui/app/styles/app.scss @@ -14,16 +14,13 @@ @import "base.scss"; @import "bootstrap.scss"; -@import "widget/widget.scss"; -@import "view/layout.scss"; // junk? -@import "view/page-search.scss"; -@import "view/page-customize.scss"; -@import "view/page-auth.scss"; -@import "view/page-onboard.scss"; -@import "view/page-exceptions.scss"; -@import "view/document/all.scss"; -@import "view/common.scss"; +@import "view/layout.scss"; // junk? +@import "view/document/all.scss"; + + +@import "view/common.scss"; +@import "widget/widget.scss"; @import "view/navigation.scss"; @import "view/toolbar.scss"; @import "view/views.scss"; diff --git a/gui/app/styles/base.scss b/gui/app/styles/base.scss index d247f8e7..b87375b8 100644 --- a/gui/app/styles/base.scss +++ b/gui/app/styles/base.scss @@ -55,17 +55,6 @@ a.broken-link { text-decoration: line-through; } -a.alt { - color: $color-blue; - text-decoration: none; - cursor: pointer; - - a:focus, - a:hover { - text-decoration: underline; - } -} - .no-outline { outline: none !important; border: none !important; diff --git a/gui/app/styles/view/page-auth.scss b/gui/app/styles/view/auth.scss similarity index 100% rename from gui/app/styles/view/page-auth.scss rename to gui/app/styles/view/auth.scss diff --git a/gui/app/styles/view/page-customize.scss b/gui/app/styles/view/customize.scss similarity index 79% rename from gui/app/styles/view/page-customize.scss rename to gui/app/styles/view/customize.scss index 0a48c0f2..3d16722b 100644 --- a/gui/app/styles/view/page-customize.scss +++ b/gui/app/styles/view/customize.scss @@ -1,15 +1,11 @@ -.page-customize { - > .auth-admin, > .general-admin, > .license-admin, > .smtp-admin, > .space-admin { - @include content-container(); - } - - > .add-user { - @include content-container(); - margin-bottom: 50px; +.view-customize { + .admin-heading { + font-size: 1.5rem; + font-weight: bold; + color: $color-black; } > .user-admin { - @include content-container(); margin: 30px 0; > .heading { @@ -94,13 +90,21 @@ } } - .edit-user-dialog, .delete-user-dialog, .delete-space-dialog { + .edit-user-dialog, .delete-user-dialog { display: none; } - .manage-space-list { + > .space-list { + padding: 0; + margin: 0; + > .space { - margin: 20px 0; + margin: 15px 0; + padding: 15px; + @include card(); + @include ease-in(); + font-size: 1.2rem; + color: $color-primary; } } } diff --git a/gui/app/styles/view/page-exceptions.scss b/gui/app/styles/view/exceptions.scss similarity index 100% rename from gui/app/styles/view/page-exceptions.scss rename to gui/app/styles/view/exceptions.scss diff --git a/gui/app/styles/view/page-onboard.scss b/gui/app/styles/view/onboard.scss similarity index 100% rename from gui/app/styles/view/page-onboard.scss rename to gui/app/styles/view/onboard.scss diff --git a/gui/app/styles/view/page-search.scss b/gui/app/styles/view/search.scss similarity index 100% rename from gui/app/styles/view/page-search.scss rename to gui/app/styles/view/search.scss diff --git a/gui/app/styles/view/views.scss b/gui/app/styles/view/views.scss index 9547318e..8a259b4c 100644 --- a/gui/app/styles/view/views.scss +++ b/gui/app/styles/view/views.scss @@ -1,3 +1,7 @@ @import "spaces.scss"; @import "space.scss"; @import "new-doc.scss"; +@import "customize.scss"; +@import "onboard.scss"; +@import "customize.scss"; +@import "search.scss"; diff --git a/gui/app/templates/components/customize/general-settings.hbs b/gui/app/templates/components/customize/general-settings.hbs index 5efc774c..fbad84d1 100644 --- a/gui/app/templates/components/customize/general-settings.hbs +++ b/gui/app/templates/components/customize/general-settings.hbs @@ -1,4 +1,4 @@ -
+