diff --git a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts index 9cd960aea..3aa79d8e7 100644 --- a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts +++ b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts @@ -16,9 +16,7 @@ import { Output, EventEmitter, ViewChild, - AfterViewChecked, - ChangeDetectionStrategy, - ChangeDetectorRef + AfterViewChecked } from '@angular/core'; import { NgForm } from '@angular/forms'; @@ -43,8 +41,7 @@ const FAKE_PASSWORD = 'rjGcfuRu'; @Component({ selector: 'create-edit-endpoint', template: CREATE_EDIT_ENDPOINT_TEMPLATE, - styles: [CREATE_EDIT_ENDPOINT_STYLE], - changeDetection: ChangeDetectionStrategy.OnPush + styles: [CREATE_EDIT_ENDPOINT_STYLE] }) export class CreateEditEndpointComponent implements AfterViewChecked { @@ -89,8 +86,7 @@ export class CreateEditEndpointComponent implements AfterViewChecked { constructor( private endpointService: EndpointService, private errorHandler: ErrorHandler, - private translateService: TranslateService, - private ref: ChangeDetectorRef) { } + private translateService: TranslateService) { } openCreateEditTarget(editable: boolean, targetId?: number | string) { diff --git a/src/ui_ng/lib/src/replication/replication.component.css.ts b/src/ui_ng/lib/src/replication/replication.component.css.ts index 850dfc259..a85801e1b 100644 --- a/src/ui_ng/lib/src/replication/replication.component.css.ts +++ b/src/ui_ng/lib/src/replication/replication.component.css.ts @@ -9,7 +9,7 @@ export const REPLICATION_STYLE: string = ` .option-left { padding-left: 16px; - margin-top: 12px; + margin-top: 18px; } .option-right { padding-right: 16px; diff --git a/src/ui_ng/lib/src/replication/replication.component.html.ts b/src/ui_ng/lib/src/replication/replication.component.html.ts index 5e89a2843..3bfb48634 100644 --- a/src/ui_ng/lib/src/replication/replication.component.html.ts +++ b/src/ui_ng/lib/src/replication/replication.component.html.ts @@ -1,13 +1,13 @@ export const REPLICATION_TEMPLATE: string = `
-
+
-
+
diff --git a/src/ui_ng/src/app/log/audit-log.component.css b/src/ui_ng/src/app/log/audit-log.component.css index f2ead1afc..7b8ead9d6 100644 --- a/src/ui_ng/src/app/log/audit-log.component.css +++ b/src/ui_ng/src/app/log/audit-log.component.css @@ -1,5 +1,11 @@ .option-right { - padding-right: 16px; - margin-top: 22px; - margin-bottom: 2px; + padding-right: 16px; +} + +.refresh-btn { + cursor: pointer; +} + +.refresh-btn:hover { + color: #007CBB; } \ No newline at end of file diff --git a/src/ui_ng/src/app/log/audit-log.component.html b/src/ui_ng/src/app/log/audit-log.component.html index 2d026c4d0..60e9a7d8e 100644 --- a/src/ui_ng/src/app/log/audit-log.component.html +++ b/src/ui_ng/src/app/log/audit-log.component.html @@ -1,62 +1,64 @@
-
-
-
- - - -
-
-
- - + + + + +
+
+
+ + -
- - - - {{f.description | translate}} - -
- -
- -
+
+
+
+ + {{'AUDIT_LOG.USERNAME' | translate}} + {{'AUDIT_LOG.REPOSITORY_NAME' | translate}} + {{'AUDIT_LOG.TAGS' | translate}} + {{'AUDIT_LOG.OPERATION' | translate}} + {{'AUDIT_LOG.TIMESTAMP' | translate}} + + {{l.username}} + {{l.repo_name}} + {{l.repo_tag}} + {{l.operation}} + {{l.op_time | date: 'short'}} + + + {{totalRecordCount}} {{'AUDIT_LOG.ITEMS' | translate}} + + +
-
-
- - {{'AUDIT_LOG.USERNAME' | translate}} - {{'AUDIT_LOG.REPOSITORY_NAME' | translate}} - {{'AUDIT_LOG.TAGS' | translate}} - {{'AUDIT_LOG.OPERATION' | translate}} - {{'AUDIT_LOG.TIMESTAMP' | translate}} - - {{l.username}} - {{l.repo_name}} - {{l.repo_tag}} - {{l.operation}} - {{l.op_time | date: 'short'}} - - - {{totalRecordCount}} {{'AUDIT_LOG.ITEMS' | translate}} - - - -
\ No newline at end of file diff --git a/src/ui_ng/src/app/project/member/member.component.css b/src/ui_ng/src/app/project/member/member.component.css index ab3bc903f..85cc63fc1 100644 --- a/src/ui_ng/src/app/project/member/member.component.css +++ b/src/ui_ng/src/app/project/member/member.component.css @@ -1,8 +1,15 @@ .option-left { - padding-left: 16px; - margin-top: 24px; + padding-left: 16px; } + .option-right { - padding-right: 16px; - margin-top: 18px; + padding-right: 16px; +} + +.refresh-btn { + cursor: pointer; +} + +.refresh-btn:hover { + color: #007CBB; } \ No newline at end of file diff --git a/src/ui_ng/src/app/project/member/member.component.html b/src/ui_ng/src/app/project/member/member.component.html index 7f36d7639..5f5388d06 100644 --- a/src/ui_ng/src/app/project/member/member.component.html +++ b/src/ui_ng/src/app/project/member/member.component.html @@ -1,15 +1,15 @@
-
+
-
+
- - + + - +
diff --git a/src/ui_ng/src/app/project/project.component.css b/src/ui_ng/src/app/project/project.component.css index 98fe7dedd..cb24810ec 100644 --- a/src/ui_ng/src/app/project/project.component.css +++ b/src/ui_ng/src/app/project/project.component.css @@ -4,10 +4,16 @@ .option-left { padding-left: 16px; - margin-top: 12px; } .option-right { padding-right: 16px; - margin-top: 18px; +} + +.refresh-btn { + cursor: pointer; +} + +.refresh-btn:hover { + color: #007CBB; } \ No newline at end of file diff --git a/src/ui_ng/src/app/project/project.component.html b/src/ui_ng/src/app/project/project.component.html index 6f4048988..44f3cb271 100644 --- a/src/ui_ng/src/app/project/project.component.html +++ b/src/ui_ng/src/app/project/project.component.html @@ -6,23 +6,23 @@
-
+
-
+
- - + + - +
diff --git a/src/ui_ng/src/app/repository/repository.component.html b/src/ui_ng/src/app/repository/repository.component.html index 16973f08a..dc6282985 100644 --- a/src/ui_ng/src/app/repository/repository.component.html +++ b/src/ui_ng/src/app/repository/repository.component.html @@ -1,13 +1,15 @@
-
-
-
- - -
+
+
+
+ + + + +
+
+
+
+
-
-
- -
\ No newline at end of file diff --git a/src/ui_ng/src/app/shared/filter/filter.component.css b/src/ui_ng/src/app/shared/filter/filter.component.css deleted file mode 100644 index 98d8eccf5..000000000 --- a/src/ui_ng/src/app/shared/filter/filter.component.css +++ /dev/null @@ -1,4 +0,0 @@ -.filter-icon { - position: relative; - right: -12px; -} \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/filter/filter.component.html b/src/ui_ng/src/app/shared/filter/filter.component.html deleted file mode 100644 index 302b00362..000000000 --- a/src/ui_ng/src/app/shared/filter/filter.component.html +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/filter/filter.component.ts b/src/ui_ng/src/app/shared/filter/filter.component.ts deleted file mode 100644 index 17c76f41a..000000000 --- a/src/ui_ng/src/app/shared/filter/filter.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) 2017 VMware, Inc. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import { Component, Input, Output, OnInit, EventEmitter } from '@angular/core'; -import { Subject } from 'rxjs/Subject'; -import { Observable } from 'rxjs/Observable'; - -import 'rxjs/add/operator/debounceTime'; -import 'rxjs/add/operator/distinctUntilChanged'; - - -@Component({ - selector: 'grid-filter', - templateUrl: 'filter.component.html', - styleUrls: ['filter.component.css'] -}) - -export class FilterComponent implements OnInit { - - placeHolder: string = ""; - filterTerms = new Subject(); - - @Output("filter") private filterEvt = new EventEmitter(); - - @Input() currentValue: string; - @Input("filterPlaceholder") - public set flPlaceholder(placeHolder: string) { - this.placeHolder = placeHolder; - } - - ngOnInit(): void { - this.filterTerms - .debounceTime(500) - //.distinctUntilChanged() - .subscribe(terms => { - this.filterEvt.emit(terms); - }); - - } - - valueChange(): void { - //Send out filter terms - this.filterTerms.next(this.currentValue.trim()); - } -} \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/shared.module.ts b/src/ui_ng/src/app/shared/shared.module.ts index 705f98688..5e324da48 100644 --- a/src/ui_ng/src/app/shared/shared.module.ts +++ b/src/ui_ng/src/app/shared/shared.module.ts @@ -20,7 +20,6 @@ import { MessageComponent } from '../global-message/message.component'; import { MessageService } from '../global-message/message.service'; import { MaxLengthExtValidatorDirective } from './max-length-ext.directive'; -import { FilterComponent } from './filter/filter.component'; import { TranslateModule } from "@ngx-translate/core"; import { RouterModule } from '@angular/router'; @@ -81,7 +80,6 @@ const uiLibConfig: IServiceConfig = { declarations: [ MessageComponent, MaxLengthExtValidatorDirective, - FilterComponent, ConfirmationDialogComponent, NewUserFormComponent, InlineAlertComponent, @@ -101,7 +99,6 @@ const uiLibConfig: IServiceConfig = { HarborLibraryModule, MessageComponent, MaxLengthExtValidatorDirective, - FilterComponent, TranslateModule, ConfirmationDialogComponent, NewUserFormComponent, diff --git a/src/ui_ng/src/app/user/user.component.css b/src/ui_ng/src/app/user/user.component.css index cbd04a9ad..cb852be18 100644 --- a/src/ui_ng/src/app/user/user.component.css +++ b/src/ui_ng/src/app/user/user.component.css @@ -27,11 +27,15 @@ .refresh-btn { position: absolute; - right: 2px; - top: 12px; + right: 6px; + top: 17px; cursor: pointer; } +.refresh-btn:hover { + color: #007CBB; +} + .hide-create { visibility: hidden !important; } \ No newline at end of file diff --git a/src/ui_ng/src/app/user/user.component.html b/src/ui_ng/src/app/user/user.component.html index 516adf19a..947a712c3 100644 --- a/src/ui_ng/src/app/user/user.component.html +++ b/src/ui_ng/src/app/user/user.component.html @@ -5,7 +5,7 @@ - +