Skip to content
Snippets Groups Projects
Commit f2a140dd authored by Joanna Kaźmierczak's avatar Joanna Kaźmierczak
Browse files

changed header position

parent 970c3e4b
No related branches found
No related tags found
1 merge request!188Resolve "Improve new layout"
<h4 style="margin-top:40px; font-weight: bold" *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN', 'ROLE_OPERATOR']">{{ 'APP_INSTANCES.DEPLOYED' | translate }}</h4>
<div style="display: flex; align-items: flex-start; justify-content: space-between; margin-top:20px"> <div style="display: flex; align-items: flex-start; justify-content: space-between; margin-top:20px">
<div style="display:flex; align-items: center;"> <div style="display:flex; align-items: center;">
<span class="p-input-icon-right"> <span class="p-input-icon-right">
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
</div> </div>
</div> </div>
<h4 style="margin-top:40px; font-weight: bold" *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN', 'ROLE_OPERATOR']">{{ 'APP_INSTANCES.DEPLOYED' | translate }}</h4>
<div *ngIf="selectedOption === 'list'" class="background-section" style="margin-top:30px"> <div *ngIf="selectedOption === 'list'" class="background-section" style="margin-top:30px">
<p-table [value]="appDeployedInstances | async | searchAppInstance: searchValue" <p-table [value]="appDeployedInstances | async | searchAppInstance: searchValue"
[paginator]="true" [paginator]="true"
......
<div class=""> <div class="">
<h4 class="header">{{'APPS_MANAGEMENT.TITLE'| translate}}</h4>
<div style="display:flex; "> <div style="display:flex; margin-top:20px">
<div style="margin-right:20px"> <div style="margin-right:20px">
<span class="p-input-icon-right" style="width: 100%"> <span class="p-input-icon-right" style="width: 100%">
<i class="pi pi-search" style="font-size: 13px; top: 16px; margin-right: 5px;"></i> <i class="pi pi-search" style="font-size: 13px; top: 16px; margin-right: 5px;"></i>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</div> </div>
</div> </div>
<h4 class="header">{{'APPS_MANAGEMENT.TITLE'| translate}}</h4>
<div class="background-section"> <div class="background-section">
<p-table [value]="apps" class="p-datatable-hover p-datatable-sm" [responsive]="true"> <p-table [value]="apps" class="p-datatable-hover p-datatable-sm" [responsive]="true">
<ng-template pTemplate="header"> <ng-template pTemplate="header">
......
<h4 class="header">{{header | translate}}</h4>
<div class=""> <div class="">
<div style="display:flex; "> <div style="display:flex; margin-top:20px">
<div style="margin-right:20px"> <div style="margin-right:20px">
<span class="p-input-icon-right" style="width: 100%"> <span class="p-input-icon-right" style="width: 100%">
<i class="pi pi-search" style="font-size: 13px; top: 16px; margin-right: 5px;"></i> <i class="pi pi-search" style="font-size: 13px; top: 16px; margin-right: 5px;"></i>
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
<p-inputSwitch *ngIf="mode=== bulkTypeApp" id="showDeleted" (onChange)="refreshBulks()" [(ngModel)]="showDeleted" ngDefaultControl/> <p-inputSwitch *ngIf="mode=== bulkTypeApp" id="showDeleted" (onChange)="refreshBulks()" [(ngModel)]="showDeleted" ngDefaultControl/>
</div> </div>
</div> </div>
<h4 class="header">{{header | translate}}</h4>
<!-- <div class="" style="display: flex; justify-content: space-between; margin-top: 10px;">--> <!-- <div class="" style="display: flex; justify-content: space-between; margin-top: 10px;">-->
<!-- <div class="flex">--> <!-- <div class="flex">-->
<!-- <div class="flex align-items-center mr-1">{{ 'BULK.LIST.PER_PAGE' | translate }}:</div>--> <!-- <div class="flex align-items-center mr-1">{{ 'BULK.LIST.PER_PAGE' | translate }}:</div>-->
......
<h4 class="header">{{'DOMAINS.LIST.GROUPS' | translate}}</h4>
<div style="display: flex; align-items: center; margin-top:20px"> <div style="display: flex; align-items: center; margin-top:20px">
<div style="margin-right:20px"> <div style="margin-right:20px">
<span class="p-input-icon-right" style="width: 100%"> <span class="p-input-icon-right" style="width: 100%">
...@@ -10,7 +11,7 @@ ...@@ -10,7 +11,7 @@
role="button">{{'DOMAINS.ADD_BUTTON' | translate}}</button> role="button">{{'DOMAINS.ADD_BUTTON' | translate}}</button>
</div> </div>
</div> </div>
<h4 class="header">{{'DOMAINS.LIST.GROUPS' | translate}}</h4>
<div class="background-section"> <div class="background-section">
......
<h4 class="header">{{ 'DOMAINS.TITLE' | translate }}</h4>
<div style="display: flex; align-items: center; margin-top:20px"> <div style="display: flex; align-items: center; margin-top:20px">
<div style="margin-right:20px"> <div style="margin-right:20px">
<span class="p-input-icon-right" style="width: 100%"> <span class="p-input-icon-right" style="width: 100%">
...@@ -18,7 +19,6 @@ ...@@ -18,7 +19,6 @@
<label for="showNotActive"> {{'DOMAINS.NOTACTIVE' | translate}}</label> <label for="showNotActive"> {{'DOMAINS.NOTACTIVE' | translate}}</label>
</div> </div>
</div> </div>
<h4 class="header">{{ 'DOMAINS.TITLE' | translate }}</h4>
<div class="background-section"> <div class="background-section">
<p-table [value]="domains | async | searchDomain: searchValue: showNotActive" <p-table [value]="domains | async | searchDomain: searchValue: showNotActive"
......
<h4 class="header">{{ 'CLUSTERS.CONFIGURATION' | translate }}</h4>
<div style="display: flex; align-items: center; margin-top:20px"> <div style="display: flex; align-items: center; margin-top:20px">
<div style=" display:flex; align-items: center;"> <div style=" display:flex; align-items: center;">
<div style="margin-right:20px;"> <div style="margin-right:20px;">
...@@ -11,7 +12,7 @@ ...@@ -11,7 +12,7 @@
</div> </div>
</div> </div>
<h4 class="header">{{ 'CLUSTERS.CONFIGURATION' | translate }}</h4>
<div class="background-section"> <div class="background-section">
<p-table <p-table
...@@ -103,10 +104,11 @@ ...@@ -103,10 +104,11 @@
</div> </div>
</div> </div>
<div class="nmaas-modal-footer"> <div class="nmaas-modal-footer">
<button type="button" class="btn btn-secondary"
(click)="this.modal.hide()">{{'UNDEPLOY_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" [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> 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> </div>
</nmaas-modal> </nmaas-modal>
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
<!-- </ul>--> <!-- </ul>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<div class="" style="display: flex"> <h4 class="header"> {{ 'USERS.TITLE' | translate }}</h4>
<div class="" style="display: flex; margin-top:20px">
<div *ngIf="isModeAllowed(ComponentMode.EDIT)" <div *ngIf="isModeAllowed(ComponentMode.EDIT)"
style="margin-right: 15px; padding-top: 5px;"> {{'USERS.SEARCH' | translate}}</div> style="margin-right: 15px; padding-top: 5px;"> {{'USERS.SEARCH' | translate}}</div>
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
</button> </button>
</div> </div>
<h4 class="header"> {{ 'USERS.TITLE' | translate }}</h4>
<div class="background-section"> <div class="background-section">
<p-table #dt [value]="displayUsers" [paginator]="true" [rows]="maxItemsOnPage" <p-table #dt [value]="displayUsers" [paginator]="true" [rows]="maxItemsOnPage"
[rowsPerPageOptions]="[15, 20, 25, 30, 50]" > [rowsPerPageOptions]="[15, 20, 25, 30, 50]" >
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment