Skip to content
Snippets Groups Projects
Commit 442a96c1 authored by kbeyro's avatar kbeyro
Browse files

fix visual on clusters

parent d5164306
No related branches found
No related tags found
2 merge requests!184Develop,!178fix visual on clusters
......@@ -4,3 +4,41 @@ label{
margin-bottom: 0;
font-weight: unset;
}
:host ::ng-deep .p-paginator .p-paginator-pages .p-paginator-page.p-highlight{
background: var(--user-button-background-hover);
}
:host ::ng-deep .p-datatable>.p-datatable-wrapper {
overflow: visible;
}
:host ::ng-deep input[type=file]{
display:none;
}
:host ::ng-deep .p-button{
width: unset;
margin-right: 5px;
background: var(--primary-button-color);
color: var(--button-text-color);
}
:host ::ng-deep .p-button:hover{
background: var(--primary-button-hover);
border:none;
}
:host ::ng-deep .p-button-label{
font-weight: normal;
}
:host ::ng-deep .p-fileupload .p-fileupload-buttonbar{
border: none;
background: transparent;
margin-bottom: 10px;
padding: 0;
}
:host ::ng-deep .p-fileupload .p-fileupload-content{
border: none;
padding: 0;
border-radius: 3px;
}
:host ::ng-deep .p-fileupload-content .p-progressbar{
display: none;
}
......@@ -43,8 +43,8 @@
<td [routerLink]="[cluster.id]">{{cluster.id}}</td>
<td>{{cluster.name}}</td>
<td>{{cluster.codename}}</td>
<td>{{cluster.creationDate}}</td>
<td>{{cluster.modificationDate}}</td>
<td>{{cluster.creationDate | date: 'dd-MM-yyyy HH:mm'}}</td>
<td>{{cluster.modificationDate | date: 'dd-MM-yyyy HH:mm'}}</td>
<td class="text-right">
<span class="dropdown">
<a style="display: inline-block" class="dropdown-toggle" aria-expanded="false" aria-haspopup="true" data-toggle="dropdown" href="#" role="button">
......@@ -97,7 +97,10 @@
</div>
</div>
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-secondary" [disabled]="updatedFile === null || addedCluster?.name === null || addedCluster?.description === null"(click)="closeModalAndSaveCluster()"
<button type="button" class="btn btn-primary" [disabled]="updatedFile === null || addedCluster?.name === null || addedCluster?.description === null"(click)="closeModalAndSaveCluster()"
pTooltip="Upload file is required before save" showDelay="2000" >{{'CLUSTERS.SAVE' | translate}}</button>
<button type="button" class="btn btn-secondary"
(click)="this.modal.hide()">{{'UNDEPLOY_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
......@@ -26,7 +26,9 @@ export class ClusterManagerComponent {
private domainService: DomainService
) {
this.getAllClusters();
this.domainService.getAllBase().subscribe(result => this.domains = result);
this.domainService.getAllBase().subscribe(result => {
this.domains = result.filter(d => d.id !== this.domainService.getGlobalDomainId());
});
}
public saveFile(event: any) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment