From dd3a2cc74242423af54e636f16cb874a0a493e55 Mon Sep 17 00:00:00 2001 From: jm186140 <jm186140@teradata.com> Date: Thu, 7 Sep 2017 18:58:43 -0700 Subject: [PATCH 1/6] chore(): fix snackbar demos - Do not include action on toasts/snackbars for dismiss - Use 'Ok' on alert rather than "Dismiss" - Use single word actions if possible - Duplicated in HTML and TS because of example with code sample --- .../design-patterns/alerts/alerts.component.html | 10 +++++----- .../design-patterns/alerts/alerts.component.ts | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/components/design-patterns/alerts/alerts.component.html b/src/app/components/design-patterns/alerts/alerts.component.html index 86f424f3f7..d0fd356134 100644 --- a/src/app/components/design-patterns/alerts/alerts.component.html +++ b/src/app/components/design-patterns/alerts/alerts.component.html @@ -95,16 +95,16 @@ <h3>Solution</h3> openAlert(): void { this._dialogService.openAlert({ message: 'You don\'t have the required permissions to view this item! Contact an administrator!', - title: '401 Permissions Error!', - closeButton: 'Dismiss', + title: '401 Permissions Error', + closeButton: 'Ok', }); } openConfirm(): void { this._dialogService.openConfirm({ message: 'Are you sure you want to delete this item? It\'s used on other items.', title: 'Confirm', - cancelButton: 'No, Cancel', - acceptButton: 'Yes, Delete', + cancelButton: 'Cancel', + acceptButton: 'Delete', }).afterClosed().subscribe((accept: boolean) => { if (accept) { // DO SOMETHING @@ -168,7 +168,7 @@ <h3>Solution</h3> constructor(private _snackBarService: MdSnackBar) { } showSnackBar(): void { - this._snackBarService.open('Toast here!', 'Dismiss', { duration: 3000 }); + this._snackBarService.open('Connection timed out. Showing limited messages.', 'Retry', { duration: 3000 }); } } ]]> diff --git a/src/app/components/design-patterns/alerts/alerts.component.ts b/src/app/components/design-patterns/alerts/alerts.component.ts index c111a23b6d..18ca4ec031 100644 --- a/src/app/components/design-patterns/alerts/alerts.component.ts +++ b/src/app/components/design-patterns/alerts/alerts.component.ts @@ -32,22 +32,22 @@ export class AlertsComponent { showSnackBar(): void { this._snackBarService - .open('Toast here', 'Dismiss', { duration: 3000 }); + .open('Connection timed out. Showing limited messages.', 'Retry',{ duration: 3000 }); } openAlert(): void { this._dialogService.openAlert({ message: 'You don\'t have the required permissions to view this item! Contact an administrator!', disableClose: true, title: '401 Permissions Error!', - closeButton: 'Dismiss', + closeButton: 'Ok', }); } openConfirm(): void { this._dialogService.openConfirm({ message: 'Are you sure you want to delete this item? It\'s used on other items.', title: 'Confirm', - cancelButton: 'No, Cancel', - acceptButton: 'Yes, Delete', + cancelButton: 'Cancel', + acceptButton: 'Delete', }).afterClosed().subscribe((accept: boolean) => { if (accept) { this.confirmDelete(); @@ -57,7 +57,7 @@ export class AlertsComponent { }); } confirmDelete(): void { - this._snackBarService.open('Item deleted!', 'Ok', { duration: 3000 }); + this._snackBarService.open('Item deleted', '', { duration: 3000 }); } openPrompt(): void { this._dialogService.openPrompt({ From 42d940fb24fb637d72470caee890cbc17490f93a Mon Sep 17 00:00:00 2001 From: jm186140 <jm186140@teradata.com> Date: Thu, 7 Sep 2017 19:13:42 -0700 Subject: [PATCH 2/6] chore(): fix lint - Add whitespace --- src/app/components/design-patterns/alerts/alerts.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/design-patterns/alerts/alerts.component.ts b/src/app/components/design-patterns/alerts/alerts.component.ts index 18ca4ec031..5d7292e0b1 100644 --- a/src/app/components/design-patterns/alerts/alerts.component.ts +++ b/src/app/components/design-patterns/alerts/alerts.component.ts @@ -32,7 +32,7 @@ export class AlertsComponent { showSnackBar(): void { this._snackBarService - .open('Connection timed out. Showing limited messages.', 'Retry',{ duration: 3000 }); + .open('Connection timed out. Showing limited messages.', 'Retry', { duration: 3000 }); } openAlert(): void { this._dialogService.openAlert({ From 7fdf68cd74443eeeb14aa4971264f3c83569a949 Mon Sep 17 00:00:00 2001 From: jm186140 <jm186140@teradata.com> Date: Fri, 8 Sep 2017 05:31:01 -0700 Subject: [PATCH 3/6] chore(): add pad - add some padding on dynamic buttons so they don't get cut off in the demo. --- .../components/dynamic-forms/dynamic-forms.component.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/components/components/dynamic-forms/dynamic-forms.component.html b/src/app/components/components/dynamic-forms/dynamic-forms.component.html index 3c76e44244..89763d59c0 100644 --- a/src/app/components/components/dynamic-forms/dynamic-forms.component.html +++ b/src/app/components/components/dynamic-forms/dynamic-forms.component.html @@ -196,8 +196,10 @@ <h3 class="md-title">Dynamic Boolean Elements</h3> <md-tab-group md-stretch-tabs dynamicHeight> <md-tab> <ng-template mdTabLabel>Demo</ng-template> - <td-dynamic-forms [elements]="booleanElements"> - </td-dynamic-forms> + <div class="pad-sm"> + <td-dynamic-forms [elements]="booleanElements"> + </td-dynamic-forms> + </div> </md-tab> <md-tab> <ng-template mdTabLabel>Code</ng-template> From dc8e3c7bf2bd437cd377b5d75221040b0dbb25aa Mon Sep 17 00:00:00 2001 From: jm186140 <jm186140@teradata.com> Date: Fri, 8 Sep 2017 08:18:41 -0700 Subject: [PATCH 4/6] chore(): fix wrapping in paging examples - reduce margin on all td-paging-bar elements to prevent wrapping in demos --- src/app/components/components/paging/paging.component.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/components/components/paging/paging.component.scss b/src/app/components/components/paging/paging.component.scss index e69de29bb2..92f173bd10 100644 --- a/src/app/components/components/paging/paging.component.scss +++ b/src/app/components/components/paging/paging.component.scss @@ -0,0 +1,4 @@ +/* Set margin on all elements in td-paging-bar to 5px to prevent wrapping in examples */ +.td-paging-bar * { + margin: 0 5px; +} \ No newline at end of file From 8b500cefcc7934dabd122a09925c09dfedd3b16b Mon Sep 17 00:00:00 2001 From: jm186140 <jm186140@teradata.com> Date: Fri, 8 Sep 2017 09:51:45 -0700 Subject: [PATCH 5/6] chore(): Adjust breakpoints in paging demo - Avoid custom CSS - Adjust breakpoinsts and links shown instead --- src/app/components/components/paging/paging.component.html | 2 +- src/app/components/components/paging/paging.component.scss | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/app/components/components/paging/paging.component.html b/src/app/components/components/paging/paging.component.html index a29cf44eca..13afa096df 100644 --- a/src/app/components/components/paging/paging.component.html +++ b/src/app/components/components/paging/paging.component.html @@ -266,7 +266,7 @@ </md-card-content> <md-divider></md-divider> <td-paging-bar #pagingBarResponsive - [pageLinkCount]="(media.registerQuery('md') | async) ? 0 : 5" + [pageLinkCount]="(media.registerQuery('sm') | async) ? 0 : 3" [firstLast]="media.registerQuery('gt-xs') | async" [pageSize]="pageSizeResponsive" [total]="1345" diff --git a/src/app/components/components/paging/paging.component.scss b/src/app/components/components/paging/paging.component.scss index 92f173bd10..e69de29bb2 100644 --- a/src/app/components/components/paging/paging.component.scss +++ b/src/app/components/components/paging/paging.component.scss @@ -1,4 +0,0 @@ -/* Set margin on all elements in td-paging-bar to 5px to prevent wrapping in examples */ -.td-paging-bar * { - margin: 0 5px; -} \ No newline at end of file From 7fb09997f6bf56255253c243dc330049976d1b86 Mon Sep 17 00:00:00 2001 From: jm186140 <jm186140@teradata.com> Date: Fri, 8 Sep 2017 12:09:23 -0700 Subject: [PATCH 6/6] chore(): minor fix to breakpoints - Minor chagne to breakpoints for Paging with Everything demo --- src/app/components/components/paging/paging.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/components/paging/paging.component.html b/src/app/components/components/paging/paging.component.html index 13afa096df..663cc17ec6 100644 --- a/src/app/components/components/paging/paging.component.html +++ b/src/app/components/components/paging/paging.component.html @@ -278,7 +278,7 @@ </md-option> </md-select> <p hide-xs hide-sm hide-md>Go to:</p> - <md-form-field [style.width.px]="30" *ngIf="media.registerQuery('gt-sm') | async"> + <md-form-field [style.width.px]="30" *ngIf="media.registerQuery('gt-xs') | async"> <input #goToResponsive mdInput type="number"