Merge branch 'develop' into 157-add-view-for-application-deployment-p…

…arameters
nmaas-platform · Feb 19, 2024 · b4004a0 · b4004a0
2 parents f490acf + 0b9fa28
commit b4004a0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/app/appmarket/domains/domain-group-view/domain-group-view.component.css b/src/app/appmarket/domains/domain-group-view/domain-group-view.component.css
@@ -28,7 +28,24 @@ input.ng-dirty.ng-invalid {
 .row-sub {
     flex-basis: 100%;
 }
-
+.toggle-button[aria-expanded="false"]{
+    background: transparent;
+    line-height: 1;
+    padding: 4px 4px 2px;
+}
+.toggle-button[aria-expanded="false"]:after{
+    font-family: "Glyphicons Halflings", sans-serif;
+    content:"\e114";
+}
+.toggle-button[aria-expanded="true"]{
+    background: transparent;
+    line-height: 1;
+    padding: 4px 4px 2px;
+}
+.toggle-button[aria-expanded="true"]:after{
+    font-family: "Glyphicons Halflings", sans-serif;
+    content:"\e113";
+}
 
 .custom-collapse[aria-expanded="false"] {
     line-height: 1;

diff --git a/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html b/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
@@ -70,14 +70,14 @@ <h3>{{ 'DOMAINS.LIST.GROUP' | translate }}</h3>
 
         <div *ngIf="!this.addingMode" class="panel panel-default" style="margin-top: 3rem">
             <div class="panel-heading">
-
-                <div style="display: flex; justify-content: start; align-items: center">
+                <div style="display: flex; justify-content: space-between; align-items: center">
                     <div>
                         {{ 'DOMAINS.LIST.LIST' | translate }}
                     </div>
+                    <button class="btn pull-right toggle-button" data-toggle="collapse" [attr.data-target]="'#domains-list'" type="button" aria-expanded="false"> </button>
                 </div>
             </div>
-            <div class="panel-body">
+            <div class="panel-body collapse" id="domains-list">
                 <div style="display: flex; justify-content: end">
                     <button type="button" class="btn btn-success" (click)="showModal()">{{'DOMAINS.LIST.ADD' | translate}}</button>
                 </div>
@@ -99,7 +99,6 @@ <h3>{{ 'DOMAINS.LIST.GROUP' | translate }}</h3>
                     </ng-template>
                     </thead>
                 </table>
-
             </div>
         </div>
 
@@ -110,10 +109,14 @@ <h3>{{ 'DOMAINS.LIST.GROUP' | translate }}</h3>
                     <div>
                         {{ 'DOMAIN_DETAILS.APP_STATUS' | translate }}
                     </div>
-                    <button  class="btn btn-primary" type="button" (click)="toggleAll()">{{'SHARED.TOGGLE' | translate}}</button>
+                    <button class="btn pull-right toggle-button" data-toggle="collapse" [attr.data-target]="'#app-status'" type="button" aria-expanded="false"> </button>
+
                 </div>
             </div>
-            <div class="panel-body">
+            <div class="panel-body collapse" id="app-status" >
+                <div style="display: flex; justify-content: end; margin-bottom: 2rem">
+                    <button  class="btn btn-primary"  type="button" (click)="toggleAll()">{{'SHARED.TOGGLE' | translate}}</button>
+                </div>
                 <table class="table table-hover table-condensed" aria-describedby="Domain details table">
                     <thead>
                     <tr>