Merged in coar-CST-12767 (pull request #1054)

[CST-12767] Fixed Modal behaviour when discarding a LDN service

Approved-by: Stefano Maffei

src/app/admin/admin-ldn-services/ldn-service-form-edit/ldn-service-form-edit.component.html

@@ -366,9 +366,7 @@
 </div>
 <ng-template #confirmModal>
     <div class="modal-header">
-      <div>
-        <h4>{{'service.overview.edit.modal' | translate }}</h4>
-      </div>
+      <h4>{{'service.overview.edit.modal' | translate }}</h4>
       <button (click)="closeModal()" aria-label="Close"
               class="close" type="button">
         <span aria-hidden="true">×</span>
@@ -379,7 +377,8 @@
       <div>
         {{ 'service.overview.edit.body' | translate }}
       </div>
-      <div class="mt-4">
+    </div>
+      <div class="modal-footer">
         <button (click)="closeModal()" class="btn btn-danger mr-2"
                 id="delete-confirm">{{ 'service.detail.return' | translate }}
         </button>
@@ -387,17 +386,11 @@
                 class="btn btn-primary">{{ 'service.detail.update' | translate }}
         </button>
       </div>
-    </div>
 </ng-template>
 
 <ng-template #resetFormModal>
-
-  <div>
-
     <div class="modal-header">
-      <div>
-        <h4>{{'service.overview.reset-form.modal' | translate }}</h4>
-      </div>
+      <h4 class="text-danger">{{'service.overview.reset-form.modal' | translate }}</h4>
       <button (click)="closeModal()" aria-label="Close"
               class="close" type="button">
         <span aria-hidden="true">×</span>
@@ -405,19 +398,18 @@
     </div>
 
     <div class="modal-body">
-      <div>
+      <span>
         {{ 'service.overview.reset-form.body' | translate }}
-      </div>
-      <div class="mt-4">
-        <button (click)="closeModal()" class="mr-2 btn btn-danger"
-                id="reset-delete">{{ 'service.overview.reset-form.reset-confirm' | translate }}
-        </button>
-        <button (click)="resetFormAndLeave()"
-                class="btn btn-primary"
-                id="reset-confirm">{{ 'service.overview.reset-form.reset-return' | translate }}
-        </button>
-      </div>
+      </span>
     </div>
-  </div>
+    <div class="modal-footer">
+      <button (click)="closeModal()"
+        class="btn btn-primary"
+        id="reset-confirm">{{ 'service.overview.reset-form.reset-return' | translate }}
+      </button>
+      <button (click)="resetFormAndLeave()" class="mr-2 btn btn-danger"
+              id="reset-delete">{{ 'service.overview.reset-form.reset-confirm' | translate }}
+      </button>
+      </div>
 </ng-template>
 

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html

@@ -334,13 +334,8 @@
   </form>
 </div>
 <ng-template #confirmModal>
-
-  <div>
-
     <div class="modal-header">
-      <div>
-        <h4>{{'service.overview.create.modal' | translate }}</h4>
-      </div>
+      <h4>{{'service.overview.create.modal' | translate }}</h4>
       <button (click)="closeModal()" aria-label="Close"
               class="close" type="button">
         <span aria-hidden="true">×</span>
@@ -348,29 +343,23 @@
     </div>
 
     <div class="modal-body">
-      <div>
+      <span>
         {{ 'service.overview.create.body' | translate }}
-      </div>
-      <div class="mt-4">
-        <button (click)="closeModal()" class="btn btn-danger mr-2 "
-                id="delete-confirm">{{ 'service.refuse.create' | translate }}
-        </button>
-        <button (click)="createService()"
-                class="btn btn-primary">{{ 'service.confirm.create' | translate }}
-        </button>
-      </div>
+      </span>
+    </div>
+    <div class="modal-footer">
+      <button (click)="closeModal()" class="btn btn-danger mr-2 "
+              id="delete-confirm">{{ 'service.refuse.create' | translate }}
+      </button>
+      <button (click)="createService()"
+              class="btn btn-primary">{{ 'service.confirm.create' | translate }}
+      </button>
     </div>
-  </div>
 </ng-template>
 
 <ng-template #resetFormModal>
-
-  <div>
-
     <div class="modal-header">
-      <div>
-        <h4>{{'service.overview.reset-form.modal' | translate }}</h4>
-      </div>
+        <h4 class="text-danger">{{'service.overview.reset-form.modal' | translate }}</h4>
       <button (click)="closeModal()" aria-label="Close"
               class="close" type="button">
         <span aria-hidden="true">×</span>
@@ -378,20 +367,20 @@
     </div>
 
     <div class="modal-body">
-      <div>
+      <span>
         {{ 'service.overview.reset-form.body' | translate }}
-      </div>
-      <div class="mt-4">
-        <button (click)="resetFormAndLeave()"
+      </span>
+     </div>
+      <div class="modal-footer">
+        <button (click)="closeModal()"
                 class="btn btn-primary mr-2"
                 id="reset-confirm">{{ 'service.overview.reset-form.reset-return' | translate }}
         </button>
-        <button (click)="closeModal()" class="btn btn-danger"
+        <button (click)="resetFormAndLeave()" class="btn btn-danger"
                 id="reset-delete">{{ 'service.overview.reset-form.reset-confirm' | translate }}
         </button>
       </div>
-    </div>
-  </div>
+
 </ng-template>
 
 

src/assets/i18n/en.json5

@@ -923,7 +923,7 @@
   "service.overview.create.body": "Please confirm the creation of this service.",
   "ldn-service-status": "Status",
   "service.confirm.create": "Create",
-  "service.refuse.create": "Discard",
+  "service.refuse.create": "Cancel",
   "ldn-register-new-service.title": "Register a new service",
   "ldn-new-service.form.label.submit": "Save",
   "ldn-new-service.form.label.name": "Name",
@@ -1006,12 +1006,12 @@
   "ldn-new-service.form.label.removeItemFilter": "Remove",
   "ldn-register-new-service.breadcrumbs": "New Service",
   "service.overview.delete.body": "Are you sure you want to delete this service?",
-  "service.overview.edit.body": "Are you sure you want to confirm those service changes?",
+  "service.overview.edit.body": "Are you sure you want to confirm the changes?",
   "service.overview.edit.modal": "Edit Service",
   "service.detail.update": "Edit Service",
   "service.detail.return": "Cancel",
-  "service.overview.reset-form.body": "Are you sure you want to discard those changes and leave?",
-  "service.overview.reset-form.modal": "Discard Service Changes",
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.modal": "Discard Changes",
   "service.overview.reset-form.reset-confirm": "Discard",
   "admin.registries.services-formats.modify.success.head": "Successful Edit",
   "admin.registries.services-formats.modify.success.content": "The service has been edited",
@@ -1028,7 +1028,7 @@
   "ldn-service-delete.notification.success.content": "The service has been deleted",
   "ldn-service-delete.notification.error.title": "Failed Deletion",
   "ldn-service-delete.notification.error.content": "The service has not been deleted",
-  "service.overview.reset-form.reset-return": "Return",
+  "service.overview.reset-form.reset-return": "Cancel",
   "service.overview.delete": "Delete service",
   "ldn-edit-service.title": "Edit service",
   "ldn-edit-service.form.label.name": "Name",