From 572f3027d6a0bc07e057b7884c2c41db0873f4df Mon Sep 17 00:00:00 2001 From: Blackbaud-TimPepper Date: Thu, 11 Apr 2019 15:28:49 -0400 Subject: [PATCH 1/2] WIP --- src/app/home.component.ts | 5 +- .../action-buttons.component.html | 50 +++++++++++++------ .../action-buttons/action-buttons.module.ts | 4 +- src/app/public/src/modules/nav/nav-link.ts | 1 + 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/app/home.component.ts b/src/app/home.component.ts index d79d3150..d3147068 100644 --- a/src/app/home.component.ts +++ b/src/app/home.component.ts @@ -6,12 +6,13 @@ import { StacheNavLink } from './public/src/modules/nav'; templateUrl: './home.component.html' }) export class HomeComponent { - public actionButtonRoutes = [ + public actionButtonRoutes: StacheNavLink[] = [ { name: 'Action Button 1', path: '/demos', icon: 'book', - summary: 'Short summary here.' + summary: 'Short summary here.', + isInternal: true }, { name: 'Action Button 2', diff --git a/src/app/public/src/modules/action-buttons/action-buttons.component.html b/src/app/public/src/modules/action-buttons/action-buttons.component.html index b59cce6a..7880b6b2 100644 --- a/src/app/public/src/modules/action-buttons/action-buttons.component.html +++ b/src/app/public/src/modules/action-buttons/action-buttons.component.html @@ -8,20 +8,42 @@ diff --git a/src/app/public/src/modules/action-buttons/action-buttons.module.ts b/src/app/public/src/modules/action-buttons/action-buttons.module.ts index 9054ca64..c83972b3 100644 --- a/src/app/public/src/modules/action-buttons/action-buttons.module.ts +++ b/src/app/public/src/modules/action-buttons/action-buttons.module.ts @@ -7,6 +7,7 @@ import { SkySearchModule } from '@blackbaud/skyux/dist/modules/search'; import { StacheGridModule } from '../grid'; import { StacheActionButtonsComponent } from './action-buttons.component'; import { StacheLinkModule } from '../link'; +import { StacheInternalModule } from '../internal'; @NgModule({ declarations: [ @@ -17,7 +18,8 @@ import { StacheLinkModule } from '../link'; SkyActionButtonModule, SkySearchModule, StacheLinkModule, - StacheGridModule + StacheGridModule, + StacheInternalModule ], exports: [ StacheActionButtonsComponent diff --git a/src/app/public/src/modules/nav/nav-link.ts b/src/app/public/src/modules/nav/nav-link.ts index 031584b7..88fdbc09 100644 --- a/src/app/public/src/modules/nav/nav-link.ts +++ b/src/app/public/src/modules/nav/nav-link.ts @@ -10,4 +10,5 @@ export interface StacheNavLink { isActive?: boolean; isCurrent?: boolean; showInNav?: boolean; + isInternal?: boolean; } From fdae310b83246c898093be52192393f661743809 Mon Sep 17 00:00:00 2001 From: Blackbaud-TimPepper Date: Fri, 12 Apr 2019 08:53:31 -0400 Subject: [PATCH 2/2] remove action button if not internal user, fix issue with action buttons not maintaining width --- src/app/home.component.ts | 3 +- .../action-buttons.component.html | 62 ++++++++++++------- 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/src/app/home.component.ts b/src/app/home.component.ts index d3147068..2f1c9027 100644 --- a/src/app/home.component.ts +++ b/src/app/home.component.ts @@ -24,7 +24,8 @@ export class HomeComponent { name: 'Action Button 3', path: 'http://google.com', icon: 'certificate', - summary: 'Short summary here.' + summary: 'Short summary here.', + isInternal: true }, { name: 'Action Button 4', diff --git a/src/app/public/src/modules/action-buttons/action-buttons.component.html b/src/app/public/src/modules/action-buttons/action-buttons.component.html index 7880b6b2..524a05d8 100644 --- a/src/app/public/src/modules/action-buttons/action-buttons.component.html +++ b/src/app/public/src/modules/action-buttons/action-buttons.component.html @@ -1,9 +1,11 @@