From 054a70772df7d5b63c3e4989943bd140a7aae753 Mon Sep 17 00:00:00 2001
From: jkazmierczak <jkazmierczak@man.poznan.pl>
Date: Tue, 27 Aug 2024 12:43:20 +0200
Subject: [PATCH] buttons and dropdown

---
 .../appinstance/appinstance/appinstance.component.css     | 2 +-
 .../appinstance/appinstance/appinstance.component.html    | 8 ++++----
 .../modals/app-abort-modal/app-abort-modal.component.html | 4 ++--
 .../app-restart-modal/app-restart-modal.component.html    | 4 ++--
 .../app-upgrade-modal/app-upgrade-modal.component.html    | 4 ++--
 .../appinstance/ssh-shell/ssh-shell.component.html        | 2 +-
 .../app-create-wizard/app-create-wizard.component.html    | 2 +-
 .../app-version-create-wizard.component.html              | 2 +-
 src/app/appmarket/domains/domain/domain.component.html    | 4 ++--
 .../shared/users/privileges/userprivileges.component.html | 2 +-
 src/app/welcome/complete/complete.component.html          | 4 ++--
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.css b/src/app/appmarket/appinstance/appinstance/appinstance.component.css
index 77a5be71..96f3d93c 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.css
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.css
@@ -78,6 +78,6 @@
 :host ::ng-deep  .p-dropdown {
     width: 200px;
 }
-.p-dropdown-items {
+:host ::ng-deep.p-dropdown-panel .p-dropdown-items {
     max-height: 150px;
 }
diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.html b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
index 35a1a2a1..330151db 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.html
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
@@ -68,16 +68,16 @@
                 <!-- Deployment buttons -->
 
                 <!-- if application is still being deployed -->
-                <div class="btn-group pull-right"
+                <div class=" pull-right"
                      *ngIf="getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.FAILURE
                          && getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.RUNNING
                          && getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.REMOVED
                          && getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.DONE">
                     <button *ngIf="getStateAsEnum(appInstanceStatus?.state) == AppInstanceState.CONFIGURATION_AWAITING"
-                            role="button" class="btn btn-primary" (click)="applyConfig.show()">
+                            role="button" class="btn btn-primary m-1" (click)="applyConfig.show()">
                         {{'APP_INSTANCE.CONFIGURE' | translate}}
                     </button>
-                    <button class="btn btn-danger"
+                    <button class="btn btn-danger m-1"
                             *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
                             (click)="this.appAbortModal.show()">{{'APP_INSTANCE.ABORT_BUTTON' | translate}}</button>
                 </div>
@@ -241,7 +241,7 @@
             <button type="button" class="btn btn-primary "
                     [disabled]="appVersions.length === 0 || selectedVersion === ''"
                     (click)="this.manualUpdateVersion()">{{'APP_INSTANCES.MANUAL_UPDATE.YES_BUTTON' | translate}}</button>
-            <button type="button" class="btn btn-danger"
+            <button type="button" class="btn btn-secondary"
                     (click)="this.manualUpdateModal.hide()">{{'UNDEPLOY_MODAL.CANCEL_BUTTON' | translate}}</button>
         </div>
     </nmaas-modal>
diff --git a/src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html b/src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html
index 766a4846..8962f2c1 100644
--- a/src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html
+++ b/src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html
@@ -8,7 +8,7 @@
         </div>
     </div>
     <div class="nmaas-modal-footer">
-        <button type="button" class="btn btn-danger" (click)="abort()">{{'ABORT_MODAL.YES_BUTTON' | translate}}</button>
-        <button type="button" class="btn btn-primary" (click)="modal.hide()">{{'ABORT_MODAL.CANCEL_BUTTON' | translate}}</button>
+        <button type="button" class="btn btn-primary" (click)="abort()">{{'ABORT_MODAL.YES_BUTTON' | translate}}</button>
+        <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'ABORT_MODAL.CANCEL_BUTTON' | translate}}</button>
     </div>
 </nmaas-modal>
diff --git a/src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html b/src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html
index 3b9c50b7..5d190e5a 100644
--- a/src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html
+++ b/src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html
@@ -8,7 +8,7 @@
         </div>
     </div>
     <div class="nmaas-modal-footer">
-        <button type="button" class="btn btn-danger" (click)="restart()">{{'RESTART_MODAL.YES_BUTTON' | translate}}</button>
-        <button type="button" class="btn btn-primary" (click)="modal.hide()">{{'RESTART_MODAL.CANCEL_BUTTON' | translate}}</button>
+        <button type="button" class="btn btn-primary" (click)="restart()">{{'RESTART_MODAL.YES_BUTTON' | translate}}</button>
+        <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'RESTART_MODAL.CANCEL_BUTTON' | translate}}</button>
     </div>
 </nmaas-modal>
diff --git a/src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html b/src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html
index f7c0c2c4..483f76fa 100644
--- a/src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html
+++ b/src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html
@@ -14,7 +14,7 @@
         </div>
     </div>
     <div class="nmaas-modal-footer">
-        <button type="button" class="btn btn-danger" (click)="upgrade()">{{'UPGRADE_MODAL.YES_BUTTON' | translate}}</button>
-        <button type="button" class="btn btn-primary" (click)="modal.hide()">{{'UPGRADE_MODAL.CANCEL_BUTTON' | translate}}</button>
+        <button type="button" class="btn btn-primary" (click)="upgrade()">{{'UPGRADE_MODAL.YES_BUTTON' | translate}}</button>
+        <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'UPGRADE_MODAL.CANCEL_BUTTON' | translate}}</button>
     </div>
 </nmaas-modal>
diff --git a/src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html b/src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html
index 08d11214..9bbce9c2 100644
--- a/src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html
+++ b/src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html
@@ -1,6 +1,6 @@
 <div class="upper-button-container">
     <div class="btn-group" role="group">
-        <button type="button" class="btn btn-warning" (click)="reconnect()">{{'SHELL.RECONNECT_BUTTON' | translate}}</button>
+        <button type="button" class="btn btn-primary" (click)="reconnect()">{{'SHELL.RECONNECT_BUTTON' | translate}}</button>
         <button type="button" class="btn btn-danger" (click)="disconnectWithModal()">{{'SHELL.DISCONNECT_BUTTON' | translate}}</button>
     </div>
 </div>
diff --git a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
index 1e8d9408..72fd4db5 100644
--- a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
@@ -626,7 +626,7 @@
         </div>
     </div>
     <div class="nmaas-modal-footer">
-        <button type="submit" class="btn btn-danger center-block"
+        <button type="submit" class="btn btn-primary center-block"
                 [routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
     </div>
 </nmaas-modal>
diff --git a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
index 2ab7728b..4ecb4752 100644
--- a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
@@ -349,6 +349,6 @@
     </div>
   </div>
   <div class="nmaas-modal-footer">
-    <button type="submit" class="btn btn-danger center-block" [routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
+    <button type="submit" class="btn btn-primary center-block" [routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
   </div>
 </nmaas-modal>
diff --git a/src/app/appmarket/domains/domain/domain.component.html b/src/app/appmarket/domains/domain/domain.component.html
index 110fee5f..f3f5cdaf 100644
--- a/src/app/appmarket/domains/domain/domain.component.html
+++ b/src/app/appmarket/domains/domain/domain.component.html
@@ -273,7 +273,7 @@
 		</div>
 	</div>
 	<div class="nmaas-modal-footer text-center">
-		<button class="btn btn-danger" style="display: inline-block" (click)="updateDcnConfigured()">{{ 'DOMAIN_DETAILS.YES_BUTTON' | translate }}</button>
-		<button class="btn btn-primary" style="display: inline-block" (click)="this.modal.hide()">{{ 'DOMAIN_DETAILS.CANCEL_BUTTON' | translate }}</button>
+		<button class="btn btn-primary" style="display: inline-block" (click)="updateDcnConfigured()">{{ 'DOMAIN_DETAILS.YES_BUTTON' | translate }}</button>
+		<button class="btn btn-secondary" style="display: inline-block" (click)="this.modal.hide()">{{ 'DOMAIN_DETAILS.CANCEL_BUTTON' | translate }}</button>
 	</div>
 </nmaas-modal>
diff --git a/src/app/shared/users/privileges/userprivileges.component.html b/src/app/shared/users/privileges/userprivileges.component.html
index b632b0f8..dbb956d4 100644
--- a/src/app/shared/users/privileges/userprivileges.component.html
+++ b/src/app/shared/users/privileges/userprivileges.component.html
@@ -24,7 +24,7 @@
 					</select>
 				</div>
 				<div class="col-lg-3">
-					<button type="submit" class="btn btn-danger">{{'USER_PRIVILEGES.ADD_BUTTON' | translate}}</button>
+					<button type="submit" class="btn btn-primary">{{'USER_PRIVILEGES.ADD_BUTTON' | translate}}</button>
 				</div>
 			</form>
 			<hr>
diff --git a/src/app/welcome/complete/complete.component.html b/src/app/welcome/complete/complete.component.html
index 3cc26673..46cef36f 100644
--- a/src/app/welcome/complete/complete.component.html
+++ b/src/app/welcome/complete/complete.component.html
@@ -89,8 +89,8 @@
         </div>
     </div>
     <div class="nmaas-modal-footer">
-        <button class="btn btn-danger center-block" (click)="this.hide()">{{'COMPLETE_REGISTRATION.MODAL.RETURN_BUTTON' | translate}}</button>
+        <button class="btn btn-secondary center-block" (click)="this.hide()">{{'COMPLETE_REGISTRATION.MODAL.RETURN_BUTTON' | translate}}</button>
     </div>
 </nmaas-modal>
 <modal-info-terms></modal-info-terms>
-<modal-info-policy></modal-info-policy>
\ No newline at end of file
+<modal-info-policy></modal-info-policy>
-- 
GitLab