From f2a140dd797d19c68225b66ef1e8c573da238a95 Mon Sep 17 00:00:00 2001
From: jkazmierczak <jkazmierczak@man.poznan.pl>
Date: Tue, 20 May 2025 15:47:12 +0200
Subject: [PATCH] changed header position
---
.../appinstancelist/appinstancelist.component.html | 3 ++-
.../app-management-list/appmanagementlist.component.html | 6 +++---
.../bulkDeployment/bulk-list/bulk-list.component.html | 5 +++--
.../domains/domain-groups/domain-groups.component.html | 3 ++-
src/app/appmarket/domains/list/domainslist.component.html | 2 +-
.../shared/admin/clusters/manager/manager.component.html | 8 +++++---
src/app/shared/users/list/userslist.component.html | 5 +++--
7 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.html b/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.html
index 7af02f7f..ad6b14bd 100644
--- a/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.html
+++ b/src/app/appmarket/appinstance/appinstancelist/appinstancelist.component.html
@@ -1,3 +1,4 @@
+<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: center;">
<span class="p-input-icon-right">
@@ -30,7 +31,7 @@
</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">
<p-table [value]="appDeployedInstances | async | searchAppInstance: searchValue"
[paginator]="true"
diff --git a/src/app/appmarket/appmanagement/app-management-list/appmanagementlist.component.html b/src/app/appmarket/appmanagement/app-management-list/appmanagementlist.component.html
index 7e8d8345..4da61abe 100644
--- a/src/app/appmarket/appmanagement/app-management-list/appmanagementlist.component.html
+++ b/src/app/appmarket/appmanagement/app-management-list/appmanagementlist.component.html
@@ -1,6 +1,6 @@
<div class="">
-
- <div style="display:flex; ">
+ <h4 class="header">{{'APPS_MANAGEMENT.TITLE'| translate}}</h4>
+ <div style="display:flex; margin-top:20px">
<div style="margin-right:20px">
<span class="p-input-icon-right" style="width: 100%">
<i class="pi pi-search" style="font-size: 13px; top: 16px; margin-right: 5px;"></i>
@@ -13,7 +13,7 @@
</div>
</div>
- <h4 class="header">{{'APPS_MANAGEMENT.TITLE'| translate}}</h4>
+
<div class="background-section">
<p-table [value]="apps" class="p-datatable-hover p-datatable-sm" [responsive]="true">
<ng-template pTemplate="header">
diff --git a/src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html b/src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html
index 12193d91..8decfa42 100644
--- a/src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html
+++ b/src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html
@@ -1,5 +1,6 @@
+<h4 class="header">{{header | translate}}</h4>
<div class="">
- <div style="display:flex; ">
+ <div style="display:flex; margin-top:20px">
<div style="margin-right:20px">
<span class="p-input-icon-right" style="width: 100%">
<i class="pi pi-search" style="font-size: 13px; top: 16px; margin-right: 5px;"></i>
@@ -45,7 +46,7 @@
<p-inputSwitch *ngIf="mode=== bulkTypeApp" id="showDeleted" (onChange)="refreshBulks()" [(ngModel)]="showDeleted" ngDefaultControl/>
</div>
</div>
- <h4 class="header">{{header | translate}}</h4>
+
<!-- <div class="" style="display: flex; justify-content: space-between; margin-top: 10px;">-->
<!-- <div class="flex">-->
<!-- <div class="flex align-items-center mr-1">{{ 'BULK.LIST.PER_PAGE' | translate }}:</div>-->
diff --git a/src/app/appmarket/domains/domain-groups/domain-groups.component.html b/src/app/appmarket/domains/domain-groups/domain-groups.component.html
index efb93d02..7c248d9e 100644
--- a/src/app/appmarket/domains/domain-groups/domain-groups.component.html
+++ b/src/app/appmarket/domains/domain-groups/domain-groups.component.html
@@ -1,3 +1,4 @@
+<h4 class="header">{{'DOMAINS.LIST.GROUPS' | translate}}</h4>
<div style="display: flex; align-items: center; margin-top:20px">
<div style="margin-right:20px">
<span class="p-input-icon-right" style="width: 100%">
@@ -10,7 +11,7 @@
role="button">{{'DOMAINS.ADD_BUTTON' | translate}}</button>
</div>
</div>
-<h4 class="header">{{'DOMAINS.LIST.GROUPS' | translate}}</h4>
+
<div class="background-section">
diff --git a/src/app/appmarket/domains/list/domainslist.component.html b/src/app/appmarket/domains/list/domainslist.component.html
index 737b5a4d..865e3f59 100644
--- a/src/app/appmarket/domains/list/domainslist.component.html
+++ b/src/app/appmarket/domains/list/domainslist.component.html
@@ -1,3 +1,4 @@
+<h4 class="header">{{ 'DOMAINS.TITLE' | translate }}</h4>
<div style="display: flex; align-items: center; margin-top:20px">
<div style="margin-right:20px">
<span class="p-input-icon-right" style="width: 100%">
@@ -18,7 +19,6 @@
<label for="showNotActive"> {{'DOMAINS.NOTACTIVE' | translate}}</label>
</div>
</div>
- <h4 class="header">{{ 'DOMAINS.TITLE' | translate }}</h4>
<div class="background-section">
<p-table [value]="domains | async | searchDomain: searchValue: showNotActive"
diff --git a/src/app/shared/admin/clusters/manager/manager.component.html b/src/app/shared/admin/clusters/manager/manager.component.html
index e370b9a4..0fd942b3 100644
--- a/src/app/shared/admin/clusters/manager/manager.component.html
+++ b/src/app/shared/admin/clusters/manager/manager.component.html
@@ -1,3 +1,4 @@
+<h4 class="header">{{ 'CLUSTERS.CONFIGURATION' | translate }}</h4>
<div style="display: flex; align-items: center; margin-top:20px">
<div style=" display:flex; align-items: center;">
<div style="margin-right:20px;">
@@ -11,7 +12,7 @@
</div>
</div>
- <h4 class="header">{{ 'CLUSTERS.CONFIGURATION' | translate }}</h4>
+
<div class="background-section">
<p-table
@@ -103,10 +104,11 @@
</div>
</div>
<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()"
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>
diff --git a/src/app/shared/users/list/userslist.component.html b/src/app/shared/users/list/userslist.component.html
index 1425e8fb..4f27e95d 100644
--- a/src/app/shared/users/list/userslist.component.html
+++ b/src/app/shared/users/list/userslist.component.html
@@ -42,7 +42,8 @@
<!-- </ul>-->
<!-- </span>-->
<!-- </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)"
style="margin-right: 15px; padding-top: 5px;"> {{'USERS.SEARCH' | translate}}</div>
@@ -65,7 +66,7 @@
</button>
</div>
- <h4 class="header"> {{ 'USERS.TITLE' | translate }}</h4>
+
<div class="background-section">
<p-table #dt [value]="displayUsers" [paginator]="true" [rows]="maxItemsOnPage"
[rowsPerPageOptions]="[15, 20, 25, 30, 50]" >
--
GitLab