From d03667b91ceafbfb1e9777e56e3f5bceafe21190 Mon Sep 17 00:00:00 2001
From: jkazmierczak <jkazmierczak@man.poznan.pl>
Date: Tue, 27 Aug 2024 10:55:01 +0200
Subject: [PATCH] buttons and dropdown
---
.../monitor/details/monitor-details.component.html | 10 ++++++----
.../appinstance/appinstance.component.css | 3 +--
.../appinstance/appinstance.component.html | 12 ++++++------
.../domain-namespace-annotations.component.html | 4 ++--
.../modal/appinstall/appinstallmodal.component.html | 2 +-
.../shared/users/details/userdetails.component.html | 2 +-
.../users/preferences/preferences.component.html | 2 +-
7 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/app/appmarket/admin/monitor/details/monitor-details.component.html b/src/app/appmarket/admin/monitor/details/monitor-details.component.html
index a9b8e7c0..2e0a86e0 100644
--- a/src/app/appmarket/admin/monitor/details/monitor-details.component.html
+++ b/src/app/appmarket/admin/monitor/details/monitor-details.component.html
@@ -36,9 +36,11 @@
<div class="alert alert-danger" *ngIf="errMsg">
{{errMsg}}
</div>
- <button *ngIf="!isInMode(ComponentMode.VIEW)" [disabled]="!monitorForm.form.valid" type="submit"
- class="btn btn-primary">{{'MONITOR_DETAILS.SUBMIT_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-danger" [routerLink]="['/admin/monitor']">{{'MONITOR_DETAILS.GO_BACK_BUTTON' | translate}}</button>
+ <div class="flex justify-content-between">
+ <button type="button" class="btn btn-secondary" [routerLink]="['/admin/monitor']">{{'MONITOR_DETAILS.GO_BACK_BUTTON' | translate}}</button>
+ <button *ngIf="!isInMode(ComponentMode.VIEW)" [disabled]="!monitorForm.form.valid" type="submit"
+ class="btn btn-primary">{{'MONITOR_DETAILS.SUBMIT_BUTTON' | translate}}</button>
+ </div>
</form>
<div *ngIf="!monitorEntry">{{'MONITOR_DETAILS.NOT_FOUND_ERROR' | translate}}</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.css b/src/app/appmarket/appinstance/appinstance/appinstance.component.css
index 12ecd7c9..77a5be71 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.css
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.css
@@ -78,7 +78,6 @@
:host ::ng-deep .p-dropdown {
width: 200px;
}
-.ui-dropdown-panel {
+.p-dropdown-items {
max-height: 150px;
- overflow-y: auto;
}
diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.html b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
index 798fdcb8..35a1a2a1 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.html
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
@@ -134,6 +134,12 @@
{{'APP_INSTANCE.ENABLE_AUTO_UPGRADES_BUTTON' | translate}}
</a>
</li>
+ <li *ngIf="appInstance.autoUpgradesEnabled">
+ <a *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
+ role="button" (click)="this.disableAutoUpgradesModal.show()">
+ {{'APP_INSTANCE.DISABLE_AUTO_UPGRADES_BUTTON' | translate}}
+ </a>
+ </li>
<li *ngIf="appInstance.upgradePossible">
<a *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
role="button" (click)="this.appUpgradeModal.show()">
@@ -151,12 +157,6 @@
{{'APP_INSTANCES.MANUAL_UPDATE.HEADER' | translate}}
</a>
</li>
- <li *ngIf="appInstance.autoUpgradesEnabled">
- <a *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
- role="button" (click)="this.disableAutoUpgradesModal.show()">
- {{'APP_INSTANCE.DISABLE_AUTO_UPGRADES_BUTTON' | translate}}
- </a>
- </li>
<li *ngIf="app.application.appDeploymentSpec.allowLogAccess">
<a role="button" [routerLink]="router.url + '/logs'">
{{'APP_INSTANCE.VIEW_LOGS' | translate}}
diff --git a/src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html b/src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html
index 7231a10d..826defac 100644
--- a/src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html
+++ b/src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html
@@ -63,8 +63,8 @@
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="closeModal()" [disabled]="isKeyNotUniqueAdd(newAnnotations) || !isKeyPatternCorrect">{{'DOMAINS.ADD_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
@@ -94,7 +94,7 @@
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-secondary" (click)="editModal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="closeModalEdit()" [disabled]="isEditAnnotationCorrect(editAnnotation) || !isKeyPatternCorrect">{{'DOMAINS.EDIT_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="editModal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/shared/modal/appinstall/appinstallmodal.component.html b/src/app/shared/modal/appinstall/appinstallmodal.component.html
index d5bab4b0..a20f1329 100644
--- a/src/app/shared/modal/appinstall/appinstallmodal.component.html
+++ b/src/app/shared/modal/appinstall/appinstallmodal.component.html
@@ -29,7 +29,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'INSTALL_MODAL.CLOSE_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="create()" [disabled]="instance_name.invalid || clicked">{{'INSTALL_MODAL.DEPLOY_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'INSTALL_MODAL.CLOSE_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/shared/users/details/userdetails.component.html b/src/app/shared/users/details/userdetails.component.html
index ffa3d5a9..98a4227a 100644
--- a/src/app/shared/users/details/userdetails.component.html
+++ b/src/app/shared/users/details/userdetails.component.html
@@ -6,7 +6,7 @@
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.VIEW_BUTTON' | translate}}</button>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" [disabled]="userDetailsForm.invalid"
- class="btn btn-danger">{{'USER_DETAILS.SUBMIT_BUTTON' | translate}}</button>
+ class="btn btn-primary">{{'USER_DETAILS.SUBMIT_BUTTON' | translate}}</button>
<button *ngIf="isInMode(ComponentMode.VIEW) && isModeAllowed(ComponentMode.EDIT) && authService.hasRole('ROLE_SYSTEM_ADMIN')" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.EDIT_BUTTON' | translate}}</button>
</div>
diff --git a/src/app/shared/users/preferences/preferences.component.html b/src/app/shared/users/preferences/preferences.component.html
index 590a66de..22fe2433 100644
--- a/src/app/shared/users/preferences/preferences.component.html
+++ b/src/app/shared/users/preferences/preferences.component.html
@@ -7,7 +7,7 @@
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.VIEW_BUTTON' | translate}}</button>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" [disabled]="userPreferencesForm.invalid"
- class="btn btn-danger">{{'USER_DETAILS.SUBMIT_BUTTON' | translate}}</button>
+ class="btn btn-primary">{{'USER_DETAILS.SUBMIT_BUTTON' | translate}}</button>
<button *ngIf="isInMode(ComponentMode.VIEW) && isModeAllowed(ComponentMode.EDIT)" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.EDIT_BUTTON' | translate}}</button>
</div>
--
GitLab