diff --git a/smp-angular/src/app/common/row-limiter/row-limiter.component.css b/smp-angular/src/app/common/row-limiter/row-limiter.component.css new file mode 100644 index 0000000000000000000000000000000000000000..f2c54e8bb0df19955ad6dd37e4cb6fc1114214a9 --- /dev/null +++ b/smp-angular/src/app/common/row-limiter/row-limiter.component.css @@ -0,0 +1,7 @@ +.search-table-row-limiter { + width: 200px; +} + +.row-limiter-item { + min-height: 2em !important; +} diff --git a/smp-angular/src/app/common/row-limiter/row-limiter.component.html b/smp-angular/src/app/common/row-limiter/row-limiter.component.html index 1285fcb5119e77928d6ba9f99572f14a1315f965..2374ef2dcfad2f4815a128f681236b8d9fe45309 100644 --- a/smp-angular/src/app/common/row-limiter/row-limiter.component.html +++ b/smp-angular/src/app/common/row-limiter/row-limiter.component.html @@ -1,7 +1,8 @@ -<div> +<div class="search-table-row-limiter"> + <mat-select placeholder="Rows" [(ngModel)]="pageSize" name="pageSize" (selectionChange)="changePageSize($event)" id="pagesize_id"> - <mat-option *ngFor="let rowLimit of pageSizes" [value]="rowLimit.value"> + <mat-option class="row-limiter-item" *ngFor="let rowLimit of pageSizes" [value]="rowLimit.value"> {{rowLimit.key}} </mat-option> </mat-select> diff --git a/smp-angular/src/app/common/row-limiter/row-limiter.component.ts b/smp-angular/src/app/common/row-limiter/row-limiter.component.ts index 7d5ba2363f8080e4a32a00b9594a4a17808e6426..eea2a30bfee4ef78eab61dfab087ed29dac3b508 100644 --- a/smp-angular/src/app/common/row-limiter/row-limiter.component.ts +++ b/smp-angular/src/app/common/row-limiter/row-limiter.component.ts @@ -2,7 +2,8 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; @Component({ selector: 'app-row-limiter', - templateUrl: './row-limiter.component.html' + templateUrl: './row-limiter.component.html', + styleUrls: ['./row-limiter.component.css'] }) export class RowLimiterComponent implements OnInit { diff --git a/smp-angular/src/app/common/search-table/_search-table.component-theme.scss b/smp-angular/src/app/common/search-table/_search-table.component-theme.scss index 64f3c933385221280f4f93b3152e5f3e5946364a..93ae101ad6b8c990349f0d316767b8a0336fe230 100644 --- a/smp-angular/src/app/common/search-table/_search-table.component-theme.scss +++ b/smp-angular/src/app/common/search-table/_search-table.component-theme.scss @@ -34,3 +34,36 @@ box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.24); } +.datatable-pager li.disabled a { + color: rgba(0, 0, 0, 0.26) !important; + background-color: transparent !important; +} + +.datatable-pager .pager li a { + margin: 0 5px; +} + +.datatable-icon-right:before { + content: '\e5cc'; + font-family: 'Material Icons'; + font-style: normal; +} + +.datatable-icon-left:before { + content: '\e5cb'; + font-family: 'Material Icons'; + font-style: normal; +} + +.datatable-icon-prev::before { + content: '\e5dc'; + font-family: 'Material Icons'; + font-style: normal; +} + + +.datatable-icon-skip::before { + content: '\e5dd'; + font-family: 'Material Icons'; + font-style: normal; +} diff --git a/smp-angular/src/app/common/search-table/search-table.component.css b/smp-angular/src/app/common/search-table/search-table.component.css index cf38cdab6fdf0436abe42bb13bdb59c4fe54d5fc..6654c8d790fa79f94b1bb466ef2f3ccc467550fc 100644 --- a/smp-angular/src/app/common/search-table/search-table.component.css +++ b/smp-angular/src/app/common/search-table/search-table.component.css @@ -52,4 +52,3 @@ margin-bottom: 0 !important; } - diff --git a/smp-angular/src/app/service-group-search/service-group-search.component.css b/smp-angular/src/app/service-group-search/service-group-search.component.css index 4ec23f503b3cd0ce4af2d7032c3ee6e3f89fca56..7f88ec2a5e0f09eea8a22b4d5e4e2d1d1e62a73a 100644 --- a/smp-angular/src/app/service-group-search/service-group-search.component.css +++ b/smp-angular/src/app/service-group-search/service-group-search.component.css @@ -13,17 +13,17 @@ } -.datatable-body{ +.datatable-body { overflow-y: scroll; } ::ng-deep .inner-table { - margin-left: 100px; + margin-left: 50px; width: 80%; } ::ng-deep .inner-table .datatable-body-cell { - padding: 1.5em 2px !important; + padding: 0.2em !important; } diff --git a/smp-angular/src/app/service-group-search/service-group-search.component.html b/smp-angular/src/app/service-group-search/service-group-search.component.html index abfca00c050f277f8f9b3dc3ec2165b73e3603a2..1b0602e0c4b0943a13c447b7c99eab21a6561830 100644 --- a/smp-angular/src/app/service-group-search/service-group-search.component.html +++ b/smp-angular/src/app/service-group-search/service-group-search.component.html @@ -20,23 +20,16 @@ <ng-template #searchPanel> <div style="display: flex;flex-direction: row;width: 100%"> <mat-form-field class="smp-data-panel-field"> - <mat-label>Resource Identifier filter</mat-label> + <mat-label>Resource Identifier</mat-label> <input matInput name="ResourceIdentifier" [(ngModel)]="filter.participantIdentifier" #messageId="ngModel" id="ResourceIdentifier"> </mat-form-field> <mat-form-field class="smp-data-panel-field"> - <mat-label>Resource scheme filter</mat-label> + <mat-label>Resource scheme</mat-label> <input matInput name="ResourceScheme" [(ngModel)]="filter.participantScheme" #messageId="ngModel" id="ResourceScheme"> </mat-form-field> - <mat-select placeholder="All Domains" [(ngModel)]="filter.domain" name="domain" *ngIf="false" - id="domain_id"> - <mat-option [value]="''">All Domains</mat-option> - <mat-option *ngFor="let domain of lookups.cachedDomainList" [value]="domain.domainCode"> - {{domain.domainCode}} ({{domain.smlSubdomain}}) - </mat-option> - </mat-select> </div> </ng-template>