From 60e92b63a9f496a524ea4eab8d1b51b5949da0e4 Mon Sep 17 00:00:00 2001 From: McMatts Date: Mon, 17 Dec 2018 18:32:26 +0000 Subject: [PATCH] Applied new layout to space admin screens Applied the new master layout and UI controls to the following space admin screens: 1. General options. 2. Deletion. 3. Permissions. 4. Content blocks. Co-Authored-By: Harvey Kandola --- gui/app/components/folder/settings-general.js | 12 +- .../components/folder/settings-permissions.js | 22 +++ gui/app/components/ui/ui-toolbar-icon.js | 3 +- gui/app/constants/constants.js | 2 + gui/app/pods/customize/template.hbs | 2 +- gui/app/pods/folder/index/template.hbs | 2 +- gui/app/pods/folder/settings/template.hbs | 139 +++++++++--------- gui/app/styles/core/view/customize.scss | 1 - gui/app/styles/core/view/space.scss | 32 +++- .../components/customize/user-admin.hbs | 80 +++++----- .../components/folder/settings-blocks.hbs | 29 ++-- .../components/folder/settings-delete.hbs | 30 ++-- .../components/folder/settings-general.hbs | 55 +++---- .../folder/settings-permissions.hbs | 118 +++++++++------ .../components/toolbar/for-space.hbs | 8 +- 15 files changed, 309 insertions(+), 226 deletions(-) diff --git a/gui/app/components/folder/settings-general.js b/gui/app/components/folder/settings-general.js index f51f97e7..6af213fd 100644 --- a/gui/app/components/folder/settings-general.js +++ b/gui/app/components/folder/settings-general.js @@ -63,13 +63,13 @@ export default Component.extend(AuthMixin, Notifier, { this.set('spaceType', t); }, - onSetLikes(l) { - this.set('allowLikes', l); + // onSetLikes(l) { + // this.set('allowLikes', l); - schedule('afterRender', () => { - if (l) this.$('#space-likes-prompt').focus(); - }); - }, + // schedule('afterRender', () => { + // if (l) this.$('#space-likes-prompt').focus(); + // }); + // }, onSave() { if (!this.get('isSpaceAdmin')) return; diff --git a/gui/app/components/folder/settings-permissions.js b/gui/app/components/folder/settings-permissions.js index dc565ba5..c3ecb5e1 100644 --- a/gui/app/components/folder/settings-permissions.js +++ b/gui/app/components/folder/settings-permissions.js @@ -30,6 +30,8 @@ export default Component.extend(Notifier, Modals, { searchText: '', inviteEmail: '', inviteMessage: '', + showSpacePermExplain: false, + showDocumentPermExplain: false, isSpaceAdmin: computed('permissions', function() { return this.get('permissions.spaceOwner') || this.get('permissions.spaceManage'); @@ -146,6 +148,26 @@ export default Component.extend(Notifier, Modals, { }, actions: { + toggleSpacePerms() { + this.set('showSpacePermExplain', !this.get('showSpacePermExplain')); + + if (this.showSpacePermExplain) { + this.$(".space-perms").show(); + } else { + this.$(".space-perms").hide(); + } + }, + + toggleDocumentPerms() { + this.set('showDocumentPermExplain', !this.get('showDocumentPermExplain')); + + if (this.showDocumentPermExplain) { + this.$(".document-perms").show(); + } else { + this.$(".document-perms").hide(); + } + }, + onShowInviteModal() { this.modalOpen("#space-invite-user-modal", {"show": true}, '#space-invite-email'); }, diff --git a/gui/app/components/ui/ui-toolbar-icon.js b/gui/app/components/ui/ui-toolbar-icon.js index e1c497c4..fc18ad89 100644 --- a/gui/app/components/ui/ui-toolbar-icon.js +++ b/gui/app/components/ui/ui-toolbar-icon.js @@ -39,10 +39,11 @@ export default Component.extend({ this.onClick(e); return; } + if (is.not.undefined(this.linkTo)) { // TODO: pass in linkModel, linkOptions // https://emberjs.com/api/ember/3.5/classes/RouterService/methods/transitionTo?anchor=transitionTo - this.router.transitionTo(this.linkTo); + this.router.transitionTo(this.get('linkTo')); } } }); diff --git a/gui/app/constants/constants.js b/gui/app/constants/constants.js index 646df70f..774f29ec 100644 --- a/gui/app/constants/constants.js +++ b/gui/app/constants/constants.js @@ -208,6 +208,7 @@ let constants = EmberObject.extend({ ArrowSmallRight: 'dicon-small-right', Attachment: 'dicon-attachment', BarChart: 'dicon-chart-bar-2', + Blocks: 'dicon-menu-6', Bookmark: 'dicon-bookmark', BookmarkAdd: 'dicon-bookmark-add', BookmarkDelete: 'dicon-bookmark-delete', @@ -260,6 +261,7 @@ let constants = EmberObject.extend({ Delete: 'Delete', Export: 'Export', Insert: 'Insert', + Invite: 'Invite', Join: 'Join', Leave: 'Leave', Next: 'Next', diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs index 781b40b5..905da823 100644 --- a/gui/app/pods/customize/template.hbs +++ b/gui/app/pods/customize/template.hbs @@ -2,7 +2,7 @@ {{ui/ui-spacer size=300}}
-
filter
+
administration
{{#link-to "customize.general" activeClass="selected" class="item" tagName="div"}} diff --git a/gui/app/pods/folder/index/template.hbs b/gui/app/pods/folder/index/template.hbs index f08f72d2..fb7403de 100644 --- a/gui/app/pods/folder/index/template.hbs +++ b/gui/app/pods/folder/index/template.hbs @@ -1,4 +1,4 @@ -{{#layout/master-sidebar selectedItem="spaces"}} +{{#layout/master-sidebar}} {{folder/space-sidebar spaces=model.folders space=model.folder diff --git a/gui/app/pods/folder/settings/template.hbs b/gui/app/pods/folder/settings/template.hbs index d5ebc302..8d38c783 100644 --- a/gui/app/pods/folder/settings/template.hbs +++ b/gui/app/pods/folder/settings/template.hbs @@ -1,79 +1,76 @@ -{{#layout/top-bar}} -
  • - {{#link-to "folder.index" model.folder.id model.folder.slug class="link"}} - {{model.folder.name}} - {{/link-to}} -
    • -
  • - {{#link-to "folder.settings" model.folder.id model.folder.slug class="link selected"}} - Settings - {{/link-to}} -
    • -{{/layout/top-bar}} +{{#layout/master-sidebar}} + {{ui/ui-spacer size=300}} -{{#layout/middle-zone}} - {{#layout/middle-zone-content}} - {{#if (eq tab "general")}} - {{folder/settings-general permissions=model.permissions space=model.folder}} - {{/if}} + {{#link-to "folder.index"}} + {{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Back to space"}} + {{/link-to}} - {{#if (eq tab "permissions")}} - {{folder/settings-permissions permissions=model.permissions folders=model.folders folder=model.folder onRefresh=(action "onRefresh")}} - {{/if}} + {{ui/ui-spacer size=400}} - {{#if (eq tab "templates")}} - {{folder/settings-templates permissions=model.permissions space=model.folder templates=model.templates}} - {{/if}} - - {{#if (eq tab "blocks")}} - {{folder/settings-blocks permissions=model.permissions space=model.folder}} - {{/if}} - - {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} - {{#if (eq tab "archived")}} - {{enterprise/space-archived permissions=model.permissions spaces=model.folder space=model.folder}} +
    +
    space management
    +
    +
    + +
    Options
    +
    +
    + +
    Categories
    +
    +
    + +
    Permissions
    +
    +
    + +
    Content Blocks
    +
    + {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} +
    + +
    Archived Content
    +
    +
  • Archived
    • {{/if}} - {{/if}} - - {{#if (eq tab "categories")}} - {{folder/settings-category permissions=model.permissions spaces=model.folder space=model.folder}} - {{/if}} - - {{#if (eq tab "deletion")}} - {{folder/settings-delete permissions=model.permissions spaces=model.folder space=model.folder}} - {{/if}} - {{/layout/middle-zone-content}} - - {{#layout/middle-zone-sidebar}} -