Commits

Alisa Ismailati authored and Stefano Maffei committed e74376c0bc9 Merge
Merged in coar-CST-12767 (pull request #1054)

[CST-12767] Fixed Modal behaviour when discarding a LDN service Approved-by: Stefano Maffei
No tags

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

Modified
327 327 <span><i class="fas fa-trash"></i>&nbsp;{{ 'submission.general.discard.submit' | translate }}</span>
328 328 </button>
329 329 <button class="btn btn-primary" type="submit">
330 330 <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
331 331 </button>
332 332 </div>
333 333
334 334 </form>
335 335 </div>
336 336 <ng-template #confirmModal>
337 -
338 - <div>
339 -
340 337 <div class="modal-header">
341 - <div>
342 - <h4>{{'service.overview.create.modal' | translate }}</h4>
343 - </div>
338 + <h4>{{'service.overview.create.modal' | translate }}</h4>
344 339 <button (click)="closeModal()" aria-label="Close"
345 340 class="close" type="button">
346 341 <span aria-hidden="true">×</span>
347 342 </button>
348 343 </div>
349 344
350 345 <div class="modal-body">
351 - <div>
346 + <span>
352 347 {{ 'service.overview.create.body' | translate }}
353 - </div>
354 - <div class="mt-4">
355 - <button (click)="closeModal()" class="btn btn-danger mr-2 "
356 - id="delete-confirm">{{ 'service.refuse.create' | translate }}
357 - </button>
358 - <button (click)="createService()"
359 - class="btn btn-primary">{{ 'service.confirm.create' | translate }}
360 - </button>
361 - </div>
348 + </span>
349 + </div>
350 + <div class="modal-footer">
351 + <button (click)="closeModal()" class="btn btn-danger mr-2 "
352 + id="delete-confirm">{{ 'service.refuse.create' | translate }}
353 + </button>
354 + <button (click)="createService()"
355 + class="btn btn-primary">{{ 'service.confirm.create' | translate }}
356 + </button>
362 357 </div>
363 - </div>
364 358 </ng-template>
365 359
366 360 <ng-template #resetFormModal>
367 -
368 - <div>
369 -
370 361 <div class="modal-header">
371 - <div>
372 - <h4>{{'service.overview.reset-form.modal' | translate }}</h4>
373 - </div>
362 + <h4 class="text-danger">{{'service.overview.reset-form.modal' | translate }}</h4>
374 363 <button (click)="closeModal()" aria-label="Close"
375 364 class="close" type="button">
376 365 <span aria-hidden="true">×</span>
377 366 </button>
378 367 </div>
379 368
380 369 <div class="modal-body">
381 - <div>
370 + <span>
382 371 {{ 'service.overview.reset-form.body' | translate }}
383 - </div>
384 - <div class="mt-4">
385 - <button (click)="resetFormAndLeave()"
372 + </span>
373 + </div>
374 + <div class="modal-footer">
375 + <button (click)="closeModal()"
386 376 class="btn btn-primary mr-2"
387 377 id="reset-confirm">{{ 'service.overview.reset-form.reset-return' | translate }}
388 378 </button>
389 - <button (click)="closeModal()" class="btn btn-danger"
379 + <button (click)="resetFormAndLeave()" class="btn btn-danger"
390 380 id="reset-delete">{{ 'service.overview.reset-form.reset-confirm' | translate }}
391 381 </button>
392 382 </div>
393 - </div>
394 - </div>
383 +
395 384 </ng-template>
396 385
397 386

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut