From be3d3d2aa34101f4c583989bde865a61874b3a10 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sat, 15 Jul 2017 22:31:14 +0100 Subject: [PATCH] [ADF-992] improve datatable styles according to UX guidelines (#2088) * improve datatable style * datatable and document list enhancements - support to toggle header in DataTable - Document List automatically hides header for empty content --- .../ng2-alfresco-datatable/README.md | 1 + .../datatable/datatable.component.html | 5 ++-- .../datatable/datatable.component.scss | 27 ++++++++++--------- .../datatable/datatable.component.ts | 3 +++ .../components/document-list.component.html | 1 + 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md index 108258e486..968951e57e 100644 --- a/ng2-components/ng2-alfresco-datatable/README.md +++ b/ng2-components/ng2-alfresco-datatable/README.md @@ -160,6 +160,7 @@ export class DataTableDemo { | contextMenu | boolean | false | Toggles custom context menu for the component | | allowDropFiles | boolean | false | Toggle file drop support for rows (see **ng2-alfresco-core/UploadDirective** for more details) | | loading | boolean | false | Flag that indicate if the datable is in loading state and need to show the loading template. Read the documentation above to know how to configure a loading template | +| showHeader | boolean | true | Toggles header visibility | ### DataColumn Properties diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html index 33977c76a1..9ba3b98bdc 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html @@ -1,7 +1,8 @@ - + + - + td { - border-top: 1px dashed rgb(68,138,255); - border-bottom: 1px dashed rgb(68,138,255); + border-top: $data-table-drag-border; + border-bottom: $data-table-drag-border; &:first-child { - border-left: 1px dashed rgb(68,138,255); + border-left: $data-table-drag-border; } &:last-child { - border-right: 1px dashed rgb(68,138,255); + border-right: $data-table-drag-border; } } } diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts index 0ac4ba5829..af7361c6d7 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts @@ -71,6 +71,9 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck @Input() rowStyleClass: string; + @Input() + showHeader: boolean = true; + @Output() rowClick: EventEmitter = new EventEmitter(); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html index 49cb416669..119ec59589 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html @@ -16,6 +16,7 @@ [rowStyle]="rowStyle" [rowStyleClass]="rowStyleClass" [loading]="loading" + [showHeader]="!isEmpty()" (showRowContextMenu)="onShowRowContextMenu($event)" (showRowActionsMenu)="onShowRowActionsMenu($event)" (executeRowAction)="onExecuteRowAction($event)"
@@ -27,8 +28,8 @@